From 8ac70afa1e7df0f4cc9d89294a29914fa54bd7fd Mon Sep 17 00:00:00 2001
From: jaKa <jaka@koofr.net>
Date: Tue, 2 Dec 2014 13:41:44 +0100
Subject: [PATCH] Use Android plurals to better support various languages
 quirks about plurals.

---
 res/values-hr/strings.xml                  | 39 +++++++++++++++++++
 res/values-ro/strings.xml                  | 34 +++++++++++++++++
 res/values-sl/strings.xml                  | 44 ++++++++++++++++++++++
 res/values-sr/strings.xml                  | 39 +++++++++++++++++++
 res/values/strings.xml                     | 29 +++++++++++---
 src/com/lukazakrajsek/timeago/TimeAgo.java | 17 ++++++---
 6 files changed, 190 insertions(+), 12 deletions(-)
 create mode 100644 res/values-hr/strings.xml
 create mode 100644 res/values-ro/strings.xml
 create mode 100644 res/values-sl/strings.xml
 create mode 100644 res/values-sr/strings.xml

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
new file mode 100644
index 0000000..557755f
--- /dev/null
+++ b/res/values-hr/strings.xml
@@ -0,0 +1,39 @@
+<resources>
+
+    <string name="time_ago_prefix">prije</string>
+    <string name="time_ago_suffix"></string>
+    
+    <string name="time_ago_seconds">manje od minute</string>
+    <string name="time_ago_minute">jedne minute</string>
+    <string name="time_ago_hour">jednog sata</string>
+    <string name="time_ago_day">jednog dana</string>
+    <string name="time_ago_month">jednog mjeseca</string>
+    <string name="time_ago_year">jedne godine</string>
+    
+    <plurals name="time_ago_minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="few">%d minute</item>
+        <item quantity="other">%d minuta</item>
+	</plurals>
+    <plurals name="time_ago_hours">
+        <item quantity="one">%d sata</item>
+        <item quantity="few">%d sata</item>
+        <item quantity="other">%d sati</item>
+    </plurals>
+    <plurals name="time_ago_days">
+        <item quantity="one">%d dana</item>
+        <item quantity="few">%d dana</item>
+        <item quantity="other">%d dana</item>
+    </plurals>
+    <plurals name="time_ago_months">
+        <item quantity="one">%d mjeseca</item>
+        <item quantity="few">%d mjeseca</item>
+        <item quantity="other">%d mjeseca</item>
+    </plurals>
+    <plurals name="time_ago_years">
+        <item quantity="one">%d godine</item>
+        <item quantity="few">%d godine</item>
+        <item quantity="other">%d godina</item>
+    </plurals>        
+
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
new file mode 100644
index 0000000..7e752e6
--- /dev/null
+++ b/res/values-ro/strings.xml
@@ -0,0 +1,34 @@
+<resources>
+
+    <string name="time_ago_prefix"></string>
+    <string name="time_ago_suffix">ago</string>
+    
+    <string name="time_ago_seconds">less than a minute</string>
+    <string name="time_ago_minute">about a minute</string>
+    <string name="time_ago_hour">about an hour</string>
+    <string name="time_ago_day">a day</string>
+    <string name="time_ago_month">about a month</string>
+    <string name="time_ago_year">about a year</string>
+    
+    <plurals name="time_ago_minutes">
+        <item quantity="one">%d minute</item>
+		<item quantity="other">%d minutes</item>
+	</plurals>
+    <plurals name="time_ago_hours">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">about %d hours</item>
+    </plurals>
+    <plurals name="time_ago_days">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
+    <plurals name="time_ago_months">
+        <item quantity="one">%d month</item>
+        <item quantity="other">%d months</item>
+    </plurals>
+    <plurals name="time_ago_years">
+        <item quantity="one">%d year</item>
+        <item quantity="other">%d years</item>
+    </plurals>        
+
+</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
new file mode 100644
index 0000000..53bea1b
--- /dev/null
+++ b/res/values-sl/strings.xml
@@ -0,0 +1,44 @@
+<resources>
+
+    <string name="time_ago_prefix">pred</string>
+    <string name="time_ago_suffix"></string>
+    
+    <string name="time_ago_seconds">manj kot minuto</string>
+    <string name="time_ago_minute">približno minuto</string>
+    <string name="time_ago_hour">približno uro</string>
+    <string name="time_ago_day">približno dnevom</string>
+    <string name="time_ago_month">približno mesecem</string>
+    <string name="time_ago_year">približno letom</string>
+    
+    <plurals name="time_ago_minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="two">%d minutama</item>
+        <item quantity="few">%d minutami</item>
+ 		<item quantity="other">%d minutami</item>
+	</plurals>
+    <plurals name="time_ago_hours">
+        <item quantity="one">%d uro</item>
+        <item quantity="two">približno %d urama</item>
+        <item quantity="few">približno %d urami</item>
+        <item quantity="other">približno %d urami</item>
+    </plurals>
+    <plurals name="time_ago_days">
+        <item quantity="one">%d dnevom</item>
+        <item quantity="two">%d dnevoma</item>
+        <item quantity="few">%d dnevi</item>
+        <item quantity="other">%d dnevi</item>
+    </plurals>
+    <plurals name="time_ago_months">
+        <item quantity="one">%d mesecem</item>
+        <item quantity="two">%d mesecema</item>
+        <item quantity="few">%d meseci</item>
+        <item quantity="other">%d meseci</item>
+    </plurals>
+    <plurals name="time_ago_years">
+        <item quantity="one">%d letom</item>
+        <item quantity="two">%d letoma</item>
+        <item quantity="few">%d leti</item>
+        <item quantity="other">%d leti</item>
+    </plurals>        
+
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
new file mode 100644
index 0000000..8cbbcbf
--- /dev/null
+++ b/res/values-sr/strings.xml
@@ -0,0 +1,39 @@
+<resources>
+
+    <string name="time_ago_prefix">pre</string>
+    <string name="time_ago_suffix"></string>
+    
+    <string name="time_ago_seconds">manje od minuta</string>
+    <string name="time_ago_minute">jednog minuta</string>
+    <string name="time_ago_hour">jednog sata</string>
+    <string name="time_ago_day">jednog dana</string>
+    <string name="time_ago_month">jednog meseca</string>
+    <string name="time_ago_year">godinu dana</string>
+    
+    <plurals name="time_ago_minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="few">%d minuta</item>
+        <item quantity="other">%d minuta</item>
+	</plurals>
+	<plurals name="time_ago_hours">
+        <item quantity="one">%d sata</item>
+        <item quantity="few">%d sata</item>
+        <item quantity="other">%d sati</item>
+    </plurals>
+    <plurals name="time_ago_days">
+        <item quantity="one">%d dana</item>
+        <item quantity="few">%d dana</item>
+        <item quantity="other">%d dana</item>
+    </plurals>
+    <plurals name="time_ago_months">
+        <item quantity="one">%d meseca</item>
+        <item quantity="few">%d meseca</item>
+        <item quantity="other">%d meseca</item>
+    </plurals>
+    <plurals name="time_ago_years">
+        <item quantity="one">%d godine</item>
+        <item quantity="few">%d godine</item>
+        <item quantity="other">%d godina</item>
+    </plurals>        
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2621c89..7e752e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,16 +2,33 @@
 
     <string name="time_ago_prefix"></string>
     <string name="time_ago_suffix">ago</string>
+    
     <string name="time_ago_seconds">less than a minute</string>
     <string name="time_ago_minute">about a minute</string>
-    <string name="time_ago_minutes">%d minutes</string>
     <string name="time_ago_hour">about an hour</string>
-    <string name="time_ago_hours">about %d hours</string>
     <string name="time_ago_day">a day</string>
-    <string name="time_ago_days">%d days</string>
     <string name="time_ago_month">about a month</string>
-    <string name="time_ago_months">%d months</string>
     <string name="time_ago_year">about a year</string>
-    <string name="time_ago_years">%d years</string>
+    
+    <plurals name="time_ago_minutes">
+        <item quantity="one">%d minute</item>
+		<item quantity="other">%d minutes</item>
+	</plurals>
+    <plurals name="time_ago_hours">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">about %d hours</item>
+    </plurals>
+    <plurals name="time_ago_days">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
+    <plurals name="time_ago_months">
+        <item quantity="one">%d month</item>
+        <item quantity="other">%d months</item>
+    </plurals>
+    <plurals name="time_ago_years">
+        <item quantity="one">%d year</item>
+        <item quantity="other">%d years</item>
+    </plurals>        
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/com/lukazakrajsek/timeago/TimeAgo.java b/src/com/lukazakrajsek/timeago/TimeAgo.java
index f9659c4..60ff773 100644
--- a/src/com/lukazakrajsek/timeago/TimeAgo.java
+++ b/src/com/lukazakrajsek/timeago/TimeAgo.java
@@ -34,27 +34,32 @@ public String timeAgo(long millis) {
 		String words;
 
 		if (seconds < 45) {
-			words = r.getString(R.string.time_ago_seconds, Math.round(seconds));
+			words = r.getString(R.string.time_ago_seconds, (int)Math.round(seconds));
 		} else if (seconds < 90) {
 			words = r.getString(R.string.time_ago_minute, 1);
 		} else if (minutes < 45) {
-			words = r.getString(R.string.time_ago_minutes, Math.round(minutes));
+			words = r.getQuantityString(R.plurals.time_ago_minutes,
+					(int)Math.round(minutes), (int)Math.round(minutes));
 		} else if (minutes < 90) {
 			words = r.getString(R.string.time_ago_hour, 1);
 		} else if (hours < 24) {
-			words = r.getString(R.string.time_ago_hours, Math.round(hours));
+			words = r.getQuantityString(R.plurals.time_ago_hours,
+					(int)Math.round(hours), (int)Math.round(hours));
 		} else if (hours < 42) {
 			words = r.getString(R.string.time_ago_day, 1);
 		} else if (days < 30) {
-			words = r.getString(R.string.time_ago_days, Math.round(days));
+			words = r.getQuantityString(R.plurals.time_ago_days,
+					(int)Math.round(days), (int)Math.round(days));
 		} else if (days < 45) {
 			words = r.getString(R.string.time_ago_month, 1);
 		} else if (days < 365) {
-			words = r.getString(R.string.time_ago_months, Math.round(days / 30));
+			words = r.getQuantityString(R.plurals.time_ago_months,
+					(int)Math.round(days / 30), (int)Math.round(days / 30));
 		} else if (years < 1.5) {
 			words = r.getString(R.string.time_ago_year, 1);
 		} else {
-			words = r.getString(R.string.time_ago_years, Math.round(years));
+			words = r.getQuantityString(R.plurals.time_ago_years,
+					(int)Math.round(years), (int)Math.round(years));
 		}
 
 		StringBuilder sb = new StringBuilder();