diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index 4b9612beb..22925f29c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -167,6 +167,8 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
if (isXWeeklyRepetition()) {
setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt())
+ } else if (isXMonthlyRepetition()) {
+ setRepeatRule(REPEAT_MONTH_SAME_DAY)
}
}
@@ -223,7 +225,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
if (isXWeeklyRepetition()) {
event_repetition_rule.text = if (mRepeatRule == EVERY_DAY) getString(R.string.every_day) else getSelectedDaysString()
} else if (isXMonthlyRepetition()) {
-
+ event_repetition_rule.text = getMonthlyRepetitionRuleText()
}
}
@@ -247,6 +249,16 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
return days.trim().trimEnd(',')
}
+ private fun getMonthlyRepetitionRuleText(): String {
+ return when (mRepeatRule) {
+ REPEAT_MONTH_SAME_DAY -> getString(R.string.the_same_day)
+ REPEAT_MONTH_LAST_DAY -> getString(R.string.the_last_day)
+ else -> {
+ ""
+ }
+ }
+ }
+
private fun showEventTypeDialog() {
hideKeyboard()
SelectEventTypeDialog(this, mEventTypeId) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 606689f07..5cdc19883 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Täglich
an ausgewählten Tagen
- jeden Monat am selben Tag
- am letzten Tag des Monat
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
jeden
ersten
zweiten
@@ -64,6 +67,7 @@
+ Repeat every
Jeden
ersten
zweiten
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c5c58f42d..c5d82a6d1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 38c01c584..6750923b8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 37bcd449a..89a070f41 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 2a5d2cd2a..e631f7393 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 76ca5c17e..ddabc2f5c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 6da492055..cd1366198 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fb580c115..bee5a3145 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6023d72ce..3787f2d61 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -53,8 +53,11 @@
Repetir
Todo dia
Em dias selecionados
- No mesmo dia todo mês
- No último dia do mês
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
A cada
primeiro
segundo
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 71e3b181c..adb238ac4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -53,8 +53,11 @@
Repetir em
Todos os dias
Nos dias selecionados
- No mesmo dia de cada mês
- No último dia do mês
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
A cada
primeira
segunda
@@ -64,6 +67,7 @@
+ Repeat every
A cada
primeiro
segundo
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 160a75b50..7a4646075 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Каждый день
В выбранные дни
- В тот же день каждый месяц
- В последний день месяца
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index bea7b5b4e..d165db3ef 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -53,8 +53,11 @@
Opakovať v
Každý deň
Vo vybraných dňoch
- Každý mesiac v rovnaký deň
- Posledný deň v mesiaci
+ Rovnaký deň
+ Posledný deň
+ Opakovať každý mesiac v rovnaký deň
+ Opakovať posledný deň v mesiaci
+ Opakovať každý
Každý
prvý
druhý
@@ -64,6 +67,7 @@
+ Opakovať každú
Každú
prvú
druhú
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 5398833d2..b0f3fcc16 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1c087b180..4e7e0dc14 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,8 +53,11 @@
Repeat on
Every day
On selected days
- On the same day every month
- On the last day of the month
+ The same day
+ The last day
+ Repeat on the same day each month
+ Repeat on the last day of the month
+ Repeat every
Every
first
second
@@ -64,6 +67,7 @@
+ Repeat every
Every
first
second