jenkins-bot has submitted this change and it was merged.
Change subject: Allow the signature wikitext to be overridden locally
......................................................................
Allow the signature wikitext to be overridden locally
Bug: T26191
Depends-On: I33de58e9729a51ae73a13853ffcfcbb2d2305111
Change-Id: I43f5bbaee007bbd038f2e118b3ffb8690753afb8
---
M WikiEditor.hooks.php
M modules/jquery.wikiEditor.toolbar.config.js
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, but someone else must approve
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikiEditor.hooks.php b/WikiEditor.hooks.php
index b9c4660..6673d58 100644
--- a/WikiEditor.hooks.php
+++ b/WikiEditor.hooks.php
@@ -312,6 +312,8 @@
// expose magic words for use by the wikieditor toolbar
WikiEditorHooks::getMagicWords( $vars );
+ $vars['mw.msg.wikieditor'] = wfMessage( 'sig-text', '~~~~'
)->inContentLanguage()->text();
+
return true;
}
diff --git a/modules/jquery.wikiEditor.toolbar.config.js
b/modules/jquery.wikiEditor.toolbar.config.js
index d42f86e..933402c 100644
--- a/modules/jquery.wikiEditor.toolbar.config.js
+++ b/modules/jquery.wikiEditor.toolbar.config.js
@@ -195,7 +195,7 @@
action:
{
type: 'encapsulate',
options: {
-
pre: '--~~~~'
+
pre: mw.config.get( 'mw.msg.wikieditor' )
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/258783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43f5bbaee007bbd038f2e118b3ffb8690753afb8
Gerrit-PatchSet: 21
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: GOIII <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
