Commit ac5a7746 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Dennis Schubert

Remove contacts_title method and translations

closes #6687
parent f066daed
......@@ -4,6 +4,7 @@
* Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554)
* Make mention parsing a bit more robust [#6658](https://github.com/diaspora/diaspora/pull/6658)
* Remove unlicensed images [#6673](https://github.com/diaspora/diaspora/pull/6673)
* Removed unused contacts\_title [#6687](https://github.com/diaspora/diaspora/pull/6687)
## Bug fixes
* Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
......
......@@ -1271,33 +1271,26 @@ en:
mentions:
title: "@Mentions"
contacts_title: "People who mentioned you"
comment_stream:
title: "Commented posts"
contacts_title: "People whose posts you commented on"
like_stream:
title: "Like stream"
contacts_title: "People whose posts you like"
followed_tag:
title: "#Followed tags"
contacts_title: "People who dig these tags"
add_a_tag: "Add a tag"
follow: "Follow"
tags:
title: "Posts tagged: %{tags}"
contacts_title: "People who dig this tag"
public:
title: "Public activity"
contacts_title: "Recent posters"
multi:
title: "Stream"
contacts_title: "People in your stream"
aspects:
title: "My aspects"
......
......@@ -200,7 +200,6 @@ en:
followed_tag:
title: "#Followed tags"
contacts_title: "People who dig these tags"
add_a_tag: "Add a tag"
follow: "Follow"
......
......@@ -85,17 +85,6 @@ class Stream::Aspect < Stream::Base
@all_aspects ||= aspect_ids.length == user.aspects.size
end
# Provides a translated title for contacts box on the right pane.
#
# @return [String]
def contacts_title
if self.for_all_aspects? || self.aspect_ids.size > 1
I18n.t('_contacts')
else
"#{self.aspect.name} (#{self.people.size})"
end
end
# Provides a link to the user to the contacts page that corresponds with
# the stream's active aspects.
#
......
......@@ -49,11 +49,6 @@ class Stream::Base
includes(:profile)
end
# @return [String] def contacts_title 'change me in lib/base_stream.rb!'
def contacts_title
'change me in lib/base_stream.rb!'
end
# @return [String]
def contacts_link
Rails.application.routes.url_helpers.contacts_path
......
......@@ -15,8 +15,4 @@ class Stream::Comments < Stream::Base
def posts
@posts ||= EvilQuery::CommentedPosts.new(user).posts
end
def contacts_title
I18n.translate('streams.comment_stream.contacts_title')
end
end
......@@ -17,10 +17,6 @@ class Stream::FollowedTag < Stream::Base
@posts ||= StatusMessage.user_tag_stream(user, tag_ids)
end
def contacts_title
I18n.translate('streams.followed_tag.contacts_title')
end
private
def tag_string
......
......@@ -15,8 +15,4 @@ class Stream::Likes < Stream::Base
def posts
@posts ||= EvilQuery::LikedPosts.new(user).posts
end
def contacts_title
I18n.translate('streams.like_stream.contacts_title')
end
end
......@@ -15,8 +15,4 @@ class Stream::Mention < Stream::Base
def posts
@posts ||= StatusMessage.where_person_is_mentioned(self.user.person)
end
def contacts_title
I18n.translate('streams.mentions.contacts_title')
end
end
......@@ -10,11 +10,6 @@ class Stream::Multi < Stream::Base
I18n.t('streams.multi.title')
end
# @return [String]
def contacts_title
I18n.t('streams.multi.contacts_title')
end
def posts
@posts ||= ::EvilQuery::MultiStream.new(user, order, max_time, include_community_spotlight?).make_relation!
end
......
......@@ -16,10 +16,6 @@ class Stream::Public < Stream::Base
@posts ||= Post.all_public
end
def contacts_title
I18n.translate("streams.public.contacts_title")
end
def can_comment?(post)
post.author.local?
end
......
......@@ -18,10 +18,6 @@ shared_examples_for 'it is a stream' do
expect(@stream.send(:publisher_opts)).not_to be_nil
end
it 'has a #contacts title' do
expect(@stream.contacts_title).not_to be_nil
end
it 'has a contacts link' do
expect(@stream.contacts_link).not_to be_nil
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment