Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78372
Change subject: Complete PLURAL support in mwe-upwiz-mins-secs-remaining
......................................................................
Complete PLURAL support in mwe-upwiz-mins-secs-remaining
Bug: 24643
Change-Id: I4ecc7c5cc940d0d89e9380f3d03d1eec18ee0d08
---
M UploadWizard.i18n.php
M resources/mw.GroupProgressBar.js
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/72/78372/1
diff --git a/UploadWizard.i18n.php b/UploadWizard.i18n.php
index e6401d3..45c8af5 100644
--- a/UploadWizard.i18n.php
+++ b/UploadWizard.i18n.php
@@ -89,7 +89,7 @@
'mwe-upwiz-progressbar-uploading' => 'uploading',
'mwe-upwiz-finished' => 'Finished!',
'mwe-upwiz-secs-remaining' => '$1 {{PLURAL:$1|second|seconds}}
remaining',
- 'mwe-upwiz-mins-secs-remaining' => '$1 {{PLURAL:$1|minute|minutes}} $2
{{PLURAL:$2|second|seconds}} remaining',
+ 'mwe-upwiz-mins-secs-remaining' => '$1 {{PLURAL:$1|minute|minutes}} $2
{{PLURAL:$2|second|seconds}} {{PLURAL:$3|remaining}}',
'mwe-upwiz-hrs-mins-secs-remaining' => '$1 {{PLURAL:$1|hour|hours}} $2
{{PLURAL:$2|minute|minutes}} $3 {{PLURAL:$3|second|seconds}} remaining',
// Dummy GENDER, to prevent translatewiki.net warnings.
'mwe-upwiz-deeds-macro-prompt' => "This site requires {{GENDER:$2|you}}
to provide copyright information for {{PLURAL:$1|this work|these works}}, to
make sure everyone can legally reuse {{PLURAL:$1|it|them}}.",
@@ -572,6 +572,7 @@
'mwe-upwiz-mins-secs-remaining' => 'Used to show overall progress for
uploading. Parameters:
* $1 - number of minutes
* $2 - number of seconds
+* $3 - sum of $1 and $2, for usage in PLURAL where needed
{{Related|Mwe-upwiz-remaining}}',
'mwe-upwiz-hrs-mins-secs-remaining' => 'Used to show overall progress
for uploading. Parameters:
* $1 - number of hours
diff --git a/resources/mw.GroupProgressBar.js b/resources/mw.GroupProgressBar.js
index 939c189..3d4ccda 100644
--- a/resources/mw.GroupProgressBar.js
+++ b/resources/mw.GroupProgressBar.js
@@ -143,7 +143,7 @@
timeString = mw.msg(
'mwe-upwiz-secs-remaining', t.seconds );
}
} else {
- timeString = mw.msg(
'mwe-upwiz-mins-secs-remaining', t.minutes, t.seconds );
+ timeString = mw.msg(
'mwe-upwiz-mins-secs-remaining', t.minutes, t.seconds, t.minutes + t.seconds );
}
} else {
timeString = mw.msg(
'mwe-upwiz-hrs-mins-secs-remaining', t.hours, t.minutes, t.seconds );
--
To view, visit https://gerrit.wikimedia.org/r/78372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ecc7c5cc940d0d89e9380f3d03d1eec18ee0d08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Nemo bis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
