Malvineous has submitted this change and it was merged.
Change subject: Tidy up client-side changes
......................................................................
Tidy up client-side changes
Fix some jslint errors
Change-Id: Idd852b35c7770841870d2ed452fe3e0b86490778
---
M MassEditRegex.js
M i18n/en.json
M i18n/qqq.json
3 files changed, 15 insertions(+), 17 deletions(-)
Approvals:
Malvineous: Verified; Looks good to me, approved
diff --git a/MassEditRegex.js b/MassEditRegex.js
index b1f3244..a014e39 100644
--- a/MassEditRegex.js
+++ b/MassEditRegex.js
@@ -227,8 +227,8 @@
if ( page.error || response.error ) {
li.text(page.title + ': ' + page.error
? page.error : response.error);
} else {
- li.text( mw.message(
'masseditregex-js-editpage', response.changes,
- page.title, remaining ).text()
);
+ li.text( mw.message(
'masseditregex-num-changes', page.title,
+ response.changes, remaining
).text() );
}
list.prepend(li);
diff --git a/i18n/en.json b/i18n/en.json
index bb4bd38..ae209fd 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}}",
+ "masseditregex-num-changes": "$1: $2 {{PLURAL:$2|change|changes}} ($3
remaining)",
"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",
@@ -39,15 +39,14 @@
"masseditregex-tooltip-execute": "Apply these changes to each page",
"masseditregex-editall": "Edit all",
"right-masseditregex": "Replace page contents using regular
expressions",
- "masseditregex-noaccess": "User does not have access to edit this page",
- "masseditregex-norevisions": "No revisions found",
- "masseditregex-blocked": "User is blocked",
+ "masseditregex-noaccess": "You do not have access to MassEditRegex",
+ "masseditregex-norevisions": "No revisions found to edit",
+ "masseditregex-blocked": "Your user account is blocked",
"masseditregex-readonlydb": "Database is read-only",
"masseditregex-js-clientside": "Execute in browser",
- "masseditregex-js-execution": "Check this to do execution on client
side, used when many pages causes php max execution time.",
- "masseditregex-js-jobdone": "Job finished",
- "masseditregex-js-editpage": "Replaced $1 occurence(s) on $2, $3 left.",
- "masseditregex-js-working": "Working.. please wait..",
+ "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-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 3fe67d2..90c8241 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",
+ "masseditregex-num-changes": "Parameters:\n* $1 - page title\n* $2 -
number of changes\n$3 - how many pages left to change.",
"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}}.",
@@ -53,10 +53,9 @@
"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-editpage": "text displayed for each page where
replacement has been done:\nParameters:\n* $1 number of occurences\n* $2 page
title\n* $3 how many pages remaining.",
- "masseditregex-js-working": "text displayed in heading when job is in
progress\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",
- "masseditregex-js-mwapi-unknown-error": "error message displayed when
an unknown error occurred during a mediawiki api request",
+ "masseditregex-js-working": "Client-side heading text when job is in
progress\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",
+ "masseditregex-js-mwapi-unknown-error": "Error message displayed when
an unknown error occurred during a mediawiki api request",
}
--
To view, visit https://gerrit.wikimedia.org/r/189187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd852b35c7770841870d2ed452fe3e0b86490778
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
