nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2367 from lprelle/newhere_to_locale_translation

Browse source 
#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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/shared/_right_sections.html.haml
View file

@ -27,7 +27,7 @@
%h5 %h5
= t('aspects.index.new_here.title') = t('aspects.index.new_here.title')
.content .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 %br
= link_to(t('aspects.index.new_here.learn_more'), "https://github.com/diaspora/diaspora/wiki/Welcoming-Committee") = link_to(t('aspects.index.new_here.learn_more'), "https://github.com/diaspora/diaspora/wiki/Welcoming-Committee")

1
config/locales/diaspora/en.yml
View file

@ -760,6 +760,7 @@ en:
publishing_to: "publishing to: " publishing_to: "publishing to: "
discard_post: "Discard post" discard_post: "Discard post"
new_user_prefill: new_user_prefill:
newhere: "NewHere"
hello: "Hey everyone, I'm #%{new_user_tag}. " hello: "Hey everyone, I'm #%{new_user_tag}. "
i_like: "I'm interested in %{tags}. " i_like: "I'm interested in %{tags}. "
invited_by: "Thanks for the invite, " invited_by: "Thanks for the invite, "

2
lib/stream/multi.rb
View file

@ -49,7 +49,7 @@ class Stream::Multi < Stream::Base
# #
# @return [String] # @return [String]
def publisher_prefill 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 if self.user.followed_tags.size > 0
tag_string = self.user.followed_tags.map{|t| "##{t.name}"}.to_sentence 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) prefill << I18n.t("shared.publisher.new_user_prefill.i_like", :tags => tag_string)