[twine] Add first plurals

4 files changed, 37 insertions, 33 deletions

diff --git a/android/src/com/mapswithme/maps/bookmarks/Holders.java b/android/src/com/mapswithme/maps/bookmarks/Holders.java
index ea8bee6d29..e32e126d93 100644
--- a/android/src/com/mapswithme/maps/bookmarks/Holders.java
+++ b/android/src/com/mapswithme/maps/bookmarks/Holders.java
@@ -101,7 +101,7 @@ public class Holders
 
     void setSize(int size)
     {
-      mSize.setText(mSize.getResources().getString(R.string.bookmarks_places, String.valueOf(size)));
+      mSize.setText(mSize.getResources().getQuantityString(R.plurals.bookmarks_places, size, size));
     }
   }
 }
diff --git a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift
index abacabd38b..befc64e4fe 100644
--- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift
+++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift
@@ -56,7 +56,7 @@ final class BMCCategoryCell: MWMTableViewCell {
 extension BMCCategoryCell: BMCCategoryObserver {
   func categoryUpdated() {
     title.text = category.title
-    count.text = String(coreFormat: L("bookmarks_places"), arguments: [category.count])
+    count.text = String(format: L("bookmarks_places"), category.count)
 
     if category.isVisible {
       visibility.tintColor = .linkBlue()
diff --git a/strings.txt b/strings.txt
index 2ed223d203..7da722bf72 100644
--- a/strings.txt
+++ b/strings.txt
@@ -29444,37 +29444,40 @@ fa = دوباره نپرس
     zh-Hant = 顯示全部
 
   [bookmarks_places]
-    en = %s bookmarks
-    ru = %s меток
-    ar = %s من الإشارات المرجعية
-    cs = %s záložek
-    da = %s bogmærker
-    nl = %s bladwijzers
-    fi = %s kirjanmerkkiä
-    fr = %s signets
-    de = %s Lesezeichen
-    hu = könyvjelzők %s
-    id = %s markah
-    it = %s preferiti
-    ja = %s のブックマーク
-    ko = %s 북마크
-    nb = %s bokmerker
-    pl = Zakładki: %s
-    pt = %s favoritos
-    pt-BR = %s favoritos
-    ro = %s semne de carte
-    es = %s marcadores
-    sv = %s bokmärken
-    th = %s บุ๊กมาร์ก
-    tr = %s yer imi
-    uk = %s закладок
-    vi = %s dấu trang
-    el = %s αγαπημένα
-    es_MX = %s marcadores
-    sk = %s záložiek
-    sw = Alamisho %s
-    zh-Hans = %s 個書籤
-    zh-Hant = %s個書籤
+    en:one = %d bookmark
+    en:other = %d bookmarks
+    ru:one = %d метка
+    ru:few = %d метки
+    ru:other = %d меток
+    ar = %d من الإشارات المرجعية
+    cs = %d záložek
+    da = %d bogmærker
+    nl = %d bladwijzers
+    fi = %d kirjanmerkkiä
+    fr = %d signets
+    de = %d Lesezeichen
+    hu = könyvjelzők %d
+    id = %d markah
+    it = %d preferiti
+    ja = %d のブックマーク
+    ko = %d 북마크
+    nb = %d bokmerker
+    pl = Zakładki: %d
+    pt = %d favoritos
+    pt-BR = %d favoritos
+    ro = %d semne de carte
+    es = %d marcadores
+    sv = %d bokmärken
+    th = %d บุ๊กมาร์ก
+    tr = %d yer imi
+    uk = %d закладок
+    vi = %d dấu trang
+    el = %d αγαπημένα
+    es_MX = %d marcadores
+    sk = %d záložiek
+    sw = Alamisho %d
+    zh-Hans = %d 個書籤
+    zh-Hant = %d個書籤
 
   [bookmarks_create_new_group]
     en = Create new list
diff --git a/tools/unix/generate_localizations.sh b/tools/unix/generate_localizations.sh
index 44acf2bb76..9b574cb82b 100755
--- a/tools/unix/generate_localizations.sh
+++ b/tools/unix/generate_localizations.sh
@@ -8,6 +8,7 @@ TWINE="$OMIM_PATH/tools/twine/twine"
 # TODO: Add validate-strings-file call to check for duplicates (and avoid Android build errors) when tags are properly set.
 $TWINE generate-all-localization-files --include translated --format android "$OMIM_PATH/strings.txt" "$OMIM_PATH/android/res/"
 $TWINE generate-all-localization-files --format apple "$OMIM_PATH/strings.txt" "$OMIM_PATH/iphone/Maps/LocalizedStrings/"
+$TWINE generate-all-localization-files --format apple-plural "$OMIM_PATH/strings.txt" "$OMIM_PATH/iphone/Maps/LocalizedStrings/"
 $TWINE generate-all-localization-files --format apple --file-name InfoPlist.strings "$OMIM_PATH/iphone/plist.txt" "$OMIM_PATH/iphone/Maps/LocalizedStrings/"
 $TWINE generate-all-localization-files --format jquery "$OMIM_PATH/data/cuisines.txt" "$OMIM_PATH/data/cuisine-strings/"
 $TWINE generate-all-localization-files --format jquery "$OMIM_PATH/data/countries_names.txt" "$OMIM_PATH/data/countries-strings/"