-
-
Notifications
You must be signed in to change notification settings - Fork 7k
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
Fix inconsistent wording in import/export settings #26346
Conversation
I have tested this and I like it. There's one change I'd make though: The export process will be used more frequently than the import process, so rather than selecting Import by default, I'd switch the 2 menu items and call the menu category "Export and import"
|
Good point. Also, from a chronological viewpoint, export comes before import. You must first export your data, before you can import it. |
This pull request has merge conflicts that must be resolved before it can be merged. |
# Conflicts: # config/locales/ar.yml # config/locales/ms.yml
This pull request has resolved merge conflicts and is ready for review. |
This pull request has merge conflicts that must be resolved before it can be merged. |
# Conflicts: # config/locales/fi.yml
This pull request has resolved merge conflicts and is ready for review. |
This pull request has merge conflicts that must be resolved before it can be merged. |
# Conflicts: # app/views/settings/exports/show.html.haml # config/navigation.rb
This pull request has resolved merge conflicts and is ready for review. |
This pull request has merge conflicts that must be resolved before it can be merged. |
# Conflicts: # config/locales/lt.yml
This pull request has resolved merge conflicts and is ready for review. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #26346 +/- ##
=======================================
Coverage 85.00% 85.00%
=======================================
Files 1058 1058
Lines 28281 28281
Branches 4538 4538
=======================================
Hits 24040 24040
Misses 3078 3078
Partials 1163 1163 ☔ View full report in Codecov by Sentry. |
This pull request has merge conflicts that must be resolved before it can be merged. |
# Conflicts: # config/locales/ast.yml # config/locales/fi.yml # config/locales/hr.yml # config/locales/kab.yml # config/locales/lad.yml
This pull request has resolved merge conflicts and is ready for review. |
This pull request has merge conflicts that must be resolved before it can be merged. |
# Conflicts: # config/navigation.rb
This pull request has resolved merge conflicts and is ready for review. |
This pull request has merge conflicts that must be resolved before it can be merged. |
# Conflicts: # config/locales/en.yml
This pull request has resolved merge conflicts and is ready for review. |
This pull request has merge conflicts that must be resolved before it can be merged. |
This needs a rebase. I think at least portions of this make sense -- I wonder if chopping it up would make review more likely? |
You are probably right. First PR: #33032 |
I made some consistency changes to the wording in the Import and export section in settings.
I think consistency in UI texts is important. If multiple terms are being used interchangably about the same concept, end-users may be confused, and it also makes translating the software more difficult. When you are new to Mastodon, there are plenty of new things to learn (instances, federation, multiple mobile apps, etc.), so there is no need to confuse matters more. In longer texts you can express yourself more freely, but UI labels should be brief and consistent.
The changes are:
When clicking on Import and export menu item to expand it, open the first submenu item (Import). Currently the second item is open which is rather odd.highlights_on: :subpath
) on the confirmation page shown when trying to import a list of mismatching type, e.g. importing mutes as blocks.Rename “Export data” to just “Export” for consistency with Import. Menu item labels should be brief, and “data” is somewhat redundant in this context.(fixed in Rename "Data export" menu item #32099)followed_accounts.csv
tofollowing.csv
in the URLs and filenames of the exported CSV files so all types use the same terms as in the API, i.e. followers,following, mutes, blocks, domain_blocks (a different approach would be following the UI labels, i.e.muted_users.csv
etc.).I did not touch the header names in the CSV files. This has some BC issues, so I think this should be dealt with separately.
[1] Re “following”:
This word is a bit unusual, because it is used somewhat like a plural word meaning “followed users”. But this is what we use elsewhere. In particular, the word “follows” (plural noun) is generally not used in UI texts. Distinguishing following and followers is generally confusing, so in pages like these where space is not limited, we could use more elaborate terms, e.g “users you follow” and “users who follows you”. I like that idea.