diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
index 74e6b131d..f95bac52f 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
+++ b/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();
- Integer den = freq.getDenominator();
-
- if (num.equals(den)) return resources.getString(R.string.every_day);
-
- if (num == 1)
- {
- if (den == 7) return resources.getString(R.string.every_week);
- if (den % 7 == 0)
- return resources.getString(R.string.every_x_weeks, den / 7);
- return resources.getString(R.string.every_x_days, den);
+ int num = freq.getNumerator();
+ int den = freq.getDenominator();
+
+ if (den == 1) {
+ return resources.getQuantityString(R.plurals.times_a_day, num, num);
+ } else if (den == 7) {
+ return resources.getQuantityString(R.plurals.times_a_week, num, num);
+ } else if (den == 28) {
+ return resources.getQuantityString(R.plurals.times_a_month, num, num);
+ } else {
+ 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)
diff --git a/uhabits-android/src/main/res/values-ar/strings.xml b/uhabits-android/src/main/res/values-ar/strings.xml
index a0dda8c3c..00aa3c85b 100644
--- a/uhabits-android/src/main/res/values-ar/strings.xml
+++ b/uhabits-android/src/main/res/values-ar/strings.xml
@@ -150,9 +150,6 @@
المجموع
مرات في
- كل %d أيام
- كل %d أسابيع
- كل %d أشهر
النقاط
صوت تذكير
صامت
diff --git a/uhabits-android/src/main/res/values-bg/strings.xml b/uhabits-android/src/main/res/values-bg/strings.xml
index 85d70798d..b0b6a486d 100644
--- a/uhabits-android/src/main/res/values-bg/strings.xml
+++ b/uhabits-android/src/main/res/values-bg/strings.xml
@@ -151,9 +151,6 @@
Общо
път в период от
- На всеки %d дни
- На всеки %d седмици
- На всеки %d месеца
Сила
Звук за напомняне
Няма
diff --git a/uhabits-android/src/main/res/values-ca/strings.xml b/uhabits-android/src/main/res/values-ca/strings.xml
index 27c554cd2..c3b2c92ee 100644
--- a/uhabits-android/src/main/res/values-ca/strings.xml
+++ b/uhabits-android/src/main/res/values-ca/strings.xml
@@ -148,9 +148,6 @@
Any
vegades en
- Cada %d dies
- Cada %d setmanes
- Cada %d mesos
Puntuació
So de recordatori
Cap
diff --git a/uhabits-android/src/main/res/values-cs/strings.xml b/uhabits-android/src/main/res/values-cs/strings.xml
index 2b783e1d3..ac004117d 100644
--- a/uhabits-android/src/main/res/values-cs/strings.xml
+++ b/uhabits-android/src/main/res/values-cs/strings.xml
@@ -151,9 +151,6 @@
Celkem
krát za
- Každých %d dní
- Každých %d týdnů
- Každých %d měsíců
Skóre
Zvuk upomínky
Žádný
diff --git a/uhabits-android/src/main/res/values-da/strings.xml b/uhabits-android/src/main/res/values-da/strings.xml
index f076c61a7..7e1898b03 100644
--- a/uhabits-android/src/main/res/values-da/strings.xml
+++ b/uhabits-android/src/main/res/values-da/strings.xml
@@ -145,9 +145,6 @@
År
Tid til
- Hver %d dage
- Hver %d uger
- Hver %d måneder
Point
Påmindelse lyd
Ingen
diff --git a/uhabits-android/src/main/res/values-de/strings.xml b/uhabits-android/src/main/res/values-de/strings.xml
index 79910b24b..55a758515 100644
--- a/uhabits-android/src/main/res/values-de/strings.xml
+++ b/uhabits-android/src/main/res/values-de/strings.xml
@@ -151,9 +151,6 @@
Gesamt
Mal in
- Alle %d Tage
- Alle %d Wochen
- Alle %d Monate
Wertung
Erinnerungston
Keiner
diff --git a/uhabits-android/src/main/res/values-el/strings.xml b/uhabits-android/src/main/res/values-el/strings.xml
index 606025a55..2eeae55a8 100644
--- a/uhabits-android/src/main/res/values-el/strings.xml
+++ b/uhabits-android/src/main/res/values-el/strings.xml
@@ -148,9 +148,6 @@
Χρόνος
φορά σε
- Κάθε %d ημέρες
- Κάθε %d εβδομάδες
- Κάθε %d μήνες
Σκόρ
Ήχος υπενθύμισης
Σιωπηλό
diff --git a/uhabits-android/src/main/res/values-eo/strings.xml b/uhabits-android/src/main/res/values-eo/strings.xml
index b16128dc0..86f98cd9d 100644
--- a/uhabits-android/src/main/res/values-eo/strings.xml
+++ b/uhabits-android/src/main/res/values-eo/strings.xml
@@ -151,9 +151,6 @@
Totalt
gang på
- Hver %d. dag
- Hver %d. uke
- Hver %d. måned
Poengsum
Påminnelseslyd
Ingen
diff --git a/uhabits-android/src/main/res/values-es/strings.xml b/uhabits-android/src/main/res/values-es/strings.xml
index 2131e3d22..14cfffbc0 100644
--- a/uhabits-android/src/main/res/values-es/strings.xml
+++ b/uhabits-android/src/main/res/values-es/strings.xml
@@ -151,9 +151,6 @@
Total
veces en
- Cada %d días
- Cada %d semanas
- Cada %d meses
Puntuación
Sonido de recordatorio
Ninguno
diff --git a/uhabits-android/src/main/res/values-eu/strings.xml b/uhabits-android/src/main/res/values-eu/strings.xml
index 75e38eb2c..2de2e852e 100644
--- a/uhabits-android/src/main/res/values-eu/strings.xml
+++ b/uhabits-android/src/main/res/values-eu/strings.xml
@@ -151,9 +151,6 @@
Guztira
denbora
- %d egunero
- %d astero
- %d hilabetero
Puntuak
Oroigarriaren soinua
Bat ere ez
diff --git a/uhabits-android/src/main/res/values-fa/strings.xml b/uhabits-android/src/main/res/values-fa/strings.xml
index c3512ccde..d353090a4 100644
--- a/uhabits-android/src/main/res/values-fa/strings.xml
+++ b/uhabits-android/src/main/res/values-fa/strings.xml
@@ -151,9 +151,6 @@
مجموع
بار در هر
- هر %d روز یکبار
- هر %d هفته یکبار
- هر %d ماه یکبار
امتیاز
صدای یادآور
هیچکدام
diff --git a/uhabits-android/src/main/res/values-fr/strings.xml b/uhabits-android/src/main/res/values-fr/strings.xml
index 3892fc1ee..ee5dcb80b 100644
--- a/uhabits-android/src/main/res/values-fr/strings.xml
+++ b/uhabits-android/src/main/res/values-fr/strings.xml
@@ -151,9 +151,6 @@
Total
fois tous les
- Tous les %d jours
- Toutes les %d semaines
- Tous les %d mois
Pointage
Son de rappel
Aucun
diff --git a/uhabits-android/src/main/res/values-hi/strings.xml b/uhabits-android/src/main/res/values-hi/strings.xml
index c37f603f3..e95bade1f 100644
--- a/uhabits-android/src/main/res/values-hi/strings.xml
+++ b/uhabits-android/src/main/res/values-hi/strings.xml
@@ -200,12 +200,6 @@ repetitions की संख्या\"
साल
समय में
- \"
-हर %d दिन\"
- \"
-हर %d हफ्ते\"
- \"
-हर %d महीने\"
स्कोर
अनुस्मारक ध्वनि
\"
diff --git a/uhabits-android/src/main/res/values-hr/strings.xml b/uhabits-android/src/main/res/values-hr/strings.xml
index 9cafc723c..311d5e672 100644
--- a/uhabits-android/src/main/res/values-hr/strings.xml
+++ b/uhabits-android/src/main/res/values-hr/strings.xml
@@ -151,9 +151,6 @@
Ukupno
put svakih
- Svaka %d dana
- Svaka %d tjedna
- Svaka %d mjeseca
Rezultat
Zvuk podsjetnika
Nijedan
diff --git a/uhabits-android/src/main/res/values-hu/strings.xml b/uhabits-android/src/main/res/values-hu/strings.xml
index 2526f3607..144b65406 100644
--- a/uhabits-android/src/main/res/values-hu/strings.xml
+++ b/uhabits-android/src/main/res/values-hu/strings.xml
@@ -151,9 +151,6 @@
Összesen
alk. /
- %d naponta
- %d hetente
- %d havonta
Pont
Emlékeztető dallama
Nem ismétlődik
diff --git a/uhabits-android/src/main/res/values-in/strings.xml b/uhabits-android/src/main/res/values-in/strings.xml
index 0b1435380..dc1912f87 100644
--- a/uhabits-android/src/main/res/values-in/strings.xml
+++ b/uhabits-android/src/main/res/values-in/strings.xml
@@ -151,9 +151,6 @@
Total
kali dalam
- Setiap %d hari
- Setiap %d minggu
- Setiap %d bulan
Skor
Suara pengingat
Hening
diff --git a/uhabits-android/src/main/res/values-it/strings.xml b/uhabits-android/src/main/res/values-it/strings.xml
index 88d0dfb06..2cdc8fc5e 100644
--- a/uhabits-android/src/main/res/values-it/strings.xml
+++ b/uhabits-android/src/main/res/values-it/strings.xml
@@ -151,9 +151,6 @@
Totale
volta in
- Ogni %d giorni
- Ogni %d settimane
- Ogni %d mesi
Punteggio
Suono notifica
Nessuno
diff --git a/uhabits-android/src/main/res/values-iw/strings.xml b/uhabits-android/src/main/res/values-iw/strings.xml
index cc4486ab7..78092a768 100644
--- a/uhabits-android/src/main/res/values-iw/strings.xml
+++ b/uhabits-android/src/main/res/values-iw/strings.xml
@@ -151,9 +151,6 @@
סה\"כ
פעמים ב-
- כל %d ימים
- כל %d שבועות
- כל %d חודשים
ציון
צליל תזכורת
ללא
diff --git a/uhabits-android/src/main/res/values-ja/strings.xml b/uhabits-android/src/main/res/values-ja/strings.xml
index 351b00b22..7b63f22dd 100644
--- a/uhabits-android/src/main/res/values-ja/strings.xml
+++ b/uhabits-android/src/main/res/values-ja/strings.xml
@@ -148,9 +148,6 @@
年
回 /
- %d 日ごと
- %d 週ごと
- %d ヶ月ごと
スコア
リマインダー サウンド
なし
diff --git a/uhabits-android/src/main/res/values-ko/strings.xml b/uhabits-android/src/main/res/values-ko/strings.xml
index a213fa211..678401033 100644
--- a/uhabits-android/src/main/res/values-ko/strings.xml
+++ b/uhabits-android/src/main/res/values-ko/strings.xml
@@ -151,9 +151,6 @@
전체
번
- %d일 마다
- %d주 마다
- %d개월 마다
점수
알림음
무음
diff --git a/uhabits-android/src/main/res/values-nl/strings.xml b/uhabits-android/src/main/res/values-nl/strings.xml
index d6fd34d0d..6739a7be6 100644
--- a/uhabits-android/src/main/res/values-nl/strings.xml
+++ b/uhabits-android/src/main/res/values-nl/strings.xml
@@ -151,9 +151,6 @@
Totaal
keer per
- Iedere %d dagen
- Iedere %d weken
- Iedere %d maanden
Score
Herinneringsgeluid
Stil
diff --git a/uhabits-android/src/main/res/values-pl/strings.xml b/uhabits-android/src/main/res/values-pl/strings.xml
index 31f815b83..5c8956cfb 100644
--- a/uhabits-android/src/main/res/values-pl/strings.xml
+++ b/uhabits-android/src/main/res/values-pl/strings.xml
@@ -151,9 +151,6 @@
Łącznie
raz w
- Co %d dni
- Co %d tygodni
- Co %d miesięcy
Wynik
Dźwięk przypomnienia
Brak
diff --git a/uhabits-android/src/main/res/values-pt-rBR/strings.xml b/uhabits-android/src/main/res/values-pt-rBR/strings.xml
index dcc65bdc0..1d53c993e 100644
--- a/uhabits-android/src/main/res/values-pt-rBR/strings.xml
+++ b/uhabits-android/src/main/res/values-pt-rBR/strings.xml
@@ -151,9 +151,6 @@
Total
vez em
- A cada %d dias
- A cada %d semanas
- A cada %d meses
Estabilidade
Toque dos lembretes
Nenhum
diff --git a/uhabits-android/src/main/res/values-pt-rPT/strings.xml b/uhabits-android/src/main/res/values-pt-rPT/strings.xml
index 3dd2b3541..0f892e5af 100644
--- a/uhabits-android/src/main/res/values-pt-rPT/strings.xml
+++ b/uhabits-android/src/main/res/values-pt-rPT/strings.xml
@@ -145,9 +145,6 @@
Ano
vez em
- A cada %d dias
- A cada %d semanas
- A cada %d meses
Pontuação
Som do lembrete
Silencioso
diff --git a/uhabits-android/src/main/res/values-ru/strings.xml b/uhabits-android/src/main/res/values-ru/strings.xml
index 352e98215..c43116170 100644
--- a/uhabits-android/src/main/res/values-ru/strings.xml
+++ b/uhabits-android/src/main/res/values-ru/strings.xml
@@ -151,9 +151,6 @@
Всего
раз за
- Каждые %d дней
- Каждые %d недель
- Каждые %d месяцев
Стабильность
Звук напоминания
Без звука
diff --git a/uhabits-android/src/main/res/values-sl/strings.xml b/uhabits-android/src/main/res/values-sl/strings.xml
index 50e6e1634..6b75bfe40 100644
--- a/uhabits-android/src/main/res/values-sl/strings.xml
+++ b/uhabits-android/src/main/res/values-sl/strings.xml
@@ -151,9 +151,6 @@
Skupaj
enkrat na
- Vsakih %d dni
- Vsakih %d tednov
- Vsakih %d mesecev
Ocena
Zvok opomnika
Noben
diff --git a/uhabits-android/src/main/res/values-sr/strings.xml b/uhabits-android/src/main/res/values-sr/strings.xml
index ccf4dcb0b..cf7d00b28 100644
--- a/uhabits-android/src/main/res/values-sr/strings.xml
+++ b/uhabits-android/src/main/res/values-sr/strings.xml
@@ -148,9 +148,6 @@
година
пут у
- Сваких %d дана
- Сваких %d недеља
- Сваких %d месеци
снага
Звук подсетника
Без звука
diff --git a/uhabits-android/src/main/res/values-sv/strings.xml b/uhabits-android/src/main/res/values-sv/strings.xml
index dc6217f97..46ac6c260 100644
--- a/uhabits-android/src/main/res/values-sv/strings.xml
+++ b/uhabits-android/src/main/res/values-sv/strings.xml
@@ -151,9 +151,6 @@
Totalt
gånger var
- Var %d:e dag
- Var %d:e vecka
- Var %d:e månad
Poäng
Påminnelseljud
Inget
diff --git a/uhabits-android/src/main/res/values-tr/strings.xml b/uhabits-android/src/main/res/values-tr/strings.xml
index b9f926409..bff3dd296 100644
--- a/uhabits-android/src/main/res/values-tr/strings.xml
+++ b/uhabits-android/src/main/res/values-tr/strings.xml
@@ -151,9 +151,6 @@
Tümü
kez
- Her %d gün
- Her %d hafta
- Her %d ay
Puan
Hatırlatma sesi
Sessiz
diff --git a/uhabits-android/src/main/res/values-uk/strings.xml b/uhabits-android/src/main/res/values-uk/strings.xml
index 0937c381a..a2109953f 100644
--- a/uhabits-android/src/main/res/values-uk/strings.xml
+++ b/uhabits-android/src/main/res/values-uk/strings.xml
@@ -151,9 +151,6 @@
Усього
раз у
- Кожні %d дні(-в)
- Кожні %d тижні(-в)
- Кожні %d місяці (-в)
Сталість
Звук нагадування
Немає
diff --git a/uhabits-android/src/main/res/values-zh-rCN/strings.xml b/uhabits-android/src/main/res/values-zh-rCN/strings.xml
index 83be2c6ad..cf1681e66 100644
--- a/uhabits-android/src/main/res/values-zh-rCN/strings.xml
+++ b/uhabits-android/src/main/res/values-zh-rCN/strings.xml
@@ -152,9 +152,6 @@
总数
次每
- 每 %d 天
- 每 %d 周
- 每 %d 月
成绩
提醒声音
无
diff --git a/uhabits-android/src/main/res/values-zh-rTW/strings.xml b/uhabits-android/src/main/res/values-zh-rTW/strings.xml
index 585663c45..c7901c14a 100644
--- a/uhabits-android/src/main/res/values-zh-rTW/strings.xml
+++ b/uhabits-android/src/main/res/values-zh-rTW/strings.xml
@@ -151,9 +151,6 @@
總計
次每
- 每 %d 天
- 每 %d 周
- 每 %d 月
分數
提醒音效
無
diff --git a/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml
index 5c043b111..43908af79 100644
--- a/uhabits-android/src/main/res/values/strings.xml
+++ b/uhabits-android/src/main/res/values/strings.xml
@@ -179,9 +179,6 @@
time in
- Every %d days
- Every %d weeks
- Every %d months
Score
Reminder sound
None
@@ -222,4 +219,21 @@
Target
Yes
No
+
+
+ - Every day
+ - %d times a day
+
+
+ - Every week
+ - %d times a week
+
+
+ - Every month
+ - %d times a month
+
+
+ - Every %2$d days
+ - %1$d times in %2$d days
+
\ No newline at end of file