Merge pull request #2367 from lprelle/newhere_to_locale_translation

#NewHere to locale translation
This commit is contained in:
Daniel Grippi 2011-11-09 16:09:12 -08:00
commit eb6fc5f130
3 changed files with 3 additions and 2 deletions

View file

@ -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")

View file

@ -760,6 +760,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, "

View file

@ -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)