diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-02 21:11:47 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-02 21:11:47 -0400 |
| commit | 86f4d244d8b4bd2658ce04c4b8aef51dd277256a (patch) | |
| tree | b16a39a3a69dbeb48b8973f4c012df25a9de6093 /core | |
| parent | 1dd5fcdc3b8003d11ba2b2bf986987b711f27da4 (diff) | |
| parent | f799ad5ed58391ff841b1c19366c6558e99411b4 (diff) | |
| download | AntennaPod-86f4d244d8b4bd2658ce04c4b8aef51dd277256a.zip | |
Merge pull request #1055 from TomHennen/fix_time_string_names
Changed string names relating to time units.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/Converter.java | 4 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java index 2bf88b3f3..1b929b214 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java @@ -111,10 +111,10 @@ public final class Converter { String result = ""; if(h > 0) { - String hours = context.getResources().getQuantityString(R.plurals.time_unit_hours, h, h); + String hours = context.getResources().getQuantityString(R.plurals.time_hours_quantified, h, h); result += hours + " "; } - String minutes = context.getResources().getQuantityString(R.plurals.time_unit_minutes, m, m); + String minutes = context.getResources().getQuantityString(R.plurals.time_minutes_quantified, m, m); result += minutes; return result; } diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 8db8f8d78..b0ebef3da 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -384,18 +384,18 @@ <string name="sleep_timer_label">Sleep timer</string> <string name="time_left_label">Time left:\u0020</string> <string name="time_dialog_invalid_input">Invalid input, time has to be an integer</string> - <string name="time_unit_seconds">seconds</string> - <string name="time_unit_minutes">minutes</string> - <string name="time_unit_hours">hours</string> - <plurals name="time_unit_seconds"> + <string name="time_seconds">seconds</string> + <string name="time_minutes">minutes</string> + <string name="time_hours">hours</string> + <plurals name="time_seconds_quantified"> <item quantity="one">1 second</item> <item quantity="other">%d seconds</item> </plurals> - <plurals name="time_unit_minutes"> + <plurals name="time_minutes_quantified"> <item quantity="one">1 minute</item> <item quantity="other">%d minutes</item> </plurals> - <plurals name="time_unit_hours"> + <plurals name="time_hours_quantified"> <item quantity="one">1 hour</item> <item quantity="other">%d hours</item> </plurals> |