From 9cabd7ef086788606abfd42d8a064fc5108ea059 Mon Sep 17 00:00:00 2001
From: Michael <5672750+mibac138@users.noreply.github.com>
Date: Sat, 11 Dec 2021 16:42:33 +0100
Subject: [PATCH] Deduplicate timetable time left string (#1710)

---
 .../ui/modules/dashboard/DashboardAdapter.kt  | 20 +++++++++++--------
 app/src/main/res/values-cs/strings.xml        | 12 -----------
 app/src/main/res/values-de/strings.xml        |  8 --------
 app/src/main/res/values-pl/strings.xml        | 12 -----------
 app/src/main/res/values-ru/strings.xml        | 12 -----------
 app/src/main/res/values-sk/strings.xml        | 12 -----------
 app/src/main/res/values-uk/strings.xml        | 12 -----------
 app/src/main/res/values/strings.xml           | 12 ++---------
 8 files changed, 14 insertions(+), 86 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
index 6dfecd62..12be144c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
@@ -422,10 +422,12 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                 isFirstTimeRangeVisible = true
                 isFirstTimeVisible = false
             } else {
-                firstTimeText = context.resources.getQuantityString(
-                    R.plurals.dashboard_timetable_first_lesson_time_in_minutes,
-                    minutesToStartLesson.toInt(),
-                    minutesToStartLesson
+                firstTimeText = context.getString(
+                    R.string.timetable_time_until,
+                    context.getString(
+                        R.string.timetable_minutes,
+                        minutesToStartLesson.toString()
+                    )
                 )
                 firstTimeRangeText = ""
 
@@ -461,10 +463,12 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                 0
             }
 
-            firstTimeText = context.resources.getQuantityString(
-                R.plurals.dashboard_timetable_first_lesson_time_more_minutes,
-                minutesToEndLesson.toInt(),
-                minutesToEndLesson
+            firstTimeText = context.getString(
+                R.string.timetable_time_left,
+                context.getString(
+                    R.string.timetable_minutes,
+                    minutesToEndLesson.toString()
+                )
             )
             firstTimeRangeText = ""
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e8a35215..93ea10a1 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -553,18 +553,6 @@
     <string name="dashboard_timetable_first_lesson_title_soon">Brzy:</string>
     <string name="dashboard_timetable_first_lesson_title_first">První:</string>
     <string name="dashboard_timetable_first_lesson_title_now">Teď:</string>
-    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
-        <item quantity="one">za %1$d minutu</item>
-        <item quantity="few">za %1$d minuty</item>
-        <item quantity="many">za %1$d minut</item>
-        <item quantity="other">za %1$d minut</item>
-    </plurals>
-    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
-        <item quantity="one">ještě %1$d minutu</item>
-        <item quantity="few">ještě %1$d minuty</item>
-        <item quantity="many">ještě %1$d minut</item>
-        <item quantity="other">ještě %1$d minut</item>
-    </plurals>
     <string name="dashboard_timetable_second_lesson_value_end">Konec lekcí</string>
     <string name="dashboard_timetable_second_lessons_title">Další:</string>
     <string name="dashboard_timetable_third_title">Později:</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6b6b5399..f81724a2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -477,14 +477,6 @@
     <string name="dashboard_timetable_first_lesson_title_soon">Bald:</string>
     <string name="dashboard_timetable_first_lesson_title_first">Erstens:</string>
     <string name="dashboard_timetable_first_lesson_title_now">Jetzt:</string>
-    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
-        <item quantity="one">in %1$d Minute</item>
-        <item quantity="other">in %1$d Minuten</item>
-    </plurals>
-    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
-        <item quantity="one">Noch %1$d Minute</item>
-        <item quantity="other">Noch %1$d Minuten</item>
-    </plurals>
     <string name="dashboard_timetable_second_lesson_value_end">Ende der Lektion</string>
     <string name="dashboard_timetable_second_lessons_title">Nächste:</string>
     <string name="dashboard_timetable_third_title">Später:</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8de1be63..93bdd535 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -553,18 +553,6 @@
     <string name="dashboard_timetable_first_lesson_title_soon">Wkrótce:</string>
     <string name="dashboard_timetable_first_lesson_title_first">Pierwsza:</string>
     <string name="dashboard_timetable_first_lesson_title_now">Teraz:</string>
-    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
-        <item quantity="one">za %1$d minutę</item>
-        <item quantity="few">za %1$d minuty</item>
-        <item quantity="many">za %1$d minut</item>
-        <item quantity="other">za %1$d minut</item>
-    </plurals>
-    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
-        <item quantity="one">jeszcze %1$d minuta</item>
-        <item quantity="few">jeszcze %1$d minuty</item>
-        <item quantity="many">jeszcze %1$d minut</item>
-        <item quantity="other">jeszcze %1$d minut</item>
-    </plurals>
     <string name="dashboard_timetable_second_lesson_value_end">Koniec lekcji</string>
     <string name="dashboard_timetable_second_lessons_title">Następnie:</string>
     <string name="dashboard_timetable_third_title">Później:</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index aff6b176..33ec2182 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -553,18 +553,6 @@
     <string name="dashboard_timetable_first_lesson_title_soon">Скоро:</string>
     <string name="dashboard_timetable_first_lesson_title_first">Первый:</string>
     <string name="dashboard_timetable_first_lesson_title_now">Сейчас:</string>
-    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
-        <item quantity="one">через %1$d минуту</item>
-        <item quantity="few">через %1$d минуту</item>
-        <item quantity="many">через %1$d минуту</item>
-        <item quantity="other">через %1$d минут</item>
-    </plurals>
-    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
-        <item quantity="one">Еще %1$d минута</item>
-        <item quantity="few">Еще %1$d минута</item>
-        <item quantity="many">Еще %1$d минута</item>
-        <item quantity="other">Ещё %1$d минут</item>
-    </plurals>
     <string name="dashboard_timetable_second_lesson_value_end">Окончание уроков</string>
     <string name="dashboard_timetable_second_lessons_title">Далее:</string>
     <string name="dashboard_timetable_third_title">Позднее:</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 2070e53a..77e402ad 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -553,18 +553,6 @@
     <string name="dashboard_timetable_first_lesson_title_soon">Čoskoro:</string>
     <string name="dashboard_timetable_first_lesson_title_first">Prvá:</string>
     <string name="dashboard_timetable_first_lesson_title_now">Teraz:</string>
-    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
-        <item quantity="one">za %1$d minútu</item>
-        <item quantity="few">za %1$d minúty</item>
-        <item quantity="many">za %1$d minút</item>
-        <item quantity="other">za %1$d minút</item>
-    </plurals>
-    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
-        <item quantity="one">ešte %1$d minútu</item>
-        <item quantity="few">ešte %1$d minúty</item>
-        <item quantity="many">ešte %1$d minút</item>
-        <item quantity="other">ešte %1$d minút</item>
-    </plurals>
     <string name="dashboard_timetable_second_lesson_value_end">Koniec lekcií</string>
     <string name="dashboard_timetable_second_lessons_title">Ďalej:</string>
     <string name="dashboard_timetable_third_title">Neskôr:</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3d14651e..8543a470 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -553,18 +553,6 @@
     <string name="dashboard_timetable_first_lesson_title_soon">Незабаром:</string>
     <string name="dashboard_timetable_first_lesson_title_first">Перше:</string>
     <string name="dashboard_timetable_first_lesson_title_now">Зараз:</string>
-    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
-        <item quantity="one">через %1$d хвилину</item>
-        <item quantity="few">через %1$d хвилину</item>
-        <item quantity="many">через %1$d хвилину</item>
-        <item quantity="other">через %1$d хвилин</item>
-    </plurals>
-    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
-        <item quantity="one">%1$d більше хвилини</item>
-        <item quantity="few">%1$d більше хвилини</item>
-        <item quantity="many">%1$d більше хвилини</item>
-        <item quantity="other">%1$d ще хвилин</item>
-    </plurals>
     <string name="dashboard_timetable_second_lesson_value_end">Кінець уроків</string>
     <string name="dashboard_timetable_second_lessons_title">Далі:</string>
     <string name="dashboard_timetable_third_title">Пізніше :</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43720164..487b532b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -247,8 +247,8 @@
         <item quantity="other">New exams</item>
     </plurals>
     <plurals name="exam_notify_new_item_content">
-        <item quantity="one">You received %d new exam</item>
-        <item quantity="other">You received %d new exams</item>
+        <item quantity="one">%d new exam</item>
+        <item quantity="other">%d new exams</item>
     </plurals>
     <plurals name="exam_number_item">
         <item quantity="one">%d exam</item>
@@ -541,14 +541,6 @@
     <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
     <string name="dashboard_timetable_first_lesson_title_first">First:</string>
     <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
-    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
-        <item quantity="one">in %1$d minute</item>
-        <item quantity="other">in %1$d minutes</item>
-    </plurals>
-    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
-        <item quantity="one">%1$d more minute</item>
-        <item quantity="other">%1$d more minutes</item>
-    </plurals>
     <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
     <string name="dashboard_timetable_second_lessons_title">Next:</string>
     <string name="dashboard_timetable_third_title">Later:</string>