From 6f5c3f3258fc4b7cd104851cf0e63075dcbfee04 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Fri, 19 Nov 2010 16:47:02 +0100 Subject: [PATCH] made recent changes translatable and cleanup up en.yml a bit --- app/views/aspects/_new_aspect.haml | 2 +- app/views/layouts/application.html.haml | 2 +- app/views/people/_profile_sidebar.html.haml | 2 +- app/views/requests/_manage_aspect_contacts.haml | 2 +- app/views/users/getting_started/_step_4.html.haml | 8 ++++---- config/locales/diaspora/en.yml | 11 +++-------- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml index a7aff0474..d211d9503 100644 --- a/app/views/aspects/_new_aspect.haml +++ b/app/views/aspects/_new_aspect.haml @@ -4,7 +4,7 @@ .span-12.last .modal_title_bar - %h4= t('.add_a_new_aspect') + %h4= t('aspects.manage.add_a_new_aspect') = form_for Aspect.new do |aspect| = aspect.error_messages diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index cc36a7b92..450465f0c 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -76,7 +76,7 @@ %footer .container - .brandon = t('.powered by') + .brandon= t('.powered_by') %ul#footer_nav %li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com" %li= link_to t('layouts.header.developers'), "https://github.com/diaspora/diaspora" diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index 178b22251..678fc2be8 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -16,7 +16,7 @@ - if is_contact %li %ul#aspects_for_person - %b in aspects + %b= t('.in_aspects') %br - for aspect in @aspects_with_person %li= link_to aspect.name, aspect diff --git a/app/views/requests/_manage_aspect_contacts.haml b/app/views/requests/_manage_aspect_contacts.haml index 6c608f62f..c55f1fde1 100644 --- a/app/views/requests/_manage_aspect_contacts.haml +++ b/app/views/requests/_manage_aspect_contacts.haml @@ -12,7 +12,7 @@ = render 'shared/contact_list', :aspect => aspect, :contacts => @contacts, :manage => defined?(manage) .span-7.last - %h3= t('.add_new') + %h3= t('aspects.manage.add_a_new_contact') = form_tag(person_by_handle_path, :id => "new_request_to_#{aspect.id}", :class => "webfinger_form", :remote => true) do =t('.enter_a_diaspora_username') %br diff --git a/app/views/users/getting_started/_step_4.html.haml b/app/views/users/getting_started/_step_4.html.haml index 493c0daca..e4d51b2e1 100644 --- a/app/views/users/getting_started/_step_4.html.haml +++ b/app/views/users/getting_started/_step_4.html.haml @@ -23,17 +23,17 @@ %p = t('.change_profile') - %b #{t('.edit_profile')} + %b #{t('layouts.header.edit_profile')} = t('.user_menu') %p = t('.connect_disconnect') - %b #{t('.edit_account')} + %b #{t('layouts.header.account_settings')} = t('.user_menu') %p = t('.manage_aspects') - %b #{t('.manage')} + %b #{t('shared.aspect_nav.manage')} = t('.tab_also_added') .submit_block - = link_to "Finish →", root_url, :class => "button" + = link_to "#{t('.finish')} →", root_url, :class => "button" diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index e65a5749c..b72c7bd1a 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -122,7 +122,6 @@ en: manage_aspects: "Manage aspects" drag_to_add: "Drag to add people" new_aspect: - add_a_new_aspect: "Add a new aspect" name: "Name" create: "Create" create: @@ -180,13 +179,11 @@ en: ready_to_share: "You're now ready to start sharing with " continue: "Continue on to your everyone page, an overview of all of your aspects." change_profile: "You can change your profile any time by clicking" - edit_profile: "edit profile" user_menu: "in your user menu (top right)." connect_disconnect: "You can connect/disconnect your services any time by clicking" - edit_account: "edit account" manage_aspects: "You can manage your aspects any time by clicking the" - manage: "manage" tab_also_added: "tab. Your contacts can also be added while on a particular aspect page, as well." + finish: "Finish" update: password_changed: "Password Changed" password_not_changed: "Password Change Failed" @@ -251,7 +248,7 @@ en: sent: "Your invitation has been sent." no_more: "You have no more invitations." already_sent: "You already invited this person." - already_friends: "You are already friends with this person" + already_contacts: "You are already connected with this person" new: 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" @@ -279,7 +276,6 @@ en: results_for: "search results for" show: no_posts: "no posts to display!" - not_friends: "You're currently not friends with %{name}" request_people: "If you'd like, you can request to place him/her in one of your aspects." already_requested: "You have already sent a request to %{name}." does_not_exist: "Person does not exist!" @@ -308,19 +304,18 @@ en: bio: "bio" gender: "gender" born: "born" + in_aspects: "in aspects" helper: results_for: " results for %{params}" people_on_pod_are_aware_of: " people on pod are aware of" requests: manage_aspect_contacts: - add_a_new_contact_to: "Add a new contact to" enter_a_diaspora_username: "Enter a Diaspora username:" your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}" contact_username: "Contact's username" create_request: "Create request" manage_within: "Manage contacts within" existing: "Existing contacts" - add_new: "Add a new contact" know_email: "Know their email address? You should invite them" destroy: success: "You are now friends."