fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct the plural versions of custom reminders

This commit is contained in:
tibbi 2017-02-03 11:48:14 +01:00
parent 17563cd576
commit b00e6ed9b3
15 changed files with 225 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,11 +120,11 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
30 -> getString(R.string.mins_before_30)
else -> {
if (minutes % 1440 == 0)
"${minutes / 1440} ${getString(R.string.days)}"
resources.getQuantityString(R.plurals.days, minutes / 1440, minutes / 1440)
else if (minutes % 60 == 0)
"${minutes / 60} ${getString(R.string.hours)}"
resources.getQuantityString(R.plurals.hours, minutes / 60, minutes / 60)
else
"$minutes ${getString(R.string.minutes)}"
resources.getQuantityString(R.plurals.minutes, minutes, minutes)
}
}

6
app/src/main/res/layout/dialog_custom_event_reminder.xml
View File

@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/minutes"/>
android:text="@string/minutes_raw"/>
<com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/dialog_radio_hours"
@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/hours"/>
android:text="@string/hours_raw"/>
<com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/dialog_radio_days"
@ -47,7 +47,7 @@
android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/days"/>
android:text="@string/days_raw"/>
</RadioGroup>
</LinearLayout>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Benutzerdefiniert</string>
<string name="before">vorher</string>
<string name="minutes">Minuten</string>
<string name="hours">Stunden</string>
<string name="days">Tage</string>
<string name="minutes_raw">Minuten</string>
<string name="hours_raw">Stunden</string>
<string name="days_raw">Tage</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d Minuten</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d Stunden</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d Tage</item>
</plurals>
<!-- Importing -->
<string name="import_events">importiere Termine</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Personalizado</string>
<string name="before">antes de</string>
<string name="minutes">minutos</string>
<string name="hours">horas</string>
<string name="days">días</string>
<string name="minutes_raw">minutos</string>
<string name="hours_raw">horas</string>
<string name="days_raw">días</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutos</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d horas</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d días</item>
</plurals>
<!-- Importing -->
<string name="import_events">Import events</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Personnalisé</string>
<string name="before">avant</string>
<string name="minutes">minutes</string>
<string name="hours">heures</string>
<string name="days">jours</string>
<string name="minutes_raw">minutes</string>
<string name="hours_raw">heures</string>
<string name="days_raw">jours</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d heures</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d jours</item>
</plurals>
<!-- Importing -->
<string name="import_events">Import events</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Custom</string>
<string name="before">before</string>
<string name="minutes">minutes</string>
<string name="hours">hours</string>
<string name="days">days</string>
<string name="minutes_raw">minutes</string>
<string name="hours_raw">hours</string>
<string name="days_raw">days</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d days</item>
</plurals>
<!-- Importing -->
<string name="import_events">Import events</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Egyedi</string>
<string name="before">korábban</string>
<string name="minutes">perccel</string>
<string name="hours">órával</string>
<string name="days">nappal</string>
<string name="minutes_raw">perc</string>
<string name="hours_raw">óra</string>
<string name="days_raw">nap</string>
<plurals name="minutes">
<item quantity="one">%1$d percel</item>
<item quantity="other">%1$d percel</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d órával</item>
<item quantity="other">%1$d órával</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d nappal</item>
<item quantity="other">%1$d nappal</item>
</plurals>
<!-- Importing -->
<string name="import_events">Import events</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Custom</string>
<string name="before">before</string>
<string name="minutes">minutes</string>
<string name="hours">hours</string>
<string name="days">days</string>
<string name="minutes_raw">minutes</string>
<string name="hours_raw">hours</string>
<string name="days_raw">days</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d days</item>
</plurals>
<!-- Importing -->
<string name="import_events">Import events</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">מותאם אישית</string>
<string name="before">לפני</string>
<string name="minutes">דקות</string>
<string name="hours">שעות</string>
<string name="days">ימים</string>
<string name="minutes_raw">minutes</string>
<string name="hours_raw">hours</string>
<string name="days_raw">days</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d days</item>
</plurals>
<!-- Importing -->
<string name="import_events">ייבוא אירועים</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">カスタム</string>
<string name="before">前</string>
<string name="minutes">分</string>
<string name="hours">時間</string>
<string name="days">日</string>
<string name="minutes_raw">分</string>
<string name="hours_raw">時間</string>
<string name="days_raw">日</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d 分</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d 時間</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d 日</item>
</plurals>
<!-- Importing -->
<string name="import_events">Import events</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Personalizado</string>
<string name="before">antes</string>
<string name="minutes">minutos</string>
<string name="hours">horas</string>
<string name="days">dias</string>
<string name="minutes_raw">minutos</string>
<string name="hours_raw">horas</string>
<string name="days_raw">dias</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutos</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d horas</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d dias</item>
</plurals>
<!-- Importing -->
<string name="import_events">Importar eventos</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Настраиваемое</string>
<string name="before">до события</string>
<string name="minutes">минут</string>
<string name="hours">часов</string>
<string name="days">дней</string>
<string name="minutes_raw">минут</string>
<string name="hours_raw">часов</string>
<string name="days_raw">дней</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d минут</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d часов</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d дней</item>
</plurals>
<!-- Importing -->
<string name="import_events">Импорт событий</string>

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Egen</string>
<string name="before">före</string>
<string name="minutes">minuter</string>
<string name="hours">timmar</string>
<string name="days">dagar</string>
<string name="minutes_raw">minuter</string>
<string name="hours_raw">timmar</string>
<string name="days_raw">dagar</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minuter</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d timmar</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d dagar</item>
</plurals>
<!-- Importing -->
<string name="import_events">Import events</string>

6
app/src/main/res/values/array.xml
View File

@ -7,9 +7,9 @@
</string-array>
<string-array name="custom_reminders">
<item>@string/minutes</item>
<item>@string/hours</item>
<item>@string/days</item>
<item>@string/minutes_raw</item>
<item>@string/hours_raw</item>
<item>@string/days_raw</item>
</string-array>
<string-array name="repetition">

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

@ -45,9 +45,24 @@
<string name="mins_before_30">30 minutes before</string>
<string name="custom">Custom</string>
<string name="before">before</string>
<string name="minutes">minutes</string>
<string name="hours">hours</string>
<string name="days">days</string>
<string name="minutes_raw">minutes</string>
<string name="hours_raw">hours</string>
<string name="days_raw">days</string>
<plurals name="minutes">
<item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item>
</plurals>
<plurals name="hours">
<item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item>
</plurals>
<plurals name="days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d days</item>
</plurals>
<!-- Importing -->
<string name="import_events">Import events</string>