fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

update some monthly repetition related strings

Browse Source
This commit is contained in:
tibbi
2017-05-07 17:35:20 +02:00
parent e05b8e1eb3
commit 480bd27c12
15 changed files with 97 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@@ -167,6 +167,8 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
if (isXWeeklyRepetition()) { if (isXWeeklyRepetition()) {
setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt()) 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()) { if (isXWeeklyRepetition()) {
event_repetition_rule.text = if (mRepeatRule == EVERY_DAY) getString(R.string.every_day) else getSelectedDaysString() event_repetition_rule.text = if (mRepeatRule == EVERY_DAY) getString(R.string.every_day) else getSelectedDaysString()
} else if (isXMonthlyRepetition()) { } else if (isXMonthlyRepetition()) {
event_repetition_rule.text = getMonthlyRepetitionRuleText()
} }
} }
@@ -247,6 +249,16 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
return days.trim().trimEnd(',') 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() { private fun showEventTypeDialog() {
hideKeyboard() hideKeyboard()
SelectEventTypeDialog(this, mEventTypeId) { SelectEventTypeDialog(this, mEventTypeId) {

8
app/src/main/res/values-de/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Täglich</string> <string name="every_day">Täglich</string>
<string name="selected_days">an ausgewählten Tagen</string> <string name="selected_days">an ausgewählten Tagen</string>
<string name="on_the_same_day">jeden Monat am selben Tag</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">am letzten Tag des Monat</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">jeden</string> <string name="every_m">jeden</string>
<string name="first_m">ersten</string> <string name="first_m">ersten</string>
<string name="second_m">zweiten</string> <string name="second_m">zweiten</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Jeden</string> <string name="every_f">Jeden</string>
<string name="first_f">ersten</string> <string name="first_f">ersten</string>
<string name="second_f">zweiten</string> <string name="second_f">zweiten</string>

8
app/src/main/res/values-es/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-fr/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-hi-rIN/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-hu/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-it/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-iw/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-ja/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-pt-rBR/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repetir</string> <string name="repeat_on">Repetir</string>
<string name="every_day">Todo dia</string> <string name="every_day">Todo dia</string>
<string name="selected_days">Em dias selecionados</string> <string name="selected_days">Em dias selecionados</string>
<string name="on_the_same_day">No mesmo dia todo mês</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">No último dia do mês</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">A cada</string> <string name="every_m">A cada</string>
<string name="first_m">primeiro</string> <string name="first_m">primeiro</string>
<string name="second_m">segundo</string> <string name="second_m">segundo</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-pt/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repetir em</string> <string name="repeat_on">Repetir em</string>
<string name="every_day">Todos os dias</string> <string name="every_day">Todos os dias</string>
<string name="selected_days">Nos dias selecionados</string> <string name="selected_days">Nos dias selecionados</string>
<string name="on_the_same_day">No mesmo dia de cada mês</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">No último dia do mês</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">A cada</string> <string name="every_m">A cada</string>
<string name="first_m">primeira</string> <string name="first_m">primeira</string>
<string name="second_m">segunda</string> <string name="second_m">segunda</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">A cada</string> <string name="every_f">A cada</string>
<string name="first_f">primeiro</string> <string name="first_f">primeiro</string>
<string name="second_f">segundo</string> <string name="second_f">segundo</string>

8
app/src/main/res/values-ru/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Каждый день</string> <string name="every_day">Каждый день</string>
<string name="selected_days">В выбранные дни</string> <string name="selected_days">В выбранные дни</string>
<string name="on_the_same_day">В тот же день каждый месяц</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">В последний день месяца</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values-sk/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Opakovať v</string> <string name="repeat_on">Opakovať v</string>
<string name="every_day">Každý deň</string> <string name="every_day">Každý deň</string>
<string name="selected_days">Vo vybraných dňoch</string> <string name="selected_days">Vo vybraných dňoch</string>
<string name="on_the_same_day">Každý mesiac v rovnaký deň</string> <string name="the_same_day">Rovnaký deň</string>
<string name="on_the_last_day">Posledný deň v mesiaci</string> <string name="the_last_day">Posledný deň</string>
<string name="repeat_on_the_same_day">Opakovať každý mesiac v rovnaký deň</string>
<string name="repeat_on_the_last_day">Opakovať posledný deň v mesiaci</string>
<string name="repeat_every_m">Opakovať každý</string>
<string name="every_m">Každý</string> <string name="every_m">Každý</string>
<string name="first_m">prvý</string> <string name="first_m">prvý</string>
<string name="second_m">druhý</string> <string name="second_m">druhý</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Opakovať každú</string>
<string name="every_f">Každú</string> <string name="every_f">Každú</string>
<string name="first_f">prvú</string> <string name="first_f">prvú</string>
<string name="second_f">druhú</string> <string name="second_f">druhú</string>

8
app/src/main/res/values-sv/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>

8
app/src/main/res/values/strings.xml
View File

@@ -53,8 +53,11 @@
<string name="repeat_on">Repeat on</string> <string name="repeat_on">Repeat on</string>
<string name="every_day">Every day</string> <string name="every_day">Every day</string>
<string name="selected_days">On selected days</string> <string name="selected_days">On selected days</string>
<string name="on_the_same_day">On the same day every month</string> <string name="the_same_day">The same day</string>
<string name="on_the_last_day">On the last day of the month</string> <string name="the_last_day">The last day</string>
<string name="repeat_on_the_same_day">Repeat on the same day each month</string>
<string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
<string name="repeat_every_m">Repeat every</string>
<string name="every_m">Every</string> <string name="every_m">Every</string>
<string name="first_m">first</string> <string name="first_m">first</string>
<string name="second_m">second</string> <string name="second_m">second</string>
@@ -64,6 +67,7 @@
<!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every first Sunday" --> <!-- used in repetition, like "Every first Sunday" -->
<string name="repeat_every_f">Repeat every</string>
<string name="every_f">Every</string> <string name="every_f">Every</string>
<string name="first_f">first</string> <string name="first_f">first</string>
<string name="second_f">second</string> <string name="second_f">second</string>