nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3128 from m4tze/master

Browse source 
email-invitation translation error in subject and body
This commit is contained in:
Jonne Haß 2012-04-09 05:26:34 -07:00
commit 2f7bed1f44
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/notifier.rb
View file

@ -40,7 +40,7 @@ class Notifier < ActionMailer::Base
@invitation_code = invitation_code @invitation_code = invitation_code
mail_opts = {:to => email, :from => AppConfig[:smtp_sender_address], mail_opts = {:to => email, :from => AppConfig[:smtp_sender_address],
:subject => I18n.t('notifier.invited!'), :subject => I18n.t('notifier.invited_you', :name => @inviter.person.name),
:host => AppConfig[:pod_uri].host} :host => AppConfig[:pod_uri].host}
I18n.with_locale(locale) do I18n.with_locale(locale) do

3
config/locales/diaspora/de.yml
View file

@ -488,7 +488,6 @@ de:
Klick auf diesen Link um loszulegen Klick auf diesen Link um loszulegen
%{invite_url} %{invite_url}
<%= invite_code_url(@invitation_code)%>
Alles Liebe, Alles Liebe,
@ -1016,4 +1015,4 @@ de:
welcome: "Willkommen!" welcome: "Willkommen!"
will_paginate: will_paginate:
next_label: "nächstes &raquo;" next_label: "nächstes &raquo;"
previous_label: "&laquo; voriges" previous_label: "&laquo; voriges"