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

updating some time strings

Browse Source
This commit is contained in:
tibbi
2017-08-04 19:57:07 +02:00
parent 9a231a1738
commit f2afa03142
17 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View File

@@ -232,7 +232,7 @@ class SettingsActivity : SimpleActivity() {
} }
private fun updateSnoozeText() { private fun updateSnoozeText() {
settings_snooze_delay.text = res.getQuantityString(R.plurals.minutes, config.snoozeDelay, config.snoozeDelay) settings_snooze_delay.text = res.getQuantityString(R.plurals.by_minutes, config.snoozeDelay, config.snoozeDelay)
} }
private fun setupEventReminder() { private fun setupEventReminder() {

4
app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
View File

@@ -134,10 +134,10 @@ fun Context.getFormattedMinutes(minutes: Int, showBefore: Boolean = true) = when
else if (minutes % 1440 == 0) else if (minutes % 1440 == 0)
resources.getQuantityString(R.plurals.days, minutes / 1440, minutes / 1440) resources.getQuantityString(R.plurals.days, minutes / 1440, minutes / 1440)
else if (minutes % 60 == 0) { else if (minutes % 60 == 0) {
val base = if (showBefore) R.plurals.hours_before else R.plurals.hours val base = if (showBefore) R.plurals.hours_before else R.plurals.by_hours
resources.getQuantityString(base, minutes / 60, minutes / 60) resources.getQuantityString(base, minutes / 60, minutes / 60)
} else { } else {
val base = if (showBefore) R.plurals.minutes_before else R.plurals.minutes val base = if (showBefore) R.plurals.minutes_before else R.plurals.by_minutes
resources.getQuantityString(base, minutes, minutes) resources.getQuantityString(base, minutes, minutes)
} }
} }

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minuto</item> <item quantity="one">%1$d minuto</item>
<item quantity="other">%1$d minutos</item> <item quantity="other">%1$d minutos</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hora</item> <item quantity="one">%1$d hora</item>
<item quantity="other">%1$d horas</item> <item quantity="other">%1$d horas</item>
</plurals> </plurals>

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

@@ -214,13 +214,13 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d минута</item> <item quantity="one">%1$d минута</item>
<item quantity="few">%1$d минуты</item> <item quantity="few">%1$d минуты</item>
<item quantity="many">%1$d минут</item> <item quantity="many">%1$d минут</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d час</item> <item quantity="one">%1$d час</item>
<item quantity="few">%1$d часа</item> <item quantity="few">%1$d часа</item>
<item quantity="many">%1$d часов</item> <item quantity="many">%1$d часов</item>

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

@@ -207,15 +207,15 @@
<string name="google_sync_error_update">Chyba pri úprave udalosti na Googli: %1$s</string> <string name="google_sync_error_update">Chyba pri úprave udalosti na Googli: %1$s</string>
<string name="google_sync_error_fetch">Chyba pri čítaní Google udalostí: %1$s</string> <string name="google_sync_error_fetch">Chyba pri čítaní Google udalostí: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minútu</item> <item quantity="one">%1$d minútu</item>
<item quantity="few">%1$d minúty</item> <item quantity="few">%1$d minúty</item>
<item quantity="other">%1$d minút</item> <item quantity="other">%1$d minút</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hodiny</item> <item quantity="one">%1$d hodinu</item>
<item quantity="few">%1$d hodín</item> <item quantity="few">%1$d hodiny</item>
<item quantity="other">%1$d hodín</item> <item quantity="other">%1$d hodín</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minut</item> <item quantity="one">%1$d minut</item>
<item quantity="other">%1$d minuter</item> <item quantity="other">%1$d minuter</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d timme</item> <item quantity="one">%1$d timme</item>
<item quantity="other">%1$d timmar</item> <item quantity="other">%1$d timmar</item>
</plurals> </plurals>

4
app/src/main/res/values-tr/strings.xml
View File

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>

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

@@ -200,12 +200,12 @@
<string name="google_sync_error_update">Error updating event at Google: %1$s</string> <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
<string name="google_sync_error_fetch">Error fetching Google events: %1$s</string> <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
<plurals name="minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>
<item quantity="other">%1$d minutes</item> <item quantity="other">%1$d minutes</item>
</plurals> </plurals>
<plurals name="hours"> <plurals name="by_hours">
<item quantity="one">%1$d hour</item> <item quantity="one">%1$d hour</item>
<item quantity="other">%1$d hours</item> <item quantity="other">%1$d hours</item>
</plurals> </plurals>