Hello Florianschmidtwelzow, D3r1ck01, Addshore, jenkins-bot, Siebrand,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/395647
to review the following change.
Change subject: Revert "Added Internationalization For Some Strings"
......................................................................
Revert "Added Internationalization For Some Strings"
This reverts commit d08205d62c503fd331d6446ac2650ad75c7fd52f.
Change-Id: Iaa249b6196966024a329956f22a8fd348ef53ea1
---
M i18n/en.json
M i18n/qqq.json
M src/MassActionSpecialPage.php
M src/Targets/WikiPage/Actions/AppendAction.php
M src/Targets/WikiPage/Actions/RegexReplaceAction.php
M src/Targets/WikiPage/Matchers/TitleRegexMatcher.php
6 files changed, 9 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassAction
refs/changes/47/395647/1
diff --git a/i18n/en.json b/i18n/en.json
index 2fe10ee..8cc2e6a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,7 +10,6 @@
"massaction-errormessage": "Error: $1",
"massaction-newtask": "New task",
"massaction-viewtask": "View task",
- "massaction-registeredtask": "Task registered and job queued!",
"massactionsavechange": "Save change",
"specialpages-group-MassAction": "MassAction",
"log-name-massaction": "MassAction",
@@ -21,11 +20,5 @@
"massaction-specialpage-matchers-section":"Matchers",
"massaction-specialpage-actions-section":"Actions",
"massaction-target-wikipage-titleregexmatcher-regex-help":"Regex
characters allowed: . * ?",
- "massaction-queued-count": "Queued [[Special:MassAction|mass action]]
jobs",
- "massaction-append-desc": "Appends $1 characters to Page $2",
- "massaction-append-trimmed": "... (trimmed to 25 characters)",
- "massaction-regexreplace-desc": "Performs a regex replace on the
content using the pattern",
- "massaction-titleregexmatcher-desc": "Matches pages with titles
matching regex '$1'",
- "massaction-titleregexmatcher-enabled": "Title Regex Matcher Enabled?",
- "massaction-titleregexmatcher-label": "Title Regex"
+ "massaction-queued-count": "Queued [[Special:MassAction|mass action]]
jobs"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1d20352..a261986 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -12,7 +12,6 @@
"massaction-errormessage": "Error message for special
pages\n{{Identical|Error}}",
"massaction-newtask": "New Task special page title",
"massaction-viewtask": "View Task special page title",
- "massaction-registeredtask": "Message for when a task has been
registered and the corresponding job has been added to the queue for later
completion",
"massactionsavechange": "Save Change special page
title\n{{Identical|Save changes}}",
"specialpages-group-MassAction": "MassAction special page
group\n{{doc-special-group}}",
"log-name-massaction": "Name for the MassAction log type",
@@ -23,11 +22,5 @@
"massaction-specialpage-matchers-section": "Title for the section
containing options for Matchers when creating a new task",
"massaction-specialpage-actions-section": "Title for the section
containing options for Actions when creating a new task\n{{Identical|Action}}",
"massaction-target-wikipage-titleregexmatcher-regex-help": "Help
message for the WikiPage TitleRegexMatcher Regex form entry box",
- "massaction-queued-count": "Text for row on [[Special:Statistics]].",
- "massaction-append-desc": "Description for an action that appends
characters to a page. Parameters:\n* $1 - the amount of characters appended\n*
$2 - a snippet of the page that is being appended to",
- "massaction-append-trimmed": "Message that shows that a snippet of text
has been truncated past 25 characters",
- "massaction-regexreplace-desc": "Description for the action that
replaces the following regex pattern",
- "massaction-titleregexmatcher-desc": "Description for the matcher that
matches the following regex pattern in titles. Parameters:\n* $1 - the regex
pattern that is being matched",
- "massaction-titleregexmatcher-enabled": "Label for whether or not the
matcher for title regex is enabled",
- "massaction-titleregexmatcher-label": "Label for the title regex
matcher"
+ "massaction-queued-count": "Text for row on [[Special:Statistics]]."
}
diff --git a/src/MassActionSpecialPage.php b/src/MassActionSpecialPage.php
index ece1dc1..a49ff5e 100644
--- a/src/MassActionSpecialPage.php
+++ b/src/MassActionSpecialPage.php
@@ -498,7 +498,7 @@
$job = new TargetListJob( Title::newMainPage(), array( 'taskid'
=> $task->getId() ) );
JobQueueGroup::singleton()->push( $job );
- $this->getOutput()->addHTML( '<p>' . wfMessage(
'massaction-registeredtask' )->escaped() . '</p>' );
+ $this->getOutput()->addHTML( '<p>Task registered and job
queued!</p>' );
$link = Linker::specialLink( 'MassAction/View/' .
$task->getId(), 'massaction-viewtask' );
$this->getOutput()->addHTML( '<p>' . $link . '</p>' );
}
diff --git a/src/Targets/WikiPage/Actions/AppendAction.php
b/src/Targets/WikiPage/Actions/AppendAction.php
index e82b7a1..5db2e74 100644
--- a/src/Targets/WikiPage/Actions/AppendAction.php
+++ b/src/Targets/WikiPage/Actions/AppendAction.php
@@ -34,10 +34,10 @@
$length = strlen( $this->text );
$snippet = '"' . substr( $this->text, 0, 25 ) . '"';
if ( $length > 25 ) {
- $snippet = $snippet . wfMessage(
'massaction-append-trimmed' )->escaped();
+ $snippet = $snippet . '... (trimmed to 25 characters)';
}
- return wfMessage( 'massaction-append-desc', $length, $snippet
)->escaped();
+ return 'Appends ' . $length . ' characters to Page ' . $snippet;
}
public function getText() {
diff --git a/src/Targets/WikiPage/Actions/RegexReplaceAction.php
b/src/Targets/WikiPage/Actions/RegexReplaceAction.php
index 315b033..ed02c38 100644
--- a/src/Targets/WikiPage/Actions/RegexReplaceAction.php
+++ b/src/Targets/WikiPage/Actions/RegexReplaceAction.php
@@ -86,8 +86,7 @@
* @return string description of the object
*/
public function getDescription() {
- return wfMessage( 'massaction-regexreplace-desc' )->escaped() .
- ' \'' .
+ return 'Performs a regex replace on the content using the
pattern \'' .
$this->pattern .
'\'' .
' and replacement \'' .
diff --git a/src/Targets/WikiPage/Matchers/TitleRegexMatcher.php
b/src/Targets/WikiPage/Matchers/TitleRegexMatcher.php
index 31ddc20..494d7c1 100644
--- a/src/Targets/WikiPage/Matchers/TitleRegexMatcher.php
+++ b/src/Targets/WikiPage/Matchers/TitleRegexMatcher.php
@@ -78,7 +78,7 @@
* @return string description of the object
*/
public function getDescription() {
- return wfMessage( 'massaction-titleregexmatcher-desc' ,
$this->titleRegex )->escaped();
+ return "Matches pages with titles matches regex '" .
$this->titleRegex . "'";
}
/**
@@ -95,11 +95,11 @@
return array(
'PageMatcherTitleRegexEnabled' => array(
'type' => 'check',
- 'label' =>
'massaction-titleregexmatcher-enabled',
+ 'label' => 'Title Regex Matcher Enabled?',
),
'PageMatcherTitleRegex' => array(
'type' => 'text',
- 'label' => 'massaction-titleregexmatcher-label',
+ 'label' => 'Title Regex',
'help-message' =>
'massaction-target-wikipage-titleregexmatcher-regex-help',
),
);
--
To view, visit https://gerrit.wikimedia.org/r/395647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa249b6196966024a329956f22a8fd348ef53ea1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassAction
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 <chang.ryan10...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: D3r1ck01 <alangider...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
