From a1eee6e90f820f109d43d339018ec11b41105ca7 Mon Sep 17 00:00:00 2001 From: Jonne Hass Date: Sun, 6 Nov 2011 16:43:13 +0100 Subject: [PATCH] made help tags translatable so that local communities can take care of the new users, also fixed #2327 --- app/views/photos/_new_profile_photo.haml | 3 +-- app/views/shared/_right_sections.html.haml | 6 +++--- config/locales/diaspora/en.yml | 5 ++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/photos/_new_profile_photo.haml b/app/views/photos/_new_profile_photo.haml index f76d48a3e..3112a6e03 100644 --- a/app/views/photos/_new_profile_photo.haml +++ b/app/views/photos/_new_profile_photo.haml @@ -78,8 +78,7 @@ %br %br %p - \...#{t('.or_select_one')} - = link_to t('_photos'), person_photos_path(person) + \...#{t('.or_select_one_existing', :photos => link_to(t('_photos'), person_photos_path(person)))} #publisher_photo_upload diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml index 6f39cc674..7f45f9382 100644 --- a/app/views/shared/_right_sections.html.haml +++ b/app/views/shared/_right_sections.html.haml @@ -41,11 +41,11 @@ %br = t('aspects.index.help.do_you') %br - != t('aspects.index.help.have_a_question', :link => link_to("#question" , tag_path(:name => "question"))) + != t('aspects.index.help.have_a_question', :link => link_to(t('aspects.index.help.tag_question'), tag_path(:name => "question"))) %br - != t('aspects.index.help.find_a_bug', :link => link_to("#bug" , tag_path(:name => "bug"))) + != t('aspects.index.help.find_a_bug', :link => link_to(t('aspects.index.help.tag_bug'), tag_path(:name => "bug"))) %br - != t('aspects.index.help.feature_suggestion', :link => link_to("#feature" , tag_path(:name => "feature"))) + != t('aspects.index.help.feature_suggestion', :link => link_to(t('aspects.index.help.tag_feature'), tag_path(:name => "feature"))) %br %br %p diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 438793a68..37c6291b1 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -176,8 +176,11 @@ en: here_to_help: "The Diaspora community is here!" do_you: "Do you:" have_a_question: "... have a %{link}?" + tag_question: "#question" find_a_bug: "... find a %{link}?" + tag_bug: "#bug" feature_suggestion: "... have a %{link} suggestion?" + tag_feature: "#feature" tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news" @@ -598,7 +601,7 @@ en: empty: "{file} is empty, please select files again without it." new_profile_photo: upload: "Upload a new profile photo!" - or_select_one: "or select one from your already existing" + or_select_one_existing: "or select one from your already existing %{photos}" comment_email_subject: "%{name}'s photo" posts: