found some still untranslatable strings in helpers and stuff
This commit is contained in:
parent
a4f5a1e7ae
commit
9ceb3e2fd1
4 changed files with 12 additions and 4 deletions
|
|
@ -164,7 +164,7 @@ module ApplicationHelper
|
|||
return @@youtube_title_cache[id]
|
||||
end
|
||||
|
||||
ret = 'Unknown Video Title' #TODO add translation
|
||||
ret = I18n.t 'application.helper.youtube_title.unknown'
|
||||
http = Net::HTTP.new('gdata.youtube.com', 80)
|
||||
path = '/feeds/api/videos/'+id+'?v=2'
|
||||
resp, data = http.get(path, nil)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ module AspectsHelper
|
|||
|
||||
def remove_link( aspect )
|
||||
if aspect.people.size == 0
|
||||
link_to I18n.t('aspects.helper.remove'), aspect, :method => :delete, :confirm => "Are you sure you want to delete this aspect?"
|
||||
link_to I18n.t('aspects.helper.remove'), aspect, :method => :delete, :confirm => I18n.t('aspects.helper.are_you_sure')
|
||||
else
|
||||
"<span class='grey' title=#{I18n.t('aspects.helper.aspect_not_empty')}>#{I18n.t('aspects.helper.remove')}</span>"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class Notifier < ActionMailer::Base
|
|||
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
|
||||
|
||||
mail(:to => "#{@receiver.real_name} <#{@receiver.email}>",
|
||||
:subject => "new Diaspora* friend request from #{@sender.real_name}", :host => APP_CONFIG[:terse_pod_url])
|
||||
:subject => I18n.t('notifier.new_request.subject', :from => @sender.real_name), :host => APP_CONFIG[:terse_pod_url])
|
||||
end
|
||||
|
||||
def request_accepted(recipient_id, sender_id, aspect_id)
|
||||
|
|
@ -21,6 +21,6 @@ class Notifier < ActionMailer::Base
|
|||
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
|
||||
|
||||
mail(:to => "#{@receiver.real_name} <#{@receiver.email}>",
|
||||
:subject => "#{@sender.real_name} has accepted your friend request on Diaspora*", :host => APP_CONFIG[:terse_pod_url])
|
||||
:subject => I18n.t('notifier.request_accepted.subject', :name => @sender.real_name), :host => APP_CONFIG[:terse_pod_url])
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ en:
|
|||
application:
|
||||
helper:
|
||||
unknown_person: "unknown person"
|
||||
youtube_title:
|
||||
unknown: "Unknown Video Title"
|
||||
error_messages:
|
||||
helper:
|
||||
invalid_fields: "Invalid Fields"
|
||||
|
|
@ -128,6 +130,7 @@ en:
|
|||
helper:
|
||||
remove: "remove"
|
||||
aspect_not_empty: "Aspect not empty"
|
||||
are_you_sure: "Are you sure you want to delete this aspect?"
|
||||
remove_from_aspect:
|
||||
success: "Successfully removed person from aspect"
|
||||
failure: "Failed to remove person from aspect"
|
||||
|
|
@ -308,5 +311,10 @@ en:
|
|||
dashboards:
|
||||
helper:
|
||||
home: "Home"
|
||||
notifier:
|
||||
new_request:
|
||||
subject: "new Diaspora* friend request from %{from}"
|
||||
request_accepted:
|
||||
subject: "%{name} has accepted your friend request on Diaspora*"
|
||||
date:
|
||||
order: [:month, :day, :year]
|
||||
|
|
|
|||
Loading…
Reference in a new issue