From f2997f514667ca090378ca3dd86dc7226b5a7f19 Mon Sep 17 00:00:00 2001 From: Lennart Prelle Date: Wed, 9 Nov 2011 20:38:06 +0100 Subject: [PATCH] change #newhere to translation --- app/views/shared/_right_sections.html.haml | 2 +- config/locales/diaspora/de.yml | 3 ++- config/locales/diaspora/en.yml | 1 + lib/stream/multi.rb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml index 9aebcb4ea..8a13aaa16 100644 --- a/app/views/shared/_right_sections.html.haml +++ b/app/views/shared/_right_sections.html.haml @@ -27,7 +27,7 @@ %h5 = t('aspects.index.new_here.title') .content - != t('aspects.index.new_here.follow', :link => link_to('#NewHere', tag_path(:name => "NewHere"))) + != t('aspects.index.new_here.follow', :link => link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(:name => "NewHere"))) %br = link_to(t('aspects.index.new_here.learn_more'), "https://github.com/diaspora/diaspora/wiki/Welcoming-Committee") diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml index b1e6256cc..62350935a 100644 --- a/config/locales/diaspora/de.yml +++ b/config/locales/diaspora/de.yml @@ -745,7 +745,8 @@ de: all_contacts: "Alle Kontakte" discard_post: "Beitrag verwerfen" make_public: "veröffentlichen" - new_user_prefill: + new_user_prefill: + newhere: "NeuHier" hello: "Hallo zusammen, ich bin #%{new_user_tag}. " i_like: "Ich interessiere mich für %{tags}." invited_by: "Danke für die Einladung," diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index f47463bf8..347ba269e 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -759,6 +759,7 @@ en: publishing_to: "publishing to: " discard_post: "Discard post" new_user_prefill: + newhere: "NewHere" hello: "Hey everyone, I'm #%{new_user_tag}. " i_like: "I'm interested in %{tags}. " invited_by: "Thanks for the invite, " diff --git a/lib/stream/multi.rb b/lib/stream/multi.rb index 675d0389a..b4963306a 100644 --- a/lib/stream/multi.rb +++ b/lib/stream/multi.rb @@ -49,7 +49,7 @@ class Stream::Multi < Stream::Base # # @return [String] def publisher_prefill - prefill = I18n.t("shared.publisher.new_user_prefill.hello", :new_user_tag => "NewHere") + prefill = I18n.t("shared.publisher.new_user_prefill.hello", :new_user_tag => I18n.t('shared.publisher.new_user_prefill.newhere')) if self.user.followed_tags.size > 0 tag_string = self.user.followed_tags.map{|t| "##{t.name}"}.to_sentence prefill << I18n.t("shared.publisher.new_user_prefill.i_like", :tags => tag_string)