From 1acc206fa47afd17018d0af0a136b2c367e8c854 Mon Sep 17 00:00:00 2001 From: Hexagon Date: Mon, 1 Nov 2010 18:27:49 +0100 Subject: [PATCH] #475: Fixed more untranslated strings --- app/helpers/application_helper.rb | 2 +- app/views/comments/_new_comment.html.haml | 2 +- app/views/invitations/_new.haml | 15 +++++++++------ app/views/invitations/new.html.haml | 7 ++++--- app/views/people/edit.html.haml | 2 +- app/views/people/show.html.haml | 2 +- app/views/shared/_invitations.haml | 7 ++++--- app/views/shared/_publisher.haml | 6 +++--- app/views/shared/_reshare.haml | 4 ++-- app/views/users/edit.html.haml | 2 +- config/locales/diaspora/en.yml | 22 +++++++++++++++++++++- config/locales/diaspora/sv.yml | 2 +- 12 files changed, 49 insertions(+), 24 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9cb502908..d89b0b1ee 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -34,7 +34,7 @@ module ApplicationHelper end def how_long_ago(obj) - "#{time_ago_in_words(obj.created_at)} ago" + "#{time_ago_in_words(obj.created_at)} #{t('.ago')}" end def person_url(person) diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml index bb8719ee7..b7c1fbbf4 100644 --- a/app/views/comments/_new_comment.html.haml +++ b/app/views/comments/_new_comment.html.haml @@ -4,7 +4,7 @@ = form_for Comment.new, :remote => true do |comment| %p - = label_tag "comment_text_on_#{post.id}", "Comment" + = label_tag "comment_text_on_#{post.id}", t('.comment') = comment.text_area :text, :rows => 1, :id => "comment_text_on_#{post.id}", :class => "comment_box" = comment.hidden_field :post_id, :value => post.id diff --git a/app/views/invitations/_new.haml b/app/views/invitations/_new.haml index 77b07faa2..b05792dd1 100644 --- a/app/views/invitations/_new.haml +++ b/app/views/invitations/_new.haml @@ -1,20 +1,23 @@ .span-12.last .modal_title_bar - %h4 Invite someone to join Diaspora! + %h4 + = t('.invite_someone_to_join') - %i if they accept, they will be added to the aspect you invited them + %i + = t('.if_they_accept_info') = form_for User.new, :url => invitation_path(User) do |invite| %p - = invite.label :email + = invite.label :email , t('.email') = invite.text_field :email - To + = t('.to') - unless @aspect.is_a? Aspect = invite.select(:aspects, @aspects_dropdown_array) - else = invite.select(:aspects, @aspects_dropdown_array, :selected => @aspect.id) - Message: + = t('.message') + = invite.text_area :invite_messages, :value => "" - %p= invite.submit "Send an invitation" + %p= invite.submit t('.send_an_invitation') diff --git a/app/views/invitations/new.html.haml b/app/views/invitations/new.html.haml index 598b16a3d..1b226aa80 100644 --- a/app/views/invitations/new.html.haml +++ b/app/views/invitations/new.html.haml @@ -1,8 +1,9 @@ -%h2 Send invitation +%h2 + = t('.send_invitation') = form_for User.new, :url => invitation_path(User) do |f| = devise_error_messages! %p - = f.label :email + = f.label :email , t('.email') = f.text_field :email - %p= f.submit "Send an invitation" + %p= f.submit t('.send_an_invitation') /= link_to "Home", after_sign_in_path_for(resource_name) diff --git a/app/views/people/edit.html.haml b/app/views/people/edit.html.haml index f9aaab68c..082a31c2a 100644 --- a/app/views/people/edit.html.haml +++ b/app/views/people/edit.html.haml @@ -16,7 +16,7 @@ %h3 = t('.your_profile') .description - This info will be available to whomever you connect with on Diaspora. + =t('.info_available_to') = person.error_messages diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 022955032..0dd95e752 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -32,7 +32,7 @@ - if @person == current_user.person %b - = link_to "Edit my profile", edit_person_path(@person) + = link_to t('.edit_my_profile'), edit_person_path(@person) %br %br diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml index 40476eae7..8ef2ba877 100644 --- a/app/views/shared/_invitations.haml +++ b/app/views/shared/_invitations.haml @@ -1,6 +1,7 @@ -%h4 Invites -= link_to "Invite a friend", "#invite_user_pane", :class => "invite_user_button", :title => "Invite a friend" -= "(#{invites} left)" +%h4 + = t('.invites') += link_to t('.invite_a_friend'), "#invite_user_pane", :class => "invite_user_button", :title => "Invite a friend" += t('.invitations_left', :count => invites) %br .yo{ :style => "display:none;"} #invite_user_pane diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 6499b01f3..5f36f3c84 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -26,7 +26,7 @@ = form_for StatusMessage.new, :remote => true do |status| = status.error_messages %p - = status.label :message, "Post a message to #{aspect}" + = status.label :message, t('.post_a_message_to', :aspect => aspect) = status.text_area :message, :rows => 2, :value => params[:prefill] = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id) @@ -35,7 +35,7 @@ - if aspect == :all .public_toggle = status.check_box( :public, {}, true, false ) - make public + = t('.make_public') = link_to '(?)', "#question_mark_pane", :class => 'question_mark' .fancybox_content @@ -48,7 +48,7 @@ = status.submit t('.share'), :title => "Share with #{aspect}" #publisher_photo_upload - or + = t('.or') = render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id), :album_id => nil diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml index 44c8f00dd..a479dddef 100644 --- a/app/views/shared/_reshare.haml +++ b/app/views/shared/_reshare.haml @@ -5,7 +5,7 @@ - unless current_user.aspects.size == current_user.aspects_with_post(post.id).size .reshare_pane %span.reshare_button - = link_to "Reshare", "#" + = link_to t('.reshare'), "#" %ul.reshare_box - for aspect in current_user.aspects @@ -14,4 +14,4 @@ - else .reshare_pane %span.reshare_button - = link_to "Reshare", "#", :class => "inactive" + = link_to t('.reshare'), "#", :class => "inactive" diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 23fae0742..7aa2bbcda 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -44,7 +44,7 @@ .submit_block = link_to t('.cancel'), edit_user_path(current_user) - or + = t('.or') = f.submit t('.change_password') %h3 diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index ca1d8f471..250315b6a 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -54,9 +54,18 @@ en: manage_aspects: "Manage Aspects" publisher: share: "Share" + or: "or" + post_a_message_to: "Post a message to %{aspect}" + make_public: "make public" aspect_friends: add_friends: "add friends" photos: "photos" + invitations: + invites: 'Invites' + invite_a_friend: 'Invite a friend' + invitations_left: '(%{count} left)' + reshare: + reshare: 'Reshare' albums: album: you: "you" @@ -141,6 +150,7 @@ en: account: "Account" services: "Services" cancel: "Cancel" + or: "or" destroy: "Account successfully closed." getting_started: signup_steps: "Complete your sign-up by doing these things:" @@ -205,7 +215,14 @@ en: already_friends: 'You are already friends with this person' invitation_token_invalid: 'The invitation token provided is not valid!' updated: 'Your password was set successfully. You are now signed in.' - + new: + email: 'Email' + invite_someone_to_join: 'Invite someone to join Diaspora!' + if_they_accept_info: 'if they accept, they will be added to the aspect you invited them' + to: 'To' + message: 'Message:' + send_an_invitation: 'Send an invitation' + send_invitation: 'Send invitation' status_messages: new_status_message: tell_me_something_good: "tell me something good" @@ -214,6 +231,7 @@ en: show_comments: "show comments" delete: "Delete" are_you_sure: "Are you sure?" + ago: "ago" show: status_message: "Status Message" comments: "comments" @@ -246,8 +264,10 @@ en: remove_friend: "remove friend" no_posts: "no posts to display!" add_friend: "add friend" + edit_my_profile: "Edit my profile" edit: settings: "Settings" + info_available_to: "This info will be available to whomever you connect with on Diaspora." your_profile: "Your profile" your_name: "Your name" first_name: "First name" diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index d5b18e6fa..587bc4350 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -58,7 +58,7 @@ sv: view_profile: "visa profil" edit_profile: "ändra profil" account_settings: "kontoinstallningar" - search: "Search" + search: "Sök ..." logout: "logga ut" shared: aspect_nav: