From 59ff26bd8636c4429b93306225c90cc556bdfa2d Mon Sep 17 00:00:00 2001
From: bugy <buggygm@gmail.com>
Date: Sun, 4 Feb 2018 20:46:50 +0100
Subject: [PATCH] #116: fixed wrong years name for russian locale

---
 .../net/buggy/shoplist/model/ModelHelper.java | 20 ++++++++++++++-----
 SheLi/src/main/res/values-ru/strings.xml      |  6 +++++-
 SheLi/src/main/res/values/strings.xml         |  5 ++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/SheLi/src/main/java/net/buggy/shoplist/model/ModelHelper.java b/SheLi/src/main/java/net/buggy/shoplist/model/ModelHelper.java
index b1cf0c8..65fb047 100644
--- a/SheLi/src/main/java/net/buggy/shoplist/model/ModelHelper.java
+++ b/SheLi/src/main/java/net/buggy/shoplist/model/ModelHelper.java
@@ -89,7 +89,11 @@ public static Category createCategory(String name) {
         category.setName(name);
 
         final Random random = new Random();
-        final int color = Color.argb(255, random.nextInt(256), random.nextInt(256), random.nextInt(256));
+        final int color = Color.argb(
+                255,
+                random.nextInt(256),
+                random.nextInt(256),
+                random.nextInt(256));
         category.setColor(color);
 
         return category;
@@ -139,7 +143,8 @@ public static String getAgeText(Date date, Context context) {
 
         int yearsRounded = (int) Math.round(daysDiff / 365);
         if (yearsRounded <= 5) {
-            return context.getString(R.string.years_ago, String.valueOf(yearsRounded));
+            return context.getResources().getQuantityString(
+                    R.plurals.years_ago, yearsRounded, yearsRounded);
         }
 
         return context.getString(R.string.long_ago);
@@ -196,9 +201,14 @@ public static <T extends Entity> Map<Long, T> mapIds(Collection<T> entities) {
 
     @NonNull
     public static <T extends Entity> EntitySynchronizationRecord<T> createSyncRecord(
-            Long internalId, String externalId, String listId, Date modificationDate, Class<T> entityClass) {
-
-        final EntitySynchronizationRecord<T> synchronizationRecord = new EntitySynchronizationRecord<>();
+            Long internalId,
+            String externalId,
+            String listId,
+            Date modificationDate,
+            Class<T> entityClass) {
+
+        final EntitySynchronizationRecord<T> synchronizationRecord =
+                new EntitySynchronizationRecord<>();
         synchronizationRecord.setLastChangeDate(modificationDate);
         synchronizationRecord.setInternalId(internalId);
         synchronizationRecord.setExternalId(externalId);
diff --git a/SheLi/src/main/res/values-ru/strings.xml b/SheLi/src/main/res/values-ru/strings.xml
index 0e0ed65..be96eac 100644
--- a/SheLi/src/main/res/values-ru/strings.xml
+++ b/SheLi/src/main/res/values-ru/strings.xml
@@ -110,7 +110,11 @@
     <string name="days_ago">%sд назад</string>
     <string name="weeks_ago">%sн назад</string>
     <string name="months_ago">%sм назад</string>
-    <string name="years_ago">%sл назад</string>
+    <plurals name="years_ago">
+        <item quantity="one">%dг назад</item>
+        <item quantity="few">%dг назад</item>
+        <item quantity="many">%dл назад</item>
+    </plurals>
     <string name="long_ago">очень давно</string>
     <string name="categories_spinner_all">All</string>
     <string name="products_unit_delete_from_cart">Удалить из списка покупок?</string>
diff --git a/SheLi/src/main/res/values/strings.xml b/SheLi/src/main/res/values/strings.xml
index 2136dff..f0f179e 100644
--- a/SheLi/src/main/res/values/strings.xml
+++ b/SheLi/src/main/res/values/strings.xml
@@ -108,7 +108,10 @@
     <string name="days_ago">%sd ago</string>
     <string name="weeks_ago">%sw ago</string>
     <string name="months_ago">%sm ago</string>
-    <string name="years_ago">%sy ago</string>
+    <plurals name="years_ago">
+        <item quantity="one">%dy ago</item>
+        <item quantity="other">%dy ago</item>
+    </plurals>
     <string name="long_ago">long ago</string>
     <string name="categories_spinner_all">All</string>
     <string name="language_en" translatable="false">English</string>