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

fix untranslatable stuff from the invite refactor

Browse source
This commit is contained in:
Jonne Haß 2012-03-17 13:52:46 +01:00
parent e413a6e70a
commit 7e7de439f8
5 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/notifier_helper.rb
View file

@ -26,9 +26,9 @@ module NotifierHelper
def invite_email_title def invite_email_title
if @inviter.present? if @inviter.present?
"#{@inviter.person.name} invited you to Diaspora*" I18n.t 'notifier.invited_you', :name => @inviter.person.name
else else
"Accept Your Diaspora* invite!" I18n.t 'notifier.accept_invite'
end end
end end
end end

4
app/views/invitations/new.html.haml
View file

@ -34,9 +34,9 @@
.clearfix .clearfix
.span-7.prepend-3.last .span-7.prepend-3.last
or paste them this link! = t('.paste_link')
= invite_link(@invite_code) = invite_link(@invite_code)
= "#{@invite_code.count} invites left on this code" = t('.codes_left', :count => @invite_code.count)
%br %br
%br %br

13
app/views/notifier/invite.text.erb
View file

@ -1,12 +1 @@
Hello! <%= t('.message', :invite_url => invite_code_url(@invitation_code)) %>
You have been invited to join Diaspora*!
Click this link to get started
<%= invite_code_url(@invitation_code)%>
Love,
The Diaspora* email robot!

2
app/views/people/_add_contact.html.haml
View file

@ -1,5 +1,5 @@
.alert-message.block-message.success .alert-message.block-message.success
you were invited by = t('.invited_by')
= person_image_link inviter = person_image_link inviter
= person_link inviter = person_link inviter
= aspect_membership_dropdown(contact, inviter, false) = aspect_membership_dropdown(contact, inviter, false)

30
config/locales/diaspora/en.yml
View file

@ -339,6 +339,14 @@ en:
personal_message: "Personal message" personal_message: "Personal message"
send_an_invitation: "Send an invitation" send_an_invitation: "Send an invitation"
send_invitation: "Send invitation" send_invitation: "Send invitation"
paste_link: "or paste them this link!"
codes_left:
zero: "No invites left on this code"
one: "One invite left on this code"
two: "%{count} invites left on this code"
few: "%{count} invites left on this code"
many: "%{count} invites left on this code"
other: "%{count} invites left on this code"
aspect: "Aspect" aspect: "Aspect"
already_invited: "The following people have not accepted your invitation:" already_invited: "The following people have not accepted your invitation:"
resend: "Resend" resend: "Resend"
@ -522,6 +530,24 @@ en:
confirm_email: confirm_email:
subject: "Please activate your new email address %{unconfirmed_email}" subject: "Please activate your new email address %{unconfirmed_email}"
click_link: "To activate your new email address %{unconfirmed_email}, please follow this link:" click_link: "To activate your new email address %{unconfirmed_email}, please follow this link:"
accept_invite: "Accept Your Diaspora* invite!"
invited_you: "%{name} invited you to Diaspora*"
invite:
message: |-
Hello!
You have been invited to join Diaspora*!
Click this link to get started
%{invite_url}
<%= invite_code_url(@invitation_code)%>
Love,
The Diaspora* email robot!
people: people:
zero: "no people" zero: "no people"
one: "1 person" one: "1 person"
@ -578,8 +604,10 @@ en:
edit_membership: "edit aspect membership" edit_membership: "edit aspect membership"
add_contact_small: add_contact_small:
add_contact_from_tag: "add contact from tag" add_contact_from_tag: "add contact from tag"
last_post: "Last Post" last_post: "Last Post"
add_contact:
invited_by: "you were invited by"
photos: photos:
show: show:
delete_photo: "Delete Photo" delete_photo: "Delete Photo"