Fix some plural and puzzle strings, and remove other unused ones #2444

SafaAlfulaij · 2018-07-17T17:11:26Z

This will fix some plural messages to be plural aware, puzzle strings to not be puzzle, and remove unused strings.

Tests: Not tested, based on logic.

Fixes #2085

Signed-off-by: Safa AlFulaij [email protected]

Signed-off-by: Safa AlFulaij <[email protected]>

SafaAlfulaij · 2018-07-17T18:01:21Z

Alright, the errors now are that some Format strings are not valid, and I don't really know what this means, sorry.
Others are about strings being different in the translated values files (whether the string is new or changed). This is supposed to be updated correctly by Weblate, right?

bmarty

Hi @SafaAlfulaij ,

Thanks for this PR. I like to clean up the code as well.

If you remove a String from strings.xml, unfortunately Weblate will not remove already translated String from the strings.xml files for the other languages. You have to do this manually and include it in the PR.

So please remove the translation of the strings you've remove from the main strings.xml file.

Also, if you add a parameter in a string (ex: %1$s), it has to be done on all the translation too (this is the error reported by Travis). So in this case, it's safer to remove all the existing translations of those strings and let the community to translate it again with the new number of parameters.

Note that if you change an existing string, it's safer to create a new resource, to avoid bad translation.

Benoît

bmarty · 2018-07-18T14:36:06Z

vector/src/main/res/values/strings.xml

    <string name="room_participants_kick_prompt_msg">Are you sure that you want to kick this user from this chat?</string>
    <string name="room_participants_ban_prompt_msg">Are you sure that you want to ban this user from this chat?</string>

+    <!-- The variable can be a single name or a string of names ("A, ""B, ""C and D" > "A, B, C and D) -->


I do not understand the usage of " in this comment. Is there some typo?
Maybe write an example for clarity: "Bob" or "Bob and Alice" or "Bob, Alice and Charlie"

Just to give the translator an idea how the block is built, to show that there is a space after the comma.
And yes, human names are better :)
Will work now on it.

bmarty · 2018-07-18T14:36:50Z

vector/src/main/res/values/strings.xml

    <string name="room_participants_kick_prompt_msg">Are you sure that you want to kick this user from this chat?</string>
    <string name="room_participants_ban_prompt_msg">Are you sure that you want to ban this user from this chat?</string>

+    <!-- The variable can be a single name or a string of names ("A, ""B, ""C and D" > "A, B, C and D) -->
+    <string name="room_participants_invite_prompt_msg">"Are you sure you want to invite %s to this chat?"</string>
+    <!-- The building block of the first part of the string of names ("A, "/"B, ") -->


Same remark for this one

bmarty · 2018-07-18T15:04:25Z

Also "Tests: Not tested, based on logic." is a bit scary no? ;)

Signed-off-by: Safa AlFulaij <[email protected]>

SafaAlfulaij · 2018-07-18T16:18:05Z

“BUILD SUCCESSFUL in 3m 28s” 😭

Yes, “Tests: Not tested, based on logic.” is scary, but that is what you get when a translator works as a developer of a language he doesn't even fully understand :p
Anyway the auto test confirms that things are fine now :)

About the time strings change, maybe it's a bit too much, but I think it's better to give full control to the translator.
I'm pretty sure builtins in Android have something ready for this, not sure where…

SafaAlfulaij · 2018-08-17T09:39:32Z

@bmarty PING! :p
Please inform me about any other concerns.

bmarty

Thanks for the update. I've got one remark.

bmarty · 2018-08-21T13:30:30Z

vector/src/main/res/values-ar/strings.xml

@@ -71,14 +71,6 @@
    <string name="rooms_directory_header">دليل الغرف</string>
    <string name="no_room_placeholder">لا غرف</string>
    <string name="no_public_room_placeholder">لا غرف عمومية متوفرة</string>
-    <plurals name="public_room_nb_users">


I think this resource has been deleted by mistake, no? It's not deleted in the main strings.xml file. This remark is applicable to all other translations of public_room_nb_users as well

SafaAlfulaij · 2018-08-21T15:45:37Z

I've returned them but changed the tabs into spaces (I thought it's my browser/GitHub doing this). Not sure why weblate will do that for these strings only as other strings are using normal spaces…

bmarty · 2018-08-21T15:57:00Z

Ok, thanks, I've merged the PR

Update matrix-sdk.aar lib - build 1875 - Revision: ccf12449b8f09b06a7a8f501b9d7a382270b2305 Last rebase was performed June 1 2018. Here is the list of changes from vector-im/riot-android changes: Changes in Riot 0.8.XX (2018-08-24) =================================================== Features: - Manage server quota notices (#2440) Improvements: - Do not ask permission to write external storage at startup (#2483) - Update settings icon and transparent logo for notifications and navigation drawer (#2492) - URL previews are no longer requested from the server when displaying URL previews is disabled (PR #2514) - Fix some plural and puzzle strings, and remove other unused ones (#2444) - Manage System Alerts in a dedicated section Other changes: - Upgrade olm-sdk.aar from version 2.2.2 to version 2.3.0 - move PieFractionView from the SDK to the client (#2525) Bugfix: - Fix media sharing (#2530) - Fix notification sound issue in settings (#2524) - Disable app icon badge for "listen for event" notification (#2104) Changes in Riot 0.8.13 (2018-08-09) =================================================== Features: - Resurrect performance metrics (#2391) - Telemetry to report incidence of UISIs (#2330) - Add a previewer for previewing media before sending it into the room (#1742|#2445) - Implements ReplyTo feature (#2390) - Add auto completion for slash commands (#2384) - Support Room Versioning (#2441) Improvements: - Update matrix-sdk.aar lib (v0.9.7). - Piwik: Update the way how stats are reported (#2402) - Improve BugReport screen: display a preview of the screenshot (#2318) - In the settings, move theme settings just below "language" (#2439) - Improve the display of the sources of the message in the dialog (#2348) - Improve the display of the buttons and the reason in the room preview (#2352) - In the flair section on settings, notify the user when he has no flair (#2430) - Improve GDPR consent webview management (#2491) - Support external keyboard to send messages for recent devices (#220, #1279) - When user ignores or un-ignores someone, notify that the app will restart (#2437) Other changes: - Remove dependency to `android-gif-drawable` lib and use Glide to animate logo on Splashscreen (#2421) - Keep only Room.getState() method and remove Room.getLiveState() because they are similar (matrix-org/matrix-android-sdk#310) Bugfix: - Fix issue on incoming call screen when "Do not disturb mode" is active (#2417) - Fix issue when selecting sound for notifications in the settings - Fix issue when changing device name in the settings (#2416) - Fix issue on verifying device, update the wording of the description message (#1067) - Messages with code blocks show other HTML as plain text (#2280) - Message with <p> was sometimes not properly formatted (#2275) - Fix notification issue when Riot is not started (#2451) - Fix Unable to add Matrix apps (#2466) - Riot auto joined a public room (#2472) - Remove last traces of Firebase analytics (#2481) - code blocks are escaped and therefore hard readable (#2484) - Restore the navigation of the back button in the public rooms preview header (#2473) - Fix issue on preference screen: device lists was not displayed (#2409) - Ensure notification has a title (#2242) Changes in Riot 0.8.12 (2018-07-06) =================================================== Bugfix: - Fix issue on vanished favorite and low priority room (#2413) Changes in Riot 0.8.11 (2018-07-03) =================================================== Features: - Re-request keys manually for encrypted events (#2319) - Add option to send voice message to a room, using a third application to record message. To enable in the Labs settings (PR #1762) Improvements: - Update matrix-sdk.aar lib (v0.9.6). - New Floating Action Menu in Home screen (PR #2335) - Add spacing to device keys (#2314) - use apply() instead of commit() to save shared prefs (#2231) - Do not ring if "Do Not Disturb" is active (#1072) - Manage the "consent not given" error when declining a room invite Other changes: - Remove "Matrix application" activation from the Lab section in the settings (#2341) Bugfix: - Remove black borders on 18:9 phone (#2063) - Auto dismiss the join/reject room notification when user select an action (#2354) - Fix some crashes reported by the PlayStore (#2380, #2382, #2383, #2395) - Fix issues in UrlPreviews (#2312) Translations: - Galician thanks to Miguel Branco Build: - Add script to check code quality - Travis will now check if CHANGES.rst has been modified for each PR ------ Merge commit '94b7925a57b800db62b5ec87966d994ff53392b4' into develop # Conflicts: # vector/src/main/java/im/vector/activity/VectorRoomActivity.java # vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java # vector/src/main/java/im/vector/db/VectorContentProvider.java # vector/src/main/java/im/vector/dialogs/ConsentNotGivenHelper.kt # vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt # vector/src/main/res/values/strings.xml # vector/src/main/res/values/styles.xml

SafaAlfulaij · 2018-08-25T19:23:00Z

Thanks a lot. For a strange reason, the Arabic translation on Weblate is still not updated from the template file, while many (or even all) other languages got updated. Is there a button or something?

Thanks for the great work.

bmarty · 2018-08-27T08:09:43Z

What do you mean? Can you figured out a resource Id in arabic that is problematic?
Thanks

SafaAlfulaij · 2018-08-27T09:18:26Z

Never mind, it got updated now. Thanks a lot, again!

SafaAlfulaij added 5 commits July 17, 2018 20:05

Fix some plural and puzzle strings, and remove other unused ones

2b6b723

Update CHANGES.rst

ccdaa1c

Signed-off-by: Safa AlFulaij <[email protected]>

Minor fixes

d04345a

Signed-off-by: Safa AlFulaij <[email protected]>

Fix build

e604bbf

Signed-off-by: Safa AlFulaij <[email protected]>

Fix build 2

8fcdd01

Signed-off-by: Safa AlFulaij <[email protected]>

bmarty suggested changes Jul 18, 2018

View reviewed changes

SafaAlfulaij added 3 commits July 18, 2018 18:36

Fixes

151f51b

Signed-off-by: Safa AlFulaij <[email protected]>

Fixes 2

9425f8a

Signed-off-by: Safa AlFulaij <[email protected]>

Fixes 3, last, hopefully

5369d59

Signed-off-by: Safa AlFulaij <[email protected]>

SafaAlfulaij added 5 commits August 9, 2018 09:46

Merge branch 'develop' into develop

f0b620f

Fix conflicts

075afe2

Fixes

fa5ac61

Fixes

332ae58

Fix zh

0c3ca8b

bmarty suggested changes Aug 21, 2018

View reviewed changes

Return missing string

7bdc56c

bmarty approved these changes Aug 21, 2018

View reviewed changes

bmarty merged commit 5ed4078 into element-hq:develop Aug 21, 2018

bmarty added this to the Sprint 13 milestone Aug 21, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix some plural and puzzle strings, and remove other unused ones #2444

Fix some plural and puzzle strings, and remove other unused ones #2444

Uh oh!

SafaAlfulaij commented Jul 17, 2018

Uh oh!

SafaAlfulaij commented Jul 17, 2018

Uh oh!

bmarty left a comment

Uh oh!

bmarty Jul 18, 2018

Uh oh!

SafaAlfulaij Jul 18, 2018

Uh oh!

bmarty Jul 18, 2018

Uh oh!

bmarty commented Jul 18, 2018

Uh oh!

SafaAlfulaij commented Jul 18, 2018

Uh oh!

SafaAlfulaij commented Aug 17, 2018

Uh oh!

bmarty left a comment

Uh oh!

bmarty Aug 21, 2018 •

edited

Loading

Uh oh!

SafaAlfulaij commented Aug 21, 2018

Uh oh!

bmarty commented Aug 21, 2018

Uh oh!

SafaAlfulaij commented Aug 25, 2018

Uh oh!

bmarty commented Aug 27, 2018

Uh oh!

SafaAlfulaij commented Aug 27, 2018

Uh oh!

Uh oh!

Fix some plural and puzzle strings, and remove other unused ones #2444

Fix some plural and puzzle strings, and remove other unused ones #2444

Uh oh!

Conversation

SafaAlfulaij commented Jul 17, 2018

Uh oh!

SafaAlfulaij commented Jul 17, 2018

Uh oh!

bmarty left a comment

Choose a reason for hiding this comment

Uh oh!

bmarty Jul 18, 2018

Choose a reason for hiding this comment

Uh oh!

SafaAlfulaij Jul 18, 2018

Choose a reason for hiding this comment

Uh oh!

bmarty Jul 18, 2018

Choose a reason for hiding this comment

Uh oh!

bmarty commented Jul 18, 2018

Uh oh!

SafaAlfulaij commented Jul 18, 2018

Uh oh!

SafaAlfulaij commented Aug 17, 2018

Uh oh!

bmarty left a comment

Choose a reason for hiding this comment

Uh oh!

bmarty Aug 21, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SafaAlfulaij commented Aug 21, 2018

Uh oh!

bmarty commented Aug 21, 2018

Uh oh!

SafaAlfulaij commented Aug 25, 2018

Uh oh!

bmarty commented Aug 27, 2018

Uh oh!

SafaAlfulaij commented Aug 27, 2018

Uh oh!

Uh oh!

bmarty Aug 21, 2018 •

edited

Loading