[gnome-maps] utils: Don't pluralize abbrevation for minutes
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps] utils: Don't pluralize abbrevation for minutes
- Date: Tue, 11 Aug 2020 20:37:45 +0000 (UTC)
commit d6173fddfa67b77da44bcf63eb43f055971d6a8e
Author: Marcus Lundblad <ml update uu se>
Date: Tue Aug 11 22:35:13 2020 +0200
utils: Don't pluralize abbrevation for minutes
The plural form of the abbreviation for "min" in
English should still be "min".
Fixes #289
src/utils.js | 4 ++--
tests/utilsTest.js | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/utils.js b/src/utils.js
index b40707f6..fd4a2266 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -335,14 +335,14 @@ function prettyTime(time) {
* using abbreviations for hours and minutes, correspoding to 'h'
* and 'min' in English. The minutes has appropriate plural variations
*/
- return ngettext("%s h %s min", "%s h %s mins",
+ return ngettext("%s h %s min", "%s h %s min",
minutes).format(hoursStr, minutesStr);
} else if (minutes > 0) {
/* Translators: this is a duration with minutes part
* using abbreviation for minutes, corresponding to 'min' in English
* with appropriate plural variations
*/
- return ngettext("%s min", "%s mins", minutes).format(minutesStr);
+ return ngettext("%s min", "%s min", minutes).format(minutesStr);
} else {
/* Translators: this is a duration of less than one minute
* with seconds using an abbreviation for seconds, corresponding to
diff --git a/tests/utilsTest.js b/tests/utilsTest.js
index 12a88c84..5f46aaab 100644
--- a/tests/utilsTest.js
+++ b/tests/utilsTest.js
@@ -69,9 +69,9 @@ function prettyTimeTest() {
JsUnit.assertEquals('1 h', Utils.prettyTime(3600000));
JsUnit.assertEquals('1 h 1 min', Utils.prettyTime(3660000));
JsUnit.assertEquals('1 h', Utils.prettyTime(3600001));
- JsUnit.assertEquals('1 h 10 mins', Utils.prettyTime(4200000));
- JsUnit.assertEquals('20 mins', Utils.prettyTime(1200000));
- JsUnit.assertEquals('20 mins', Utils.prettyTime(1201000));
+ JsUnit.assertEquals('1 h 10 min', Utils.prettyTime(4200000));
+ JsUnit.assertEquals('20 min', Utils.prettyTime(1200000));
+ JsUnit.assertEquals('20 min', Utils.prettyTime(1201000));
JsUnit.assertEquals('1 s', Utils.prettyTime(1000));
JsUnit.assertEquals('1 s', Utils.prettyTime(1001));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]