Use separate strings for "Next $DAY_OF_WEEK"

In some languages, the equivalent of "Next" changes form depending on the noun (or day in this case) it's describing.
3 years ago · 18b1d11eed
parent f43665b19e
commit 18b1d11eed
32 changed files with 18 additions and 32 deletions
--- a/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt
+++ b/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt
@ -94,7 +94,17 @@ class DateTimePicker : BaseDateTimePicker() {
        setupShortcutsAndCalendar()
        ButterKnife.bind(this, binding.root)
        binding.shortcuts.nextWeekButton.text =
-                getString(R.string.next, DateUtilities.getWeekdayShort(newDateTime().plusWeeks(1), locale.locale))
+                getString(
+                        when (newDateTime().plusWeeks(1).dayOfWeek) {
+                            DayOfWeek.SUNDAY -> R.string.next_sunday
+                            DayOfWeek.MONDAY -> R.string.next_monday
+                            DayOfWeek.TUESDAY -> R.string.next_tuesday
+                            DayOfWeek.WEDNESDAY -> R.string.next_wednesday
+                            DayOfWeek.THURSDAY -> R.string.next_thursday
+                            DayOfWeek.FRIDAY -> R.string.next_friday
+                            DayOfWeek.SATURDAY -> R.string.next_saturday
+                        }
+                )
        binding.calendarView.setOnDateChangeListener { _, y, m, d ->
            returnDate(day = DateTime(y, m + 1, d).millis)
            refreshButtons()
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -262,7 +262,6 @@
    </plurals>
    <string name="today">Днес</string>
    <string name="tomorrow">Утре</string>
-    <string name="next">Следващ %s</string>
    <string name="yesterday">Вчера</string>
    <string name="tmrw">Утре</string>
    <string name="yest">Вчера</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -155,7 +155,6 @@
    </plurals>
    <string name="today">Dnes</string>
    <string name="tomorrow">Zítra</string>
-    <string name="next">Další %s</string>
    <string name="yesterday">Včera</string>
    <string name="tmrw">Zítra</string>
    <string name="yest">Včera</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -382,7 +382,6 @@
    <string name="yest">I går</string>
    <string name="tmrw">I morgen</string>
    <string name="yesterday_lowercase">i går</string>
-    <string name="next">Næste %s</string>
    <string name="sort_created_group">Oprettet %s</string>
    <string name="disable_battery_optimizations">Deaktiver strømsparetilstand</string>
    <string name="wearable_notifications_summary">Vis notifikationer på din wearable-enhed</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -255,7 +255,6 @@
    </plurals>
    <string name="today">Heute</string>
    <string name="tomorrow">Morgen</string>
-    <string name="next">Nächster %s</string>
    <string name="yesterday">Gestern</string>
    <string name="tmrw">Morgen</string>
    <string name="yest">Gestern</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -256,7 +256,6 @@
    </plurals>
    <string name="today">Hoy</string>
    <string name="tomorrow">Mañana</string>
-    <string name="next">Siguiente %s</string>
    <string name="yesterday">Ayer</string>
    <string name="tmrw">Mñna</string>
    <string name="yest">Ayer</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -258,7 +258,6 @@
    </plurals>
    <string name="today">Gaur</string>
    <string name="tomorrow">Bihar</string>
-    <string name="next">Datorren %s</string>
    <string name="yesterday">Atzo</string>
    <string name="tmrw">Bihar</string>
    <string name="yest">Atzo</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -247,7 +247,6 @@
    </plurals>
    <string name="today">Tänään</string>
    <string name="tomorrow">Huomenna</string>
-    <string name="next">Seuraava %s</string>
    <string name="yesterday">Eilen</string>
    <string name="tmrw">Huominen</string>
    <string name="yest">Eilinen</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -241,7 +241,6 @@
    </plurals>
    <string name="today">Aujourd\'hui</string>
    <string name="tomorrow">Demain</string>
-    <string name="next">%s prochain</string>
    <string name="yesterday">Hier</string>
    <string name="tmrw">Demain</string>
    <string name="yest">Hier</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -174,7 +174,6 @@
    </plurals>
    <string name="today">Hoy</string>
    <string name="tomorrow">Mañana</string>
-    <string name="next">Siguiente %s</string>
    <string name="yesterday">Ayer</string>
    <string name="tmrw">Mñna</string>
    <string name="yest">Ayer</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -255,7 +255,6 @@
    </plurals>
    <string name="today">Ma</string>
    <string name="tomorrow">Holnap</string>
-    <string name="next">Következő %s</string>
    <string name="yesterday">Tegnap</string>
    <string name="tmrw">Holn</string>
    <string name="yest">Tegn</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -185,7 +185,6 @@
    </plurals>
    <string name="today">Hari ini</string>
    <string name="tomorrow">Besok</string>
-    <string name="next">%s depan</string>
    <string name="yesterday">Kemarin</string>
    <string name="tmrw">Bsk</string>
    <string name="yest">Kmrn</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -257,7 +257,6 @@
    </plurals>
    <string name="today">Oggi</string>
    <string name="tomorrow">Domani</string>
-    <string name="next">Prossimo %s</string>
    <string name="yesterday">Ieri</string>
    <string name="tmrw">Domani</string>
    <string name="yest">Ieri</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -288,7 +288,6 @@
    </plurals>
    <string name="today">היום</string>
    <string name="tomorrow">מחר</string>
-    <string name="next">הבא: %s</string>
    <string name="yesterday">אתמול</string>
    <string name="tmrw">מחר</string>
    <string name="yest">אתמול</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -258,7 +258,6 @@
    </plurals>
    <string name="today">今日</string>
    <string name="tomorrow">明日</string>
-    <string name="next">次の %s</string>
    <string name="yesterday">昨日</string>
    <string name="tmrw">明日</string>
    <string name="yest">昨日</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -255,7 +255,6 @@
    </plurals>
    <string name="today">오늘</string>
    <string name="tomorrow">내일</string>
-    <string name="next">다음 %s</string>
    <string name="yesterday">어제</string>
    <string name="tmrw">내일</string>
    <string name="yest">어제</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -257,7 +257,6 @@
    </plurals>
    <string name="today">Šiandien</string>
    <string name="tomorrow">Ryt</string>
-    <string name="next">Kitas %s</string>
    <string name="yesterday">Vakar</string>
    <string name="tmrw">Ryt</string>
    <string name="yest">Vakar</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -297,7 +297,6 @@
    <string name="delete_tag_confirmation">Slett %s\?</string>
    <string name="TEA_timer_comment_stopped">stoppet arbeid med dette gjøremålet:</string>
    <string name="voice_command_added_task">La til gjøremål</string>
-    <string name="next">Neste %s</string>
    <string name="tmrw">Imrgn</string>
    <string name="yest">Igår</string>
    <string name="widget_show_header">Vis hode</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -251,7 +251,6 @@
    </plurals>
    <string name="today">Vandaag</string>
    <string name="tomorrow">Morgen</string>
-    <string name="next">Volgende %s</string>
    <string name="yesterday">Gisteren</string>
    <string name="tmrw">mrgn</string>
    <string name="yest">Gisteren</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -267,7 +267,6 @@
    </plurals>
    <string name="today">Dzisiaj</string>
    <string name="tomorrow">Jutro</string>
-    <string name="next">Następny %s</string>
    <string name="yesterday">Wczoraj</string>
    <string name="tmrw">jutro</string>
    <string name="yest">wczoraj</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -253,7 +253,6 @@
    </plurals>
    <string name="today">Hoje</string>
    <string name="tomorrow">Amanhã</string>
-    <string name="next">Próximo %s</string>
    <string name="yesterday">Ontem</string>
    <string name="tmrw">Amanhã</string>
    <string name="yest">Ontem</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -244,7 +244,6 @@
    </plurals>
    <string name="today">Hoje</string>
    <string name="tomorrow">Amanhã</string>
-    <string name="next">%s seguinte</string>
    <string name="yesterday">Ontem</string>
    <string name="tmrw">Amanhã</string>
    <string name="yest">Ontem</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -272,7 +272,6 @@
    </plurals>
    <string name="today">Сегодня</string>
    <string name="tomorrow">Завтра</string>
-    <string name="next">Следующ. %s</string>
    <string name="yesterday">Вчера</string>
    <string name="tmrw">Завтра</string>
    <string name="yest">Вчера</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -258,7 +258,6 @@
    </plurals>
    <string name="today">Dnes</string>
    <string name="tomorrow">Zajtra</string>
-    <string name="next">Nasledujúci %s</string>
    <string name="yesterday">Včera</string>
    <string name="tmrw">Zajtra</string>
    <string name="yest">Včera</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -172,7 +172,6 @@
    </plurals>
    <string name="today">Idag</string>
    <string name="tomorrow">Imorgon</string>
-    <string name="next">Nästa %s</string>
    <string name="yesterday">Igår</string>
    <string name="tmrw">Imorgon</string>
    <string name="yest">Igår</string>
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@ -455,7 +455,6 @@
    <string name="tmrw">நாளை</string>
    <string name="yesterday_lowercase">நேற்று</string>
    <string name="yesterday">நேற்று</string>
-    <string name="next">அடுத்த %s</string>
    <string name="tomorrow_lowercase">நாளை</string>
    <string name="tomorrow">நாளை</string>
    <string name="today_lowercase">இன்று</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -258,7 +258,6 @@
    </plurals>
    <string name="today">Bugün</string>
    <string name="tomorrow">Yarın</string>
-    <string name="next">Gelecek %s</string>
    <string name="yesterday">Dün</string>
    <string name="tmrw">Yarın</string>
    <string name="yest">Dün</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -273,7 +273,6 @@
    </plurals>
    <string name="today">Сьогодні</string>
    <string name="tomorrow">Завтра</string>
-    <string name="next">Наступні %s</string>
    <string name="yesterday">Вчора</string>
    <string name="tmrw">Звтр</string>
    <string name="yest">Вчр</string>
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@ -278,7 +278,6 @@
    <string name="repeat_monthly">مہینہ وار دہرانا</string>
    <string name="yesterday_lowercase">گزشتہ کل</string>
    <string name="yesterday">گزشتہ کل</string>
-    <string name="next">اگلا%s</string>
    <string name="tomorrow_lowercase">آنے والا کل</string>
    <string name="tomorrow">آنے والا کل</string>
    <string name="today_lowercase">آج</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -241,7 +241,6 @@
    </plurals>
    <string name="today">今天</string>
    <string name="tomorrow">明天</string>
-    <string name="next">下个 %s</string>
    <string name="yesterday">昨天</string>
    <string name="tmrw">明天</string>
    <string name="yest">昨天</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -280,7 +280,6 @@
    <string name="widget_show_dividers">顯示分隔線</string>
    <string name="widget_show_menu">顯示清單</string>
    <string name="yesterday_lowercase">昨天</string>
-    <string name="next">下一個 %s</string>
    <string name="tomorrow_lowercase">明天</string>
    <string name="today_lowercase">今天</string>
    <string name="voice_command_added_task">已新增的任務</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -292,7 +292,13 @@ File %1$s contained %2$s.\n\n
  <string name="today_lowercase">today</string>
  <string name="tomorrow">Tomorrow</string>
  <string name="tomorrow_lowercase">tomorrow</string>
-  <string name="next">Next %s</string>
+  <string name="next_sunday">Next Sun</string>
+  <string name="next_monday">Next Mon</string>
+  <string name="next_tuesday">Next Tue</string>
+  <string name="next_wednesday">Next Wed</string>
+  <string name="next_thursday">Next Thu</string>
+  <string name="next_friday">Next Fri</string>
+  <string name="next_saturday">Next Sat</string>
  <string name="yesterday">Yesterday</string>
  <string name="yesterday_lowercase">yesterday</string>
  <string name="tmrw">Tmrw</string>