Merge bc5dd78732 into bf8c14fc03

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java

@@ -87,22 +87,18 @@ public class SubtitleCard extends HabitCard
     private String toText(Frequency freq)
     {
         Resources resources = getResources();
-        Integer num = freq.getNumerator();
+        int num = freq.getNumerator();
-        Integer den = freq.getDenominator();
+        int den = freq.getDenominator();
-
+
-        if (num.equals(den)) return resources.getString(R.string.every_day);
+        if (den == 1) {
-
+            return resources.getQuantityString(R.plurals.times_a_day, num, num);
-        if (num == 1)
+        } else if (den == 7) {
-        {
+            return resources.getQuantityString(R.plurals.times_a_week, num, num);
-            if (den == 7) return resources.getString(R.string.every_week);
+        } else if (den == 28) {
-            if (den % 7 == 0)
+            return resources.getQuantityString(R.plurals.times_a_month, num, num);
-                return resources.getString(R.string.every_x_weeks, den / 7);
+        } else {
-            return resources.getString(R.string.every_x_days, den);
+            return resources.getQuantityString(R.plurals.times_unknown_interval, num, num, den);
         }
-
-        String times_every = resources.getString(R.string.times_every);
-        return String.format("%d %s %d %s", num, times_every, den,
-            resources.getString(R.string.days));
     }
 
     private void updateReminderText(Reminder reminder)

uhabits-android/src/main/res/values-ar/strings.xml

@@ -150,9 +150,6 @@
   <string name="total">المجموع</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">مرات في</string>
-  <string name="every_x_days">كل %d أيام</string>
-  <string name="every_x_weeks">كل %d أسابيع</string>
-  <string name="every_x_months">كل %d أشهر</string>
   <string name="score">النقاط</string>
   <string name="reminder_sound">صوت تذكير</string>
   <string name="none">صامت</string>

uhabits-android/src/main/res/values-bg/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Общо</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">път в период от</string>
-  <string name="every_x_days">На всеки %d дни</string>
-  <string name="every_x_weeks">На всеки %d седмици</string>
-  <string name="every_x_months">На всеки %d месеца</string>
   <string name="score">Сила</string>
   <string name="reminder_sound">Звук за напомняне</string>
   <string name="none">Няма</string>

uhabits-android/src/main/res/values-ca/strings.xml

@@ -148,9 +148,6 @@
   <string name="year">Any</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">vegades en</string>
-  <string name="every_x_days">Cada %d dies</string>
-  <string name="every_x_weeks">Cada %d setmanes</string>
-  <string name="every_x_months">Cada %d mesos</string>
   <string name="score">Puntuació</string>
   <string name="reminder_sound">So de recordatori</string>
   <string name="none">Cap</string>

uhabits-android/src/main/res/values-cs/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Celkem</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">krát za</string>
-  <string name="every_x_days">Každých %d dní</string>
-  <string name="every_x_weeks">Každých %d týdnů</string>
-  <string name="every_x_months">Každých %d měsíců</string>
   <string name="score">Skóre</string>
   <string name="reminder_sound">Zvuk upomínky</string>
   <string name="none">Žádný</string>

uhabits-android/src/main/res/values-da/strings.xml

@@ -145,9 +145,6 @@
   <string name="year">År</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">Tid til</string>
-  <string name="every_x_days">Hver %d dage</string>
-  <string name="every_x_weeks">Hver %d uger</string>
-  <string name="every_x_months">Hver %d måneder</string>
   <string name="score">Point</string>
   <string name="reminder_sound">Påmindelse lyd</string>
   <string name="none">Ingen</string>

uhabits-android/src/main/res/values-de/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Gesamt</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">Mal in</string>
-  <string name="every_x_days">Alle %d Tage</string>
-  <string name="every_x_weeks">Alle %d Wochen</string>
-  <string name="every_x_months">Alle %d Monate</string>
   <string name="score">Wertung</string>
   <string name="reminder_sound">Erinnerungston</string>
   <string name="none">Keiner</string>

uhabits-android/src/main/res/values-el/strings.xml

@@ -148,9 +148,6 @@
   <string name="year">Χρόνος</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">φορά σε</string>
-  <string name="every_x_days">Κάθε %d ημέρες</string>
-  <string name="every_x_weeks">Κάθε %d εβδομάδες</string>
-  <string name="every_x_months">Κάθε %d μήνες</string>
   <string name="score">Σκόρ</string>
   <string name="reminder_sound">Ήχος υπενθύμισης</string>
   <string name="none">Σιωπηλό</string>

uhabits-android/src/main/res/values-eo/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Totalt</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">gang på</string>
-  <string name="every_x_days">Hver %d. dag</string>
-  <string name="every_x_weeks">Hver %d. uke</string>
-  <string name="every_x_months">Hver %d. måned</string>
   <string name="score">Poengsum</string>
   <string name="reminder_sound">Påminnelseslyd</string>
   <string name="none">Ingen</string>

uhabits-android/src/main/res/values-es/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Total</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">veces en</string>
-  <string name="every_x_days">Cada %d días</string>
-  <string name="every_x_weeks">Cada %d semanas</string>
-  <string name="every_x_months">Cada %d meses</string>
   <string name="score">Puntuación</string>
   <string name="reminder_sound">Sonido de recordatorio</string>
   <string name="none">Ninguno</string>

uhabits-android/src/main/res/values-eu/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Guztira</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">denbora</string>
-  <string name="every_x_days">%d egunero</string>
-  <string name="every_x_weeks">%d astero</string>
-  <string name="every_x_months">%d hilabetero</string>
   <string name="score">Puntuak</string>
   <string name="reminder_sound">Oroigarriaren soinua</string>
   <string name="none">Bat ere ez</string>

uhabits-android/src/main/res/values-fa/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">مجموع</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">بار در هر</string>
-  <string name="every_x_days">هر %d روز یک‌بار</string>
-  <string name="every_x_weeks">هر %d هفته یک‌بار</string>
-  <string name="every_x_months">هر %d ماه یک‌بار</string>
   <string name="score">امتیاز</string>
   <string name="reminder_sound">صدای یادآور</string>
   <string name="none">هیچ‌کدام</string>

uhabits-android/src/main/res/values-fr/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Total</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">fois tous les</string>
-  <string name="every_x_days">Tous les %d jours</string>
-  <string name="every_x_weeks">Toutes les %d semaines</string>
-  <string name="every_x_months">Tous les %d mois</string>
   <string name="score">Pointage</string>
   <string name="reminder_sound">Son de rappel</string>
   <string name="none">Aucun</string>

uhabits-android/src/main/res/values-hi/strings.xml

@@ -200,12 +200,6 @@ repetitions की संख्या\"</string>
   <string name="year">साल</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">समय में</string>
-  <string name="every_x_days">\"
-हर %d दिन\"</string>
-  <string name="every_x_weeks">\"
-हर %d हफ्ते\"</string>
-  <string name="every_x_months">\"
-हर %d महीने\"</string>
   <string name="score">स्कोर</string>
   <string name="reminder_sound">अनुस्मारक ध्वनि</string>
   <string name="none">\"

uhabits-android/src/main/res/values-hr/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Ukupno</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">put svakih</string>
-  <string name="every_x_days">Svaka %d dana</string>
-  <string name="every_x_weeks">Svaka %d tjedna</string>
-  <string name="every_x_months">Svaka %d mjeseca</string>
   <string name="score">Rezultat</string>
   <string name="reminder_sound">Zvuk podsjetnika</string>
   <string name="none">Nijedan</string>

uhabits-android/src/main/res/values-hu/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Összesen</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">alk. /</string>
-  <string name="every_x_days">%d naponta</string>
-  <string name="every_x_weeks">%d hetente</string>
-  <string name="every_x_months">%d havonta</string>
   <string name="score">Pont</string>
   <string name="reminder_sound">Emlékeztető dallama</string>
   <string name="none">Nem ismétlődik</string>

uhabits-android/src/main/res/values-in/strings.xml

@@ -151,9 +151,6 @@
     <string name="total">Total</string>
     <!-- Middle part of the sentence '1 time in xx days' -->
     <string name="time_every">kali dalam</string>
-    <string name="every_x_days">Setiap %d hari</string>
-    <string name="every_x_weeks">Setiap %d minggu</string>
-    <string name="every_x_months">Setiap %d bulan</string>
     <string name="score">Skor</string>
     <string name="reminder_sound">Suara pengingat</string>
     <string name="none">Hening</string>

uhabits-android/src/main/res/values-it/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Totale</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">volta in</string>
-  <string name="every_x_days">Ogni %d giorni</string>
-  <string name="every_x_weeks">Ogni %d settimane</string>
-  <string name="every_x_months">Ogni %d mesi</string>
   <string name="score">Punteggio</string>
   <string name="reminder_sound">Suono notifica</string>
   <string name="none">Nessuno</string>

uhabits-android/src/main/res/values-iw/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">סה\"כ</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">פעמים ב-</string>
-  <string name="every_x_days">כל %d ימים</string>
-  <string name="every_x_weeks">כל %d שבועות</string>
-  <string name="every_x_months">כל %d חודשים</string>
   <string name="score">ציון</string>
   <string name="reminder_sound">צליל תזכורת</string>
   <string name="none">ללא</string>

uhabits-android/src/main/res/values-ja/strings.xml

@@ -148,9 +148,6 @@
   <string name="year">年</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">回 /</string>
-  <string name="every_x_days">%d 日ごと</string>
-  <string name="every_x_weeks">%d 週ごと</string>
-  <string name="every_x_months">%d ヶ月ごと</string>
   <string name="score">スコア</string>
   <string name="reminder_sound">リマインダー サウンド</string>
   <string name="none">なし</string>

uhabits-android/src/main/res/values-ko/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">전체</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">번</string>
-  <string name="every_x_days">%d일 마다</string>
-  <string name="every_x_weeks">%d주 마다</string>
-  <string name="every_x_months">%d개월 마다</string>
   <string name="score">점수</string>
   <string name="reminder_sound">알림음</string>
   <string name="none">무음</string>

uhabits-android/src/main/res/values-nl/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Totaal</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">keer per</string>
-  <string name="every_x_days">Iedere %d dagen</string>
-  <string name="every_x_weeks">Iedere %d weken</string>
-  <string name="every_x_months">Iedere %d maanden</string>
   <string name="score">Score</string>
   <string name="reminder_sound">Herinneringsgeluid</string>
   <string name="none">Stil</string>

uhabits-android/src/main/res/values-pl/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Łącznie</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">raz w</string>
-  <string name="every_x_days">Co %d dni</string>
-  <string name="every_x_weeks">Co %d tygodni</string>
-  <string name="every_x_months">Co %d miesięcy</string>
   <string name="score">Wynik</string>
   <string name="reminder_sound">Dźwięk przypomnienia</string>
   <string name="none">Brak</string>

uhabits-android/src/main/res/values-pt-rBR/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Total</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">vez em</string>
-  <string name="every_x_days">A cada %d dias</string>
-  <string name="every_x_weeks">A cada %d semanas</string>
-  <string name="every_x_months">A cada %d meses</string>
   <string name="score">Estabilidade</string>
   <string name="reminder_sound">Toque dos lembretes</string>
   <string name="none">Nenhum</string>

uhabits-android/src/main/res/values-pt-rPT/strings.xml

@@ -145,9 +145,6 @@
   <string name="year">Ano</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">vez em</string>
-  <string name="every_x_days">A cada %d dias</string>
-  <string name="every_x_weeks">A cada %d semanas</string>
-  <string name="every_x_months">A cada %d meses</string>
   <string name="score">Pontuação</string>
   <string name="reminder_sound">Som do lembrete</string>
   <string name="none">Silencioso</string>

uhabits-android/src/main/res/values-ru/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Всего</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">раз за</string>
-  <string name="every_x_days">Каждые %d дней</string>
-  <string name="every_x_weeks">Каждые %d недель</string>
-  <string name="every_x_months">Каждые %d месяцев</string>
   <string name="score">Стабильность</string>
   <string name="reminder_sound">Звук напоминания</string>
   <string name="none">Без звука</string>

uhabits-android/src/main/res/values-sl/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Skupaj</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">enkrat na</string>
-  <string name="every_x_days">Vsakih %d dni</string>
-  <string name="every_x_weeks">Vsakih %d tednov</string>
-  <string name="every_x_months">Vsakih %d mesecev</string>
   <string name="score">Ocena</string>
   <string name="reminder_sound">Zvok opomnika</string>
   <string name="none">Noben</string>

uhabits-android/src/main/res/values-sr/strings.xml

@@ -148,9 +148,6 @@
   <string name="year">година</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">пут у</string>
-  <string name="every_x_days">Сваких %d дана</string>
-  <string name="every_x_weeks">Сваких %d недеља</string>
-  <string name="every_x_months">Сваких %d месеци</string>
   <string name="score">снага</string>
   <string name="reminder_sound">Звук подсетника</string>
   <string name="none">Без звука</string>

uhabits-android/src/main/res/values-sv/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Totalt</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">gånger var</string>
-  <string name="every_x_days">Var %d:e dag</string>
-  <string name="every_x_weeks">Var %d:e vecka</string>
-  <string name="every_x_months">Var %d:e månad</string>
   <string name="score">Poäng</string>
   <string name="reminder_sound">Påminnelseljud</string>
   <string name="none">Inget</string>

uhabits-android/src/main/res/values-tr/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Tümü</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">kez</string>
-  <string name="every_x_days">Her %d gün</string>
-  <string name="every_x_weeks">Her %d hafta</string>
-  <string name="every_x_months">Her %d ay</string>
   <string name="score">Puan</string>
   <string name="reminder_sound">Hatırlatma sesi</string>
   <string name="none">Sessiz</string>

uhabits-android/src/main/res/values-uk/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">Усього</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">раз у</string>
-  <string name="every_x_days">Кожні %d дні(-в)</string>
-  <string name="every_x_weeks">Кожні %d тижні(-в)</string>
-  <string name="every_x_months">Кожні %d місяці (-в)</string>
   <string name="score">Сталість</string>
   <string name="reminder_sound">Звук нагадування</string>
   <string name="none">Немає</string>

uhabits-android/src/main/res/values-zh-rCN/strings.xml

@@ -152,9 +152,6 @@
   <string name="total">总数</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">次每</string>
-  <string name="every_x_days">每 %d 天</string>
-  <string name="every_x_weeks">每 %d 周</string>
-  <string name="every_x_months">每 %d 月</string>
   <string name="score">成绩</string>
   <string name="reminder_sound">提醒声音</string>
   <string name="none">无</string>

uhabits-android/src/main/res/values-zh-rTW/strings.xml

@@ -151,9 +151,6 @@
   <string name="total">總計</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">次每</string>
-  <string name="every_x_days">每 %d 天</string>
-  <string name="every_x_weeks">每 %d 周</string>
-  <string name="every_x_months">每 %d 月</string>
   <string name="score">分數</string>
   <string name="reminder_sound">提醒音效</string>
   <string name="none">無</string>

uhabits-android/src/main/res/values/strings.xml

@@ -179,9 +179,6 @@
     <!-- Middle part of the sentence '1 time in xx days' -->
     <string name="time_every">time in</string>
 
-    <string name="every_x_days">Every %d days</string>
-    <string name="every_x_weeks">Every %d weeks</string>
-    <string name="every_x_months">Every %d months</string>
     <string name="score">Score</string>
     <string name="reminder_sound">Reminder sound</string>
     <string name="none">None</string>
@@ -222,4 +219,21 @@
     <string name="target">Target</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+
+    <plurals name="times_a_day">
+        <item quantity="one">Every day</item>
+        <item quantity="other">%d times a day</item>
+    </plurals>
+    <plurals name="times_a_week">
+        <item quantity="one">Every week</item>
+        <item quantity="other">%d times a week</item>
+    </plurals>
+    <plurals name="times_a_month">
+        <item quantity="one">Every month</item>
+        <item quantity="other">%d times a month</item>
+    </plurals>
+    <plurals name="times_unknown_interval">
+        <item quantity="one">Every %2$d days</item>
+        <item quantity="other">%1$d times in %2$d days</item>
+    </plurals>
 </resources>