Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split relationships page strings #12502

Merged
merged 1 commit into from
Dec 1, 2019
Merged

Split relationships page strings #12502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/relationships/show.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
.filter-subset
%strong= t 'relationships.relationship'
%ul
%li= filter_link_to t('accounts.following', count: current_account.following_count), relationship: nil
%li= filter_link_to t('accounts.followers', count: current_account.followers_count), relationship: 'followed_by'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could just access accounts.followers.other directly? Just thinking about reducing translation overhead

Copy link
Contributor Author

@brawaru brawaru Dec 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately no, they are similar in English, but may differ in other languages (they do in Russian actually). So I think it's the best solution for us to have separate strings based on context, that's what issue #10863 was exactly in the first place.

Also, accounts.following seems to be incorrect, because in original context it is used as plural, but in translation file it is a string:

https://github.com/tootsuite/mastodon/blob/01b1c377b1fea841b9823a3134e8f41ccc4b0f29/app/views/accounts/_header.html.haml#L23-L24

https://github.com/tootsuite/mastodon/blob/91284734af5923509d73c335f364db346303ef61/config/locales/en.yml#L56-L59

Want me to fix that in this or another PR?

%li= filter_link_to t('relationships.following'), relationship: nil
%li= filter_link_to t('relationships.followers'), relationship: 'followed_by'
%li= filter_link_to t('relationships.mutual'), relationship: 'mutual'

.filter-subset
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,8 @@ en:
relationships:
activity: Account activity
dormant: Dormant
followers: Followers
following: Following
last_active: Last active
most_recent: Most recent
moved: Moved
Expand Down