From 14f4e1aa57d60e7240c087cf5383287130a00ddd Mon Sep 17 00:00:00 2001 From: MrZYX <pr0fkill@gmail.com> Date: Thu, 27 Jan 2011 18:20:25 +0100 Subject: [PATCH] some fixes to the translations of the mobile site --- app/views/layouts/application.mobile.haml | 13 ++++++------- app/views/people/index.mobile.haml | 2 +- app/views/shared/_publisher.mobile.haml | 2 +- config/locales/diaspora/en.yml | 2 ++ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index a2eff9207b..e301d75b9e 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -48,7 +48,7 @@ %br %br - %b your aspects + %b= t('.your_aspects') %br - for aspect in @all_aspects = link_to aspect, aspects_path('a_ids[]' => aspect.id) @@ -56,7 +56,7 @@ %br %br - = link_to 'logout', destroy_user_session_path + = link_to t('layouts.header.logout'), destroy_user_session_path -if current_user @@ -79,7 +79,7 @@ = @notification_count %h4 - your aspects + = t('.your_aspects') %ul{:data => {:role => 'listview', :inset => 'true'}} %li @@ -90,12 +90,11 @@ #footer - logged in as - = link_to current_user.name, current_user.person + = link_to t('.logged_in_as' :name => current_user.name), current_user.person %br %br - %b your aspects + %b= t('.your_aspects') %br - for aspect in @all_aspects = link_to aspect, aspects_path('a_ids[]' => aspect.id) @@ -103,4 +102,4 @@ %br %br - = link_to 'logout', destroy_user_session_path + = link_to t('layouts.header.logout'), destroy_user_session_path diff --git a/app/views/people/index.mobile.haml b/app/views/people/index.mobile.haml index 1cd619625c..e847ee4854 100644 --- a/app/views/people/index.mobile.haml +++ b/app/views/people/index.mobile.haml @@ -10,7 +10,7 @@ = form_tag(people_path, :method => 'get') do %div{:data => {:role => 'fieldcontain', :inline => 'true'}} = search_field_tag :q - = submit_tag :search, 'data-inline' => 'true' + = submit_tag t('search'), 'data-inline' => 'true' - if params[:q].blank? diff --git a/app/views/shared/_publisher.mobile.haml b/app/views/shared/_publisher.mobile.haml index f807bf9693..380c4500cb 100644 --- a/app/views/shared/_publisher.mobile.haml +++ b/app/views/shared/_publisher.mobile.haml @@ -25,6 +25,6 @@ - unless params[:a_ids] %input{:type => 'checkbox', :name => 'status_message[public]', :id => 'public', :class => 'custom', :value => 'true'} %label{:for => 'public'} - make public? + = t('.make_public') = status.submit t('.share'), 'data-inline' => 'true', 'data-theme' => 'b' diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index c84a00a733..50ba870484 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -97,6 +97,8 @@ en: powered_by: "POWERED BY DIASPORA*" whats_new: "what's new?" have_a_problem: "Have a problem? Find an answer here" + your_aspects: "your aspects" + logged_in_as: "logged in as %{name}" shared: publisher: posting: "Posting..." -- GitLab