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

Merge pull request #2272 from Pistos/issue-2266-new-here-capitalization

Browse source 
Change #newhere prefill to #NewHere .
This commit is contained in:
Daniel Grippi 2011-10-28 20:58:31 -07:00
commit 43b34d5290
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/stream/multi.rb
View file

@ -31,7 +31,7 @@ class Stream::Multi < Stream::Base
#emits an enum of the groups which the post appeared #emits an enum of the groups which the post appeared
# :spotlight, :aspects, :tags, :mentioned # :spotlight, :aspects, :tags, :mentioned
def post_from_group(post) def post_from_group(post)
streams_included.collect do |source| streams_included.collect do |source|
is_in?(source, post) is_in?(source, post)
end.compact end.compact
end end
@ -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 => "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)

2
spec/lib/stream/multi_spec.rb
View file

@ -44,7 +44,7 @@ describe Stream::Multi do
end end
it 'returns includes new user hashtag' do it 'returns includes new user hashtag' do
@stream.send(:publisher_prefill).include?("#newhere").should be_true @stream.send(:publisher_prefill).include?("#NewHere").should be_true
end end
it 'includes followed hashtags' do it 'includes followed hashtags' do