[ios] Change text "X objects" to "Y places, Z tracks" in Bookmarks and Tracks dialog #8245

itfarrier · 2024-05-21T19:27:08Z

Refactor using a switch statement

iphone/Maps/Categories/MWMCategory+PlacesCountTitle.swift

itfarrier · 2024-05-26T18:23:02Z

@biodranik, hello and sorry for pushing, maybe you saw and forgot mentions in this thread. Could you please answer conversations above?

biodranik · 2024-05-27T07:54:56Z

hello and sorry for pushing, maybe you saw and forgot mentions in this thread. Could you please answer conversations above?

Both my comments are not resolved, or am I missing something?

itfarrier · 2024-05-27T15:53:22Z

hello and sorry for pushing, maybe you saw and forgot mentions in this thread. Could you please answer conversations above?

Both my comments are not resolved, or am I missing something?

Hello, @biodranik, I resolved your threads. And my latest question was "What about using "(String(format: L("bookmarks_places"), bookmarksCount)), (String(format: L("tracks"), trackCount))" all the time? I mean no conditions."

biodranik

Thanks! We usually split string regeneration commit into a separate one, to help with merge conflicts. Do you know how to amend commit and split it into two?

itfarrier · 2024-05-28T05:44:03Z

Thanks! We usually split string regeneration commit into a separate one, to help with merge conflicts. Do you know how to amend commit and split it into two?

@biodranik, hello and pls check.

biodranik · 2024-05-28T06:12:04Z

Did you remove strings manually? There is a tools/unix/generate_localizations.sh script for it.

The first commit should have your changes + cleanup in strings.txt
Then you run the script
Then create a second commit with automatically regenerated localization files and title [strings] Regenerated.

itfarrier · 2024-05-28T16:53:47Z

Did you remove strings manually? There is a tools/unix/generate_localizations.sh script for it.

The first commit should have your changes + cleanup in strings.txt

Then you run the script

Then create a second commit with automatically regenerated localization files and title [strings] Regenerated.

@biodranik, done.

biodranik

Thanks for your patience and contribution!

Дзякуй!

biodranik

Ooops, sorry, I've somehow missed failed Android checks, there is one usage of the deleted string:

      if (mEntity.size() == 0)
        return getQuantified(resources, R.plurals.objects, 0);

We can make it better for the zero case (btw, it should also иу handled in the iOS code).

What about changing Android code to use bookmarks_empty_list_title translation and add the same translation to iOS when there are 0 items?

itfarrier · 2024-05-30T05:08:30Z

Ooops, sorry, I've somehow missed failed Android checks, there is one usage of the deleted string:
      if (mEntity.size() == 0)
        return getQuantified(resources, R.plurals.objects, 0);
We can make it better for the zero case (btw, it should also иу handled in the iOS code).

What about changing Android code to use bookmarks_empty_list_title translation and add the same translation to iOS when there are 0 items?

@biodranik, hello. These are current situation in both platforms:

Android:

      final Resources resources = mSize.getResources();
      final int bookmarksCount = mEntity.getBookmarksCount();
      final int tracksCount = mEntity.getTracksCount();

      if (mEntity.size() == 0)
        return getQuantified(resources, R.plurals.objects, 0);

      if (bookmarksCount > 0 && tracksCount > 0)
      {
        final String bookmarks = getQuantified(resources, R.plurals.places, bookmarksCount);
        final String tracks = getQuantified(resources, R.plurals.tracks, tracksCount);
        final String template = resources.getString(R.string.comma_separated_pair);
        return String.format(template, bookmarks, tracks);
      }

      if (bookmarksCount > 0)
        return getQuantified(resources, R.plurals.places, bookmarksCount);

      return getQuantified(resources, R.plurals.tracks, tracksCount);

iOS:

    if (bookmarksCount > 0 && trackCount > 0) ||
      (bookmarksCount == 0 && trackCount == 0) {
       return String(format: L("objects"), bookmarksCount + trackCount)
    } else if (bookmarksCount > 0) {
      return String(format: L("bookmarks_places"), bookmarksCount)
    } else {
       return String(format: L("tracks"), trackCount)
    }

My proposal is (String(format: L("bookmarks_places"), bookmarksCount)), (String(format: L("tracks"), trackCount)) on both platforms for all cases. Please, give your opinion.

biodranik · 2024-05-30T05:54:24Z

@itfarrier I like it!

biodranik · 2024-05-31T07:10:45Z

Looks like it was a misunderstanding. The code should print:

0 bookmarks, 0 tracks
10 bookmarks, 5 tracks
5 bookmarks <--
6 tracks <--

itfarrier · 2024-05-31T14:49:04Z

Looks like it was a misunderstanding. The code should print:

0 bookmarks, 0 tracks 10 bookmarks, 5 tracks 5 bookmarks <-- 6 tracks <--

@biodranik, please, see.

biodranik

Looks like translations for 1 bookmark or 1 track are incorrect, can you please check it/fix it too?

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

biodranik · 2024-05-31T20:52:28Z

Note that Android correctly used the combining string comma_separated_pair, which may differ for different languages.

itfarrier · 2024-06-01T14:43:14Z

Looks like translations for 1 bookmark or 1 track are incorrect, can you please check it/fix it too?

@biodranik, fixed. That was my bad, sorry.

itfarrier · 2024-06-04T17:04:08Z

@biodranik, could you please review?

biodranik · 2024-06-04T21:26:22Z

Thanks, on iOS tracks and bookmarks are not using singular/plural forms properly. Are strings properly regenerated?

itfarrier · 2024-06-06T10:56:18Z

@biodranik

biodranik · 2024-06-09T22:19:52Z

iphone/Maps/Categories/MWMCategory+PlacesCountTitle.swift

+    let bookmarks = String(format: L("bookmarks_places"), bookmarksCount)
+    let tracks = String(format: L("tracks"), trackCount)
+
+    if (bookmarksCount == 0 && trackCount == 0) || (bookmarksCount > 0 && trackCount > 0) {
+      return "\(bookmarks), \(tracks)"
+    }
+
+    if (bookmarksCount > 0) {
+      return bookmarks
    }
+
+    return tracks
+


Suggested change

let bookmarks = String(format: L("bookmarks_places"), bookmarksCount)

let tracks = String(format: L("tracks"), trackCount)

if (bookmarksCount == 0 && trackCount == 0) || (bookmarksCount > 0 && trackCount > 0) {

return "\(bookmarks), \(tracks)"

}

if (bookmarksCount > 0) {

return bookmarks

}

return tracks

if (bookmarksCount == 0 && trackCount == 0 || bookmarksCount > 0 && trackCount > 0) {

return String(format: L("comma_separated_pair"),

String(format: L("bookmarks_places"), bookmarksCount),

String(format: L("tracks"), trackCount))

}

if (bookmarksCount > 0) {

return String(format: L("bookmarks_places"), bookmarksCount)

}

return String(format: L("tracks"), trackCount)

@kirylkaveryn for some reason, singular forms are not printed with this code on iOS 15 simulator. Do you have any ideas why it doesn't work?

Hmm it seems like the plurals have only the other field and miss the one for EN.

I didn't check the other translations.

@kirylkaveryn thanks for the hint. Looks like our Twine tool does not generate plurals from a generic language (en) into sublanguage (en-GB):

diff iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict 6c6 < * Language: en --> --- > * Language: en-GB --> 22,23d21 < <key>one</key> < <string>%d bookmark</string> 39,40d36 < <key>one</key> < <string>%d file was found. You can see it after conversion.</string> 56,57d51 < <key>one</key> < <string>%d track</string>

biodranik · 2024-06-09T22:20:39Z

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

-        return getQuantified(resources, R.plurals.objects, 0);
-
-      if (bookmarksCount > 0 && tracksCount > 0)
+      if (bookmarksCount == 0 && tracksCount == 0 || bookmarksCount > 0 && tracksCount > 0)
      {
        final String bookmarks = getQuantified(resources, R.plurals.places, bookmarksCount);


iOS uses bookmarks_places string, it would be better to use it on Android too, and delete the places string.

biodranik · 2024-06-09T22:34:20Z

You also need to add this change and then regenerate strings with tools/unix/generate_localizations.sh

   [comma_separated_pair]
     comment = A number of bookmarks and a number of tracks, separated by comma, like: 1 bookmark, 5 tracks
-    tags = android
+    tags = android,ios
     en = %@, %@

biodranik · 2024-06-27T21:04:37Z

@itfarrier do you need any help with the PR?

itfarrier · 2024-06-30T09:10:46Z

@itfarrier do you need any help with the PR?

Hello. Not for now. I've just change the work and now too much loading on it, sorry.

- Remove “objects” from strings.txt; - Add condition flow for Android; - Add condition flow for iOS. Fixes: organicmaps#8217 Signed-off-by: Dzmitry Padabed <itfarrier@icloud.com>

Signed-off-by: Alexander Borsuk <me@alex.bio>

biodranik · 2024-06-30T18:33:18Z

@itfarrier no problem, I've finished the PR. @vng PTAL

biodranik

Thanks for your hard work!

biodranik · 2024-06-30T19:19:50Z

.git-blame-ignore-revs

@@ -1,3 +1,4 @@
 6aa73face8b5eb8e026cfafa40d1983d4a0502c0
 480fa6c2fcf53be296504ac6ba8e6b3d70f92b42
 a6ede2b1466f0c9d8a443600ef337ba6b5832e58
+1377b81bf1cac72bb6da192da7fed6696d5d5281


This is to have a cleaner git history for data/strings.txt

itfarrier force-pushed the 8217 branch from 3eae94f to 790f062 Compare May 21, 2024 19:32

biodranik reviewed May 21, 2024

View reviewed changes

iphone/Maps/Categories/MWMCategory+PlacesCountTitle.swift Outdated Show resolved Hide resolved

biodranik reviewed May 21, 2024

View reviewed changes

iphone/Maps/Categories/MWMCategory+PlacesCountTitle.swift Show resolved Hide resolved

itfarrier force-pushed the 8217 branch 6 times, most recently from ccc1a0c to 4fc5120 Compare May 26, 2024 18:20

itfarrier force-pushed the 8217 branch from 4fc5120 to e3d99e1 Compare May 27, 2024 06:22

itfarrier force-pushed the 8217 branch 2 times, most recently from b6ec65e to 9dbb601 Compare May 27, 2024 15:51

biodranik reviewed May 27, 2024

View reviewed changes

itfarrier force-pushed the 8217 branch 2 times, most recently from d56c272 to 914ce76 Compare May 28, 2024 05:29

biodranik added this to the Needs alpha/beta testing milestone May 28, 2024

itfarrier force-pushed the 8217 branch 3 times, most recently from ff2b1b2 to ed60a67 Compare May 28, 2024 16:52

biodranik approved these changes May 28, 2024

View reviewed changes

biodranik requested changes May 28, 2024

View reviewed changes

itfarrier force-pushed the 8217 branch from ed60a67 to 06d8af6 Compare May 29, 2024 06:29

itfarrier force-pushed the 8217 branch 2 times, most recently from 54961fc to e0976b8 Compare May 31, 2024 14:48

biodranik reviewed May 31, 2024

View reviewed changes

itfarrier force-pushed the 8217 branch 2 times, most recently from bfb04f1 to 7199568 Compare June 1, 2024 14:21

itfarrier force-pushed the 8217 branch 2 times, most recently from 3bc6040 to dde9435 Compare June 4, 2024 08:34

itfarrier force-pushed the 8217 branch 2 times, most recently from cb6ff87 to 15dca90 Compare June 6, 2024 10:51

itfarrier force-pushed the 8217 branch 2 times, most recently from 8d42649 to 405efcb Compare June 7, 2024 17:14

biodranik reviewed Jun 9, 2024

View reviewed changes

itfarrier force-pushed the 8217 branch 2 times, most recently from e12ea4b to 50a7947 Compare June 14, 2024 08:20

biodranik mentioned this pull request Jun 22, 2024

Fix Polish plurals #8526

Merged

itfarrier and others added 2 commits June 30, 2024 18:11

[android] [ios] Replace objects via bookmarks and tracks in ui string

61e5f8d

- Remove “objects” from strings.txt; - Add condition flow for Android; - Add condition flow for iOS. Fixes: organicmaps#8217 Signed-off-by: Dzmitry Padabed <itfarrier@icloud.com>

[strings] Regenerated

f76c0cf

Signed-off-by: Alexander Borsuk <me@alex.bio>

biodranik force-pushed the 8217 branch from 50a7947 to f76c0cf Compare June 30, 2024 18:30

biodranik approved these changes Jun 30, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ios] Change text "X objects" to "Y places, Z tracks" in Bookmarks and Tracks dialog #8245

[ios] Change text "X objects" to "Y places, Z tracks" in Bookmarks and Tracks dialog #8245

itfarrier commented May 21, 2024

itfarrier commented May 26, 2024

biodranik commented May 27, 2024

itfarrier commented May 27, 2024

biodranik left a comment

itfarrier commented May 28, 2024

biodranik commented May 28, 2024

itfarrier commented May 28, 2024

biodranik left a comment

biodranik left a comment •

edited

Loading

itfarrier commented May 30, 2024

biodranik commented May 30, 2024

biodranik commented May 31, 2024

itfarrier commented May 31, 2024

biodranik left a comment

biodranik commented May 31, 2024

itfarrier commented Jun 1, 2024

itfarrier commented Jun 4, 2024

biodranik commented Jun 4, 2024

itfarrier commented Jun 6, 2024

biodranik Jun 9, 2024

kirylkaveryn Jun 10, 2024 •

edited

Loading

biodranik Jun 30, 2024

biodranik Jun 9, 2024 •

edited

Loading

biodranik commented Jun 9, 2024

biodranik commented Jun 27, 2024

itfarrier commented Jun 30, 2024

biodranik commented Jun 30, 2024

biodranik left a comment

biodranik Jun 30, 2024

[ios] Change text "X objects" to "Y places, Z tracks" in Bookmarks and Tracks dialog #8245

Are you sure you want to change the base?

[ios] Change text "X objects" to "Y places, Z tracks" in Bookmarks and Tracks dialog #8245

Conversation

itfarrier commented May 21, 2024

itfarrier commented May 26, 2024

biodranik commented May 27, 2024

itfarrier commented May 27, 2024

biodranik left a comment

Choose a reason for hiding this comment

itfarrier commented May 28, 2024

biodranik commented May 28, 2024

itfarrier commented May 28, 2024

biodranik left a comment

Choose a reason for hiding this comment

biodranik left a comment • edited Loading

Choose a reason for hiding this comment

itfarrier commented May 30, 2024

biodranik commented May 30, 2024

biodranik commented May 31, 2024

itfarrier commented May 31, 2024

biodranik left a comment

Choose a reason for hiding this comment

biodranik commented May 31, 2024

itfarrier commented Jun 1, 2024

itfarrier commented Jun 4, 2024

biodranik commented Jun 4, 2024

itfarrier commented Jun 6, 2024

biodranik Jun 9, 2024

Choose a reason for hiding this comment

kirylkaveryn Jun 10, 2024 • edited Loading

Choose a reason for hiding this comment

biodranik Jun 30, 2024

Choose a reason for hiding this comment

biodranik Jun 9, 2024 • edited Loading

Choose a reason for hiding this comment

biodranik commented Jun 9, 2024

biodranik commented Jun 27, 2024

itfarrier commented Jun 30, 2024

biodranik commented Jun 30, 2024

biodranik left a comment

Choose a reason for hiding this comment

biodranik Jun 30, 2024

Choose a reason for hiding this comment

biodranik left a comment •

edited

Loading

kirylkaveryn Jun 10, 2024 •

edited

Loading

biodranik Jun 9, 2024 •

edited

Loading