From 81bba30312a1444cd9bb13a7f2bca613c7ee6af4 Mon Sep 17 00:00:00 2001
From: fin-w <41450706+fin-w@users.noreply.github.com>
Date: Sat, 28 Dec 2024 18:51:11 +0000
Subject: [PATCH] Tidy translation strings for better Weblate translation
(#4833)
The way that translations are shown on the Weblate interface is
sometimes incorrect compared to how the string resources are processed
by Android, I think because of how Weblate reads newlines and spaces. I
guess it's Weblate's fault, but since that's what we use, I'm hoping
this MR fixes the discrepancy, or at least minimises it.
I've opted to collapse multi-line strings onto one line (i.e.
`help_empty_home`), unless there's a list or something (i.e.
`wellbeing_mode_notice`) in which case (for XML source readability)
minimal newlines are used which hopefully makes the Weblate issue
uniform and minor, if it appears at all.
Here's an example of a good string in the strings.xml:
```
Your post failed to upload and has been saved to drafts.\n\nEither the server could not be contacted, or it rejected the post.
```
How it appears in Weblate (note that there no extra spaces anywhere):
Here are the problems:
### Example 1
String in strings.xml:
```
The address or domain of any instance can be entered
here, such as mastodon.social, icosahedron.website, social.tchncs.de, and
more!
\n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
join and create an account there.\n\nAn instance is a single place where your account is
hosted, but you can easily communicate with and follow folks on other instances as though
you were on the same site.
\n\nMore info can be found at joinmastodon.org.
```
How it appears in Weblate (note the spaces between words where there is
a newline char in the strings.xml, and the trailing spaces at the very
end of the string because the XML tag is on the next line):
### Example 2
String in strings.xml:
```
Some information that might affect your mental wellbeing will be hidden. This includes:\n\n
- Favorite/Boost/Follow notifications\n
- Favorite/Boost count on posts\n
- Follower/Post stats on profiles\n\n
Push-notifications will not be affected, but you can review your notification preferences manually.
```
How it appears in Weblate (note the incorrect space in front of the last
line of the source and target languages):
### Example 3
String in strings.xml:
```
This is your lists view. You can define a number of private lists and add accounts to that.
\n\n
NOTE that you can only add accounts you follow to your lists.
\n\n
These lists can be used as a tab in Account preferences [iconics gmd_account_circle] [iconics gmd_navigate_next] Tabs.
```
How it appears in Weblate (for some reason the target language string
keeps having more and more spaces added to it, I can't delete them, they
keeping being added back again, perhaps it's because of only having \n
newline text on a line?):
There are other issues as well, and I don't know what causes them. They
should be fixed somehow, but that might be (automatic?) formatting or
something at your end that I can't help with. You can see some of them
fairly recently by browsing
https://weblate.tusky.app/changes/browse/tusky/tusky/cy/ - entries where
it says "String updated in the repository" and the edit is just
whitespace changes. Here's an example where extra whitespace keeps
getting added to the target language:
String in strings.xml:
```
Your server knows that this post was edited, but does not have a copy of the edits, so they can\'t be shown to you.\n\nThis is Mastodon issue #25398.
```
How it appears in Weblate (the incorrect spaces keep getting added back
in the target language):
---
app/src/main/res/values/strings.xml | 39 +++++++----------------------
1 file changed, 9 insertions(+), 30 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 296a9334b..cdec38c39 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -256,15 +256,7 @@
Connecting…
- The address or domain of any instance can be entered
- here, such as mastodon.social, icosahedron.website, social.tchncs.de, and
- more!
- \n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
- join and create an account there.\n\nAn instance is a single place where your account is
- hosted, but you can easily communicate with and follow folks on other instances as though
- you were on the same site.
- \n\nMore info can be found at joinmastodon.org.
-
+ The address or domain of any instance can be entered here, such as mastodon.social, icosahedron.website, social.tchncs.de, and more!\n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to join and create an account there.\n\nAn instance is a single place where your account is hosted, but you can easily communicate with and follow folks on other instances as though you were on the same site.\n\nMore info can be found at joinmastodon.org.
Finishing Media Upload
Uploading…
Download
@@ -736,12 +728,11 @@
Your private note about this account
Saved!
- Some information that might affect your mental wellbeing will be hidden. This includes:\n\n
- - Favorite/Boost/Follow notifications\n
- - Favorite/Boost count on posts\n
- - Follower/Post stats on profiles\n\n
- Push-notifications will not be affected, but you can review your notification preferences manually.
-
+ Some information that might affect your mental wellbeing will be hidden. This includes:
+\n\n- Favorite/Boost/Follow notifications
+\n- Favorite/Boost count on posts
+\n- Follower/Post stats on profiles
+\n\nPush-notifications will not be affected, but you can review your notification preferences manually.
Review Notifications
Limit timeline notifications
Hide quantitative stats on posts
@@ -835,21 +826,9 @@
Edit keyword
%1$s: %2$s
- This is your home timeline. It shows the recent posts of the accounts
- you follow.\n\nTo explore accounts you can either discover them in one of the other timelines.
- For example the local timeline of your instance [iconics gmd_group]. Or you can search them
- by name [iconics gmd_search]; for example search for Tusky to find our Mastodon account.
- Here are your private messages; sometimes called conversations or direct messages (DM).
- \n\nPrivate messages are created by setting the visibility [iconics gmd_public] of a post to [iconics gmd_mail] Direct and
- mentioning one or more users in the text.
- \n\nFor example you can start on the profile view of an account and tap the create button [iconics gmd_edit] and change the visibility.
-
- This is your lists view. You can define a number of private lists and add accounts to that.
- \n\n
- NOTE that you can only add accounts you follow to your lists.
- \n\n
- These lists can be used as a tab in Account preferences [iconics gmd_account_circle] [iconics gmd_navigate_next] Tabs.
-
+ This is your home timeline. It shows the recent posts of the accounts you follow.\n\nTo explore accounts you can either discover them in one of the other timelines. For example the local timeline of your instance [iconics gmd_group]. Or you can search them by name [iconics gmd_search]; for example search for Tusky to find our Mastodon account.
+ Here are your private messages; sometimes called conversations or direct messages (DM).\n\nPrivate messages are created by setting the visibility [iconics gmd_public] of a post to [iconics gmd_mail] Direct and mentioning one or more users in the text.\n\nFor example you can start on the profile view of an account and tap the create button [iconics gmd_edit] and change the visibility.
+ This is your lists view. You can define a number of private lists and add accounts to that.\n\nNOTE that you can only add accounts you follow to your lists.\n\nThese lists can be used as a tab in Account preferences [iconics gmd_account_circle] [iconics gmd_navigate_next] Tabs.
Load newest notifications
Copy version and device information