Malvineous has submitted this change and it was merged.
Change subject: Fix mistake with messages, ensure mediawiki.jqueryMsg gets
pushed to client
......................................................................
Fix mistake with messages, ensure mediawiki.jqueryMsg gets pushed to client
Change-Id: I63e7a1614371651a9291efc7b39aa2d6939b23b5
---
M MassEditRegex.js
M MassEditRegex.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Malvineous: Verified; Looks good to me, approved
diff --git a/MassEditRegex.js b/MassEditRegex.js
index a014e39..ee10670 100644
--- a/MassEditRegex.js
+++ b/MassEditRegex.js
@@ -210,7 +210,7 @@
var content = $( '<div></div>' );
var heading = $( '<h1></h1>' );
content.append( heading );
- heading.text( mw.message( 'masseditregex-js-working' ).text() );
+ heading.text( mw.message( 'masseditregex-js-working', '?'
).text() );
var list = $( '<ul></ul>' );
content.append( list );
@@ -228,7 +228,8 @@
li.text(page.title + ': ' + page.error
? page.error : response.error);
} else {
li.text( mw.message(
'masseditregex-num-changes', page.title,
- response.changes, remaining
).text() );
+ response.changes ).text() );
+ heading.text( mw.message(
'masseditregex-js-working', remaining ).text() );
}
list.prepend(li);
diff --git a/MassEditRegex.php b/MassEditRegex.php
index 42449b6..cd51565 100644
--- a/MassEditRegex.php
+++ b/MassEditRegex.php
@@ -46,6 +46,7 @@
'MassEditRegex.js'
),
'dependencies' => array(
+ 'mediawiki.jqueryMsg',
'jquery.ui.dialog'
),
'group' => 'MassEditRegex',
@@ -54,7 +55,7 @@
'messages' => array (
'masseditregex-js-execution',
'masseditregex-js-jobdone',
- 'masseditregex-js-editpage',
+ 'masseditregex-num-changes',
'masseditregex-js-working',
'masseditregex-js-pagenotexist',
'masseditregex-js-mwapi-api-error',
diff --git a/i18n/en.json b/i18n/en.json
index ae209fd..bcd3ca4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,7 +16,7 @@
"masseditregex-before": "Before",
"masseditregex-after": "After",
"masseditregex-max-preview-diffs": "Preview has been limited to the
first $1 {{PLURAL:$1|match|matches}}.",
- "masseditregex-num-changes": "$1: $2 {{PLURAL:$2|change|changes}} ($3
remaining)",
+ "masseditregex-num-changes": "$1: $2 {{PLURAL:$2|change|changes}}",
"masseditregex-page-not-exists": "$1 does not exist",
"masseditregex-num-articles-changed": "$1 {{PLURAL:$1|page|pages}}
edited",
"masseditregex-view-full-summary": "View full edit summary",
@@ -46,7 +46,7 @@
"masseditregex-js-clientside": "Execute in browser",
"masseditregex-js-execution": "Tick this to perform the page iteration
on the client-side in the browser. This allows larger changes normally limited
by the PHP maximum execution time.",
"masseditregex-js-jobdone": "Complete",
- "masseditregex-js-working": "Processing...",
+ "masseditregex-js-working": "Processing... ($1 left)",
"masseditregex-js-pagenotexist": "$1 does not exist.",
"masseditregex-js-mwapi-api-error": "Error: MediaWiki API returned
error code $1: $2",
"masseditregex-js-mwapi-general-error": "Error: Unknown result from
MediaWiki API.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 90c8241..368e0b5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,7 +22,7 @@
"masseditregex-before": "{{Identical|Before}}",
"masseditregex-after": "{{Identical|After}}",
"masseditregex-max-preview-diffs": "Parameters:\n* $1 - number of
matches (page count limit)",
- "masseditregex-num-changes": "Parameters:\n* $1 - page title\n* $2 -
number of changes\n$3 - how many pages left to change.",
+ "masseditregex-num-changes": "Parameters:\n* $1 - page title\n* $2 -
number of changes",
"masseditregex-page-not-exists": "Used as error message. Parameters:\n*
$1 - page title",
"masseditregex-num-articles-changed": "Followed by a link to
[[Special:Contributions]]. Its link text is
{{msg-mw|Masseditregex-view-full-summary}}.\n\nParameters:\n* $1 - number of
pages",
"masseditregex-view-full-summary": "Used as link text. The link points
to [[Special:Contributions]].\n\nPreceded by the message
{{msg-mw|Masseditregex-num-articles-changed}}.",
@@ -45,7 +45,6 @@
"masseditregex-tooltip-execute": "Used as tooltip for the Submit
button.\n\nSee also:\n* {{msg-mw|Masseditregex-executebtn}} - label for
button\n* {{msg-mw|Accesskey-save}} - access key",
"masseditregex-editall": "Tab displayed on category pages - keep it
short",
"right-masseditregex": "{{doc-right|masseditregex}}"
-
"masseditregex-noaccess": "Error message displayed when user does not
have access to a given page",
"masseditregex-norevisions": "Error message displayed when no revisions
could be found for a given title",
"masseditregex-blocked": "Error message displayed when a user account
is blocked",
@@ -53,7 +52,7 @@
"masseditregex-js-clientside": "Tickbox that when ticked will perform
the page iteration in the browser, sending a request to the server for each
page.",
"masseditregex-js-execution": "Tooltip (HTML title) for
masseditregex-js-clientside tickbox. Provides more space to explain what
'client side/in browser' means.",
"masseditregex-js-jobdone": "Client-side heading text when job is
complete\nSee also:\n* {{msg-mw|Masseditregex-js-working}}",
- "masseditregex-js-working": "Client-side heading text when job is in
progress\nSee also:\n* {{msg-mw|Masseditregex-js-jobdone}}",
+ "masseditregex-js-working": "Client-side heading text when job is in
progress\nParameters:\n* $1 - number of pages left to be edited (counts down
towards zero very quickly)\n\nSee also:\n* {{msg-mw|Masseditregex-js-jobdone}}",
"masseditregex-js-pagenotexist": "Text displayed when page title does
not exist\nParameters:\n* $1 - page title",
"masseditregex-js-mwapi-api-error": "Error message displayed when
mediawiki api call fails\nParameters:\n* $1 - response error code\n* $2 -
response error info",
"masseditregex-js-mwapi-general-error": "Error message displayed when
general error occurred on mediawiki api",
--
To view, visit https://gerrit.wikimedia.org/r/189304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63e7a1614371651a9291efc7b39aa2d6939b23b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassEditRegex
Gerrit-Branch: master
Gerrit-Owner: Malvineous <[email protected]>
Gerrit-Reviewer: Malvineous <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
