MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177298
Change subject: Add "almost finished" message
......................................................................
Add "almost finished" message
The "Finished!" message was appearing too early, so let's make
it totally clear here.
Bug: T62483
Change-Id: If41718dd8d0399f16ab06627357a0ce238e4f986
---
M UploadWizardHooks.php
M i18n/en.json
M i18n/qqq.json
M resources/mw.GroupProgressBar.js
4 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/98/177298/1
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index 8ca65ed..1663fc3 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -209,6 +209,7 @@
'mwe-upwiz-file-all-failed',
'mwe-upwiz-upload-count',
'mwe-upwiz-progressbar-uploading',
+ 'mwe-upwiz-almost-finished',
'mwe-upwiz-finished',
'mwe-upwiz-secs-remaining',
'mwe-upwiz-mins-secs-remaining',
diff --git a/i18n/en.json b/i18n/en.json
index f7726e1..5176fff 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -74,6 +74,7 @@
"mwe-upwiz-file-all-failed": "None of the uploads were successful.",
"mwe-upwiz-upload-count": "$1 of $2 {{PLURAL:$2|file|files}} uploaded",
"mwe-upwiz-progressbar-uploading": "uploading",
+ "mwe-upwiz-almost-finished": "Almost finished...",
"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}} {{PLURAL:$3|remaining}}",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 80952ad..4d21b87 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -97,6 +97,7 @@
"mwe-upwiz-file-all-failed": "Displayed when an upload session is
complete and all of the uploads in it were rejected.",
"mwe-upwiz-upload-count": "This message means that $1 of $2 files have
been uploaded. e.g. \"2 of 5 files have been uploaded\"\n* $1 - number of files
that have been uploaded\n* $2 - number of files",
"mwe-upwiz-progressbar-uploading": "{{Identical|Uploading}}",
+ "mwe-upwiz-almost-finished": "Used to indicate that the upload process
is almost complete.",
"mwe-upwiz-finished": "Used as success message.\n\nRelated messages:\n*
{{msg-mw|mwe-upwiz-secs-remaining}}\n*
{{msg-mw|mwe-upwiz-mins-secs-remaining}}\n*
{{msg-mw|mwe-upwiz-hrs-mins-secs-remaining}}\n{{Identical|Finished}}",
"mwe-upwiz-secs-remaining": "Used to show overall progress for
uploading. Parameters:\n* $1 - number of
seconds\n{{Related|Mwe-upwiz-remaining}}",
"mwe-upwiz-mins-secs-remaining": "Used to show overall progress for
uploading. Parameters:\n* $1 - number of minutes\n* $2 - number of seconds\n*
$3 - sum of $1 and $2, for usage in PLURAL where
needed\n{{Related|Mwe-upwiz-remaining}}",
diff --git a/resources/mw.GroupProgressBar.js b/resources/mw.GroupProgressBar.js
index ba1fd1d..02dba9b 100644
--- a/resources/mw.GroupProgressBar.js
+++ b/resources/mw.GroupProgressBar.js
@@ -136,7 +136,11 @@
if (t.hours === 0) {
if (t.minutes === 0) {
if (t.seconds === 0) {
- timeString =
mw.message( 'mwe-upwiz-finished' ).escaped();
+ if ( fraction === 1.0 )
{
+ timeString =
mw.message( 'mwe-upwiz-finished' ).escaped();
+ } else {
+ timeString =
mw.message( 'mwe-upwiz-almost-finished' ).escaped();
+ }
} else {
timeString =
mw.message( 'mwe-upwiz-secs-remaining', t.seconds ).escaped();
}
--
To view, visit https://gerrit.wikimedia.org/r/177298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If41718dd8d0399f16ab06627357a0ce238e4f986
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
