parent
f066daedbb
commit
ac5a7746e2
12 changed files with 1 additions and 53 deletions
|
|
@ -4,6 +4,7 @@
|
||||||
* Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554)
|
* 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)
|
* 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)
|
* 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
|
## Bug fixes
|
||||||
* Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
|
* Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
|
||||||
|
|
|
||||||
|
|
@ -1271,33 +1271,26 @@ en:
|
||||||
|
|
||||||
mentions:
|
mentions:
|
||||||
title: "@Mentions"
|
title: "@Mentions"
|
||||||
contacts_title: "People who mentioned you"
|
|
||||||
|
|
||||||
comment_stream:
|
comment_stream:
|
||||||
title: "Commented posts"
|
title: "Commented posts"
|
||||||
contacts_title: "People whose posts you commented on"
|
|
||||||
|
|
||||||
like_stream:
|
like_stream:
|
||||||
title: "Like stream"
|
title: "Like stream"
|
||||||
contacts_title: "People whose posts you like"
|
|
||||||
|
|
||||||
followed_tag:
|
followed_tag:
|
||||||
title: "#Followed tags"
|
title: "#Followed tags"
|
||||||
contacts_title: "People who dig these tags"
|
|
||||||
add_a_tag: "Add a tag"
|
add_a_tag: "Add a tag"
|
||||||
follow: "Follow"
|
follow: "Follow"
|
||||||
|
|
||||||
tags:
|
tags:
|
||||||
title: "Posts tagged: %{tags}"
|
title: "Posts tagged: %{tags}"
|
||||||
contacts_title: "People who dig this tag"
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
title: "Public activity"
|
title: "Public activity"
|
||||||
contacts_title: "Recent posters"
|
|
||||||
|
|
||||||
multi:
|
multi:
|
||||||
title: "Stream"
|
title: "Stream"
|
||||||
contacts_title: "People in your stream"
|
|
||||||
|
|
||||||
aspects:
|
aspects:
|
||||||
title: "My aspects"
|
title: "My aspects"
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,6 @@ en:
|
||||||
|
|
||||||
followed_tag:
|
followed_tag:
|
||||||
title: "#Followed tags"
|
title: "#Followed tags"
|
||||||
contacts_title: "People who dig these tags"
|
|
||||||
add_a_tag: "Add a tag"
|
add_a_tag: "Add a tag"
|
||||||
follow: "Follow"
|
follow: "Follow"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,17 +85,6 @@ class Stream::Aspect < Stream::Base
|
||||||
@all_aspects ||= aspect_ids.length == user.aspects.size
|
@all_aspects ||= aspect_ids.length == user.aspects.size
|
||||||
end
|
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
|
# Provides a link to the user to the contacts page that corresponds with
|
||||||
# the stream's active aspects.
|
# the stream's active aspects.
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -49,11 +49,6 @@ class Stream::Base
|
||||||
includes(:profile)
|
includes(:profile)
|
||||||
end
|
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]
|
# @return [String]
|
||||||
def contacts_link
|
def contacts_link
|
||||||
Rails.application.routes.url_helpers.contacts_path
|
Rails.application.routes.url_helpers.contacts_path
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,4 @@ class Stream::Comments < Stream::Base
|
||||||
def posts
|
def posts
|
||||||
@posts ||= EvilQuery::CommentedPosts.new(user).posts
|
@posts ||= EvilQuery::CommentedPosts.new(user).posts
|
||||||
end
|
end
|
||||||
|
|
||||||
def contacts_title
|
|
||||||
I18n.translate('streams.comment_stream.contacts_title')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,6 @@ class Stream::FollowedTag < Stream::Base
|
||||||
@posts ||= StatusMessage.user_tag_stream(user, tag_ids)
|
@posts ||= StatusMessage.user_tag_stream(user, tag_ids)
|
||||||
end
|
end
|
||||||
|
|
||||||
def contacts_title
|
|
||||||
I18n.translate('streams.followed_tag.contacts_title')
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def tag_string
|
def tag_string
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,4 @@ class Stream::Likes < Stream::Base
|
||||||
def posts
|
def posts
|
||||||
@posts ||= EvilQuery::LikedPosts.new(user).posts
|
@posts ||= EvilQuery::LikedPosts.new(user).posts
|
||||||
end
|
end
|
||||||
|
|
||||||
def contacts_title
|
|
||||||
I18n.translate('streams.like_stream.contacts_title')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,4 @@ class Stream::Mention < Stream::Base
|
||||||
def posts
|
def posts
|
||||||
@posts ||= StatusMessage.where_person_is_mentioned(self.user.person)
|
@posts ||= StatusMessage.where_person_is_mentioned(self.user.person)
|
||||||
end
|
end
|
||||||
|
|
||||||
def contacts_title
|
|
||||||
I18n.translate('streams.mentions.contacts_title')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -10,11 +10,6 @@ class Stream::Multi < Stream::Base
|
||||||
I18n.t('streams.multi.title')
|
I18n.t('streams.multi.title')
|
||||||
end
|
end
|
||||||
|
|
||||||
# @return [String]
|
|
||||||
def contacts_title
|
|
||||||
I18n.t('streams.multi.contacts_title')
|
|
||||||
end
|
|
||||||
|
|
||||||
def posts
|
def posts
|
||||||
@posts ||= ::EvilQuery::MultiStream.new(user, order, max_time, include_community_spotlight?).make_relation!
|
@posts ||= ::EvilQuery::MultiStream.new(user, order, max_time, include_community_spotlight?).make_relation!
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,6 @@ class Stream::Public < Stream::Base
|
||||||
@posts ||= Post.all_public
|
@posts ||= Post.all_public
|
||||||
end
|
end
|
||||||
|
|
||||||
def contacts_title
|
|
||||||
I18n.translate("streams.public.contacts_title")
|
|
||||||
end
|
|
||||||
|
|
||||||
def can_comment?(post)
|
def can_comment?(post)
|
||||||
post.author.local?
|
post.author.local?
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,6 @@ shared_examples_for 'it is a stream' do
|
||||||
expect(@stream.send(:publisher_opts)).not_to be_nil
|
expect(@stream.send(:publisher_opts)).not_to be_nil
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has a #contacts title' do
|
|
||||||
expect(@stream.contacts_title).not_to be_nil
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'has a contacts link' do
|
it 'has a contacts link' do
|
||||||
expect(@stream.contacts_link).not_to be_nil
|
expect(@stream.contacts_link).not_to be_nil
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue