From 50eb5f9a344131b22ccd4f6df2c2c21e15f4919c Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 1 Apr 2018 23:34:22 +0200
Subject: calculate automatic timeout labels dynamically

---
 src/main/res/values/arrays.xml   | 13 ++-----------
 src/main/res/values/strings.xml  | 29 ++++++++++++++++++++++++-----
 src/main/res/xml/preferences.xml |  4 +---
 3 files changed, 27 insertions(+), 19 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index a8737275f..68666ddcc 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -88,22 +88,13 @@
         <item>@string/presence_dnd</item>
     </string-array>
 
-    <string-array name="automatic_message_deletion_values">
+    <integer-array name="automatic_message_deletion_values">
         <item>0</item>
         <item>86400</item>
         <item>604800</item>
         <item>2592000</item>
         <item>15811200</item>
         <item>31622400</item>
-    </string-array>
-
-    <string-array name="automatic_message_deletion">
-        <item>@string/never</item>
-        <item>@string/timeout_24_hours</item>
-        <item>@string/timeout_7_days</item>
-        <item>@string/timeout_30_days</item>
-        <item>@string/timeout_6_months</item>
-        <item>@string/timeout_12_months</item>
-    </string-array>
+    </integer-array>
 
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 41dc187be..e63bea6ae 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -673,11 +673,30 @@
     <string name="pref_automatically_delete_messages_description">Automatically delete messages from this device that are older than the configured time frame.</string>
     <string name="pref_automatically_delete_messages">Automatic message deletion</string>
     <string name="not_fetching_history_retention_period">Not fetching messages due to local retention period.</string>
-    <string name="timeout_24_hours">24 hours</string>
-    <string name="timeout_7_days">7 days</string>
-    <string name="timeout_30_days">30 days</string>
-    <string name="timeout_6_months">6 months</string>
-    <string name="timeout_12_months">12 months</string>
+    <plurals name="seconds">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="days">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
+    <plurals name="weeks">
+        <item quantity="one">%d week</item>
+        <item quantity="other">%d weeks</item>
+    </plurals>
+    <plurals name="months">
+        <item quantity="one">%d month</item>
+        <item quantity="other">%d months</item>
+    </plurals>
     <string name="today">Today</string>
     <string name="pref_use_max_brightness_summary">Switch to maximum brightness while watching videos or images in fullscreen.</string>
     <string name="pref_use_max_brightness">Maximum brightness</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 27e188c7f..86fb7f057 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -305,9 +305,7 @@
                 android:title="@string/pref_blind_trust_before_verification"
                 android:summary="@string/pref_blind_trust_before_verification_summary" />
             <ListPreference
-                android:defaultValue="@integer/automatic_message_deletion"
-                android:entries="@array/automatic_message_deletion"
-                android:entryValues="@array/automatic_message_deletion_values"
+                android:defaultValue="@integer/automatic_message_deletion"/>
                 android:key="automatic_message_deletion"
                 android:summary="@string/pref_automatically_delete_messages_description"
                 android:title="@string/pref_automatically_delete_messages" />
-- 
cgit v1.2.3