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.

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

Use different strings on exports page #12569

Merged
merged 1 commit into from
Dec 19, 2019
Merged

Use different strings on exports page #12569

merged 1 commit into from
Dec 19, 2019

Conversation

brawaru
Copy link
Contributor

@brawaru brawaru commented Dec 8, 2019

Currently the page re-uses strings from other contexts which doesn't fit very well - strings incorrectly lowercase-d and pluralized, when they don't need to be, because it's a table.

This PR changes page to re-use accounts.toots.other directly, and admin.accounts for "Following" and "Follows". This should look more aesthetically pleasing.

I cannot set up local testing Mastodon instance, so please carefully review the changes or test them on your local instance. Thanks!

%td= number_with_delimiter @export.total_statuses
%td
%tr
%th= t('exports.follows')
Copy link
Member

Choose a reason for hiding this comment

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

Why replace a string that seems to exist specifically for this page, though?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's kind of looks off with that “You” prefix being alongside with the ones above and below. And for prefix in general, I think it's redundant because the page itself is suggesting that it's your data to export, probably can remove it from the ones below too.

@brawaru
Copy link
Contributor Author

brawaru commented Dec 8, 2019

Hm, why did CI fail with complaint about unused key? I mean, yeah, there is such change. But I perfectly can see from search that this string is still being used in other files, so it's strange why it fails as unused. Probably cannot use direct access then and must duplicate the string, because I'm not sure there is a magic number that will fall to other plural category in every single language.

@brawaru
Copy link
Contributor Author

brawaru commented Dec 8, 2019

Okay, I have found accounts.posts_tab_heading, which is used on user profiles before “Toots and Replies” tab. I'm not sure this is a good idea to use strings from such different contexts, but this is the only option to avoid string duplication, plus from search it looks safe to re-use. I'll give it a try in a minute.

Currently the page re-uses strings from other contexts which doesn't fit
very well - strings incorrectly lowercase-d and pluralized, when they
don't need to be, because it's a table.

This commit changes page to re-use accounts.posts_tab_heading for toots,
and admin.accounts for "Following" and "Follows". This all should look
more aesthetically pleasing.
@Gargron Gargron merged commit 902c6be into mastodon:master Dec 19, 2019
@brawaru brawaru deleted the fix/i18n-exports-contexts branch April 2, 2020 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants