fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-22 22:19:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display “Show newer” and “Show older” instead of “Show more” in public pages (#15052)

Browse source
This commit is contained in:
Mélanie Chauvel 2020-11-04 21:15:45 +01:00 committed by GitHub
parent b29defb851
commit 68d4b2b83e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/statuses_helper.rb
View file

@ -4,8 +4,12 @@ module StatusesHelper
EMBEDDED_CONTROLLER = 'statuses' EMBEDDED_CONTROLLER = 'statuses'
EMBEDDED_ACTION = 'embed' EMBEDDED_ACTION = 'embed'
def link_to_more(url) def link_to_newer(url)
link_to t('statuses.show_more'), url, class: 'load-more load-gap' link_to t('statuses.show_newer'), url, class: 'load-more load-gap'
end
def link_to_older(url)
link_to t('statuses.show_older'), url, class: 'load-more load-gap'
end end
def nothing_here(extra_classes = '') def nothing_here(extra_classes = '')

4
app/views/accounts/show.html.haml
View file

@ -39,12 +39,12 @@
= render partial: 'statuses/status', collection: @pinned_statuses, as: :status, locals: { pinned: true } = render partial: 'statuses/status', collection: @pinned_statuses, as: :status, locals: { pinned: true }
- if @newer_url - if @newer_url
.entry= link_to_more @newer_url .entry= link_to_newer @newer_url
= render partial: 'statuses/status', collection: @statuses, as: :status = render partial: 'statuses/status', collection: @statuses, as: :status
- if @older_url - if @older_url
.entry= link_to_more @older_url .entry= link_to_older @older_url
.column-1 .column-1
- if @account.memorial? - if @account.memorial?

8
app/views/statuses/_status.html.haml
View file

@ -17,7 +17,7 @@
- if status.reply? && include_threads - if status.reply? && include_threads
- if @next_ancestor - if @next_ancestor
.entry{ class: entry_classes } .entry{ class: entry_classes }
= link_to_more ActivityPub::TagManager.instance.url_for(@next_ancestor) = link_to_older ActivityPub::TagManager.instance.url_for(@next_ancestor)
= render partial: 'statuses/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }, autoplay: autoplay = render partial: 'statuses/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }, autoplay: autoplay
@ -44,16 +44,16 @@
- if include_threads - if include_threads
- if @since_descendant_thread_id - if @since_descendant_thread_id
.entry{ class: entry_classes } .entry{ class: entry_classes }
= link_to_more short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1) = link_to_newer short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1)
- @descendant_threads.each do |thread| - @descendant_threads.each do |thread|
= render partial: 'statuses/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id }, autoplay: autoplay = render partial: 'statuses/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id }, autoplay: autoplay
- if thread[:next_status] - if thread[:next_status]
.entry{ class: entry_classes } .entry{ class: entry_classes }
= link_to_more ActivityPub::TagManager.instance.url_for(thread[:next_status]) = link_to_newer ActivityPub::TagManager.instance.url_for(thread[:next_status])
- if @next_descendant_thread - if @next_descendant_thread
.entry{ class: entry_classes } .entry{ class: entry_classes }
= link_to_more short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1) = link_to_newer short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)
- if include_threads && !embedded_view? && !user_signed_in? - if include_threads && !embedded_view? && !user_signed_in?
.entry{ class: entry_classes } .entry{ class: entry_classes }

2
config/locales/en.yml
View file

@ -1210,6 +1210,8 @@ en:
other: "%{count} votes" other: "%{count} votes"
vote: Vote vote: Vote
show_more: Show more show_more: Show more
show_newer: Show newer
show_older: Show older
show_thread: Show thread show_thread: Show thread
sign_in_to_participate: Sign in to participate in the conversation sign_in_to_participate: Sign in to participate in the conversation
title: '%{name}: "%{quote}"' title: '%{name}: "%{quote}"'