D3r1ck01 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405729 )
Change subject: Add support for use of JavaScript Messages API
......................................................................
Add support for use of JavaScript Messages API
Make i18n messages to use mw.message() rather than raw
html.
Also, updated the minus-x version to 0.3.0.
Bug: T154891
Change-Id: I12e5dc03396fa8bed9beb362ae91a77e64646113
---
M composer.json
M modules/jquery.wikiEditor.toolbar.config.js
2 files changed, 53 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/29/405729/1
diff --git a/composer.json b/composer.json
index 0490e22..0ed9675 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "15.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/minus-x": "0.2.1"
+ "mediawiki/minus-x": "0.3.0"
},
"scripts": {
"test": [
diff --git a/modules/jquery.wikiEditor.toolbar.config.js
b/modules/jquery.wikiEditor.toolbar.config.js
index 51ab111..45b8574 100644
--- a/modules/jquery.wikiEditor.toolbar.config.js
+++ b/modules/jquery.wikiEditor.toolbar.config.js
@@ -17,7 +17,7 @@
format: {
tools: {
bold: {
-
labelMsg: 'wikieditor-toolbar-tool-bold',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-bold' ).text(),
type: 'button',
offset: {
'default': [ 2, -574 ],
@@ -75,7 +75,7 @@
section: 'main',
group: 'format',
id: 'italic',
-
labelMsg: 'wikieditor-toolbar-tool-italic',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-italic' ).text(),
type: 'button',
offset: {
'default': [ 2, -718 ],
@@ -135,7 +135,7 @@
insert: {
tools: {
xlink: {
-
labelMsg: 'wikieditor-toolbar-tool-xlink',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-xlink' ).text(),
type: 'button',
icon: 'insert-xlink.png',
offset: [ -70, 2 ],
@@ -143,13 +143,13 @@
type: 'encapsulate',
options: {
pre: '[',
-
periMsg: 'wikieditor-toolbar-tool-xlink-example',
+
periMsg: mw.message( 'wikieditor-toolbar-tool-xlink-example'
).text(),
post: ']'
}
}
},
ilink: {
-
labelMsg: 'wikieditor-toolbar-tool-ilink',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-ilink' ).text(),
type: 'button',
icon: 'insert-ilink.png',
offset: [ 2, -1582 ],
@@ -157,13 +157,13 @@
type: 'encapsulate',
options: {
pre: '[[',
-
periMsg: 'wikieditor-toolbar-tool-ilink-example',
+
periMsg: mw.message( 'wikieditor-toolbar-tool-ilink-example'
).text(),
post: ']]'
}
}
},
file: {
-
labelMsg: 'wikieditor-toolbar-tool-file',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-file' ).text(),
type: 'button',
icon: 'insert-file.png',
offset: [ 2, -1438 ],
@@ -177,7 +177,7 @@
}
},
reference: {
-
labelMsg: 'wikieditor-toolbar-tool-reference',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-reference' ).text(),
filters: [ 'body.ns-subject' ],
type: 'button',
offset: [ 2, -1798 ],
@@ -186,13 +186,13 @@
type: 'encapsulate',
options: {
pre: '<ref>',
-
periMsg: 'wikieditor-toolbar-tool-reference-example',
+
periMsg: mw.message(
'wikieditor-toolbar-tool-reference-example' ).escaped(),
post: '</ref>'
}
}
},
signature: {
-
labelMsg: 'wikieditor-toolbar-tool-signature',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-signature' ).text(),
type: 'button',
offset: [ 2, -1870 ],
icon: 'insert-signature.png',
@@ -209,22 +209,22 @@
},
// Format section
advanced: {
- labelMsg:
'wikieditor-toolbar-section-advanced',
+ labelMsg: mw.message(
'wikieditor-toolbar-section-advanced' ).text(),
type: 'toolbar',
groups: {
heading: {
tools: {
heading: {
-
labelMsg: 'wikieditor-toolbar-tool-heading',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-heading' ).text(),
type: 'select',
list: {
'heading-2': {
-
labelMsg: 'wikieditor-toolbar-tool-heading-2',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-heading-2'
).text(),
action: {
type: 'encapsulate',
options: {
pre: '== ',
-
periMsg:
'wikieditor-toolbar-tool-heading-example',
+
periMsg: mw.message(
'wikieditor-toolbar-tool-heading-example' ).parse(),
post: ' ==',
regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
regexReplace: '$1==$3==$4',
@@ -233,12 +233,12 @@
}
},
'heading-3': {
-
labelMsg: 'wikieditor-toolbar-tool-heading-3',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-heading-3'
).text(),
action: {
type: 'encapsulate',
options: {
pre: '=== ',
-
periMsg:
'wikieditor-toolbar-tool-heading-example',
+
periMsg: mw.message(
'wikieditor-toolbar-tool-heading-example' ).parse(),
post: ' ===',
regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
regexReplace: '$1===$3===$4',
@@ -247,12 +247,12 @@
}
},
'heading-4': {
-
labelMsg: 'wikieditor-toolbar-tool-heading-4',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-heading-4'
).text(),
action: {
type: 'encapsulate',
options: {
pre: '==== ',
-
periMsg:
'wikieditor-toolbar-tool-heading-example',
+
periMsg: mw.message(
'wikieditor-toolbar-tool-heading-example' ).text(),
post: ' ====',
regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
regexReplace: '$1====$3====$4',
@@ -261,12 +261,12 @@
}
},
'heading-5': {
-
labelMsg: 'wikieditor-toolbar-tool-heading-5',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-heading-5'
).text(),
action: {
type: 'encapsulate',
options: {
pre: '===== ',
-
periMsg:
'wikieditor-toolbar-tool-heading-example',
+
periMsg: mw.message(
'wikieditor-toolbar-tool-heading-example' ).parse(),
post: ' =====',
regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
regexReplace: '$1=====$3=====$4',
@@ -279,10 +279,10 @@
}
},
format: {
- labelMsg:
'wikieditor-toolbar-group-format',
+ labelMsg:
mw.message( 'wikieditor-toolbar-group-format' ).text(),
tools: {
ulist: {
-
labelMsg: 'wikieditor-toolbar-tool-ulist',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-ulist' ).text(),
type: 'button',
icon: {
'default': 'format-ulist.png',
@@ -296,7 +296,7 @@
type: 'encapsulate',
options: {
pre: '* ',
-
periMsg: 'wikieditor-toolbar-tool-ulist-example',
+
periMsg: mw.message( 'wikieditor-toolbar-tool-ulist-example'
).parse(),
post: '',
ownline: true,
splitlines: true
@@ -304,7 +304,7 @@
}
},
olist: {
-
labelMsg: 'wikieditor-toolbar-tool-olist',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-olist' ).text(),
type: 'button',
icon: {
'default': 'format-olist.png',
@@ -318,7 +318,7 @@
type: 'encapsulate',
options: {
pre: '# ',
-
periMsg: 'wikieditor-toolbar-tool-olist-example',
+
periMsg: mw.message( 'wikieditor-toolbar-tool-olist-example'
).parse(),
post: '',
ownline: true,
splitlines: true
@@ -326,7 +326,7 @@
}
},
nowiki:
{
-
labelMsg: 'wikieditor-toolbar-tool-nowiki',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-nowiki' ).text(),
type: 'button',
icon: 'insert-nowiki.png',
offset: [ -70, -70 ],
@@ -334,13 +334,13 @@
type: 'encapsulate',
options: {
pre: '<nowiki>',
-
periMsg: 'wikieditor-toolbar-tool-nowiki-example',
+
periMsg: mw.message( 'wikieditor-toolbar-tool-nowiki-example'
).escaped(),
post: '</nowiki>'
}
}
},
newline: {
-
labelMsg: 'wikieditor-toolbar-tool-newline',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-newline' ).text(),
type: 'button',
icon: 'insert-newline.png',
offset: [ 2, -1726 ],
@@ -356,7 +356,7 @@
size: {
tools: {
big: {
-
labelMsg: 'wikieditor-toolbar-tool-big',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-big' ).text(),
type: 'button',
icon: 'format-big.png',
offset: [ 2, 2 ],
@@ -364,13 +364,13 @@
type: 'encapsulate',
options: {
pre: '<big>',
-
periMsg: 'wikieditor-toolbar-tool-big-example',
+
periMsg: mw.message( 'wikieditor-toolbar-tool-big-example'
).escaped(),
post: '</big>'
}
}
},
small: {
-
labelMsg: 'wikieditor-toolbar-tool-small',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-small' ).text(),
type: 'button',
icon: 'format-small.png',
offset: [ 2, -1150 ],
@@ -378,13 +378,13 @@
type: 'encapsulate',
options: {
pre: '<small>',
-
periMsg: 'wikieditor-toolbar-tool-small-example',
+
periMsg: mw.message( 'wikieditor-toolbar-tool-small-example'
).escaped(),
post: '</small>'
}
}
},
superscript: {
-
labelMsg: 'wikieditor-toolbar-tool-superscript',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-superscript' ).text(),
type: 'button',
icon: 'format-superscript.png',
offset: [ 2, -1294 ],
@@ -392,13 +392,13 @@
type: 'encapsulate',
options: {
pre: '<sup>',
-
periMsg: 'wikieditor-toolbar-tool-superscript-example',
+
periMsg: mw.message(
'wikieditor-toolbar-tool-superscript-example' ).escaped(),
post: '</sup>'
}
}
},
subscript: {
-
labelMsg: 'wikieditor-toolbar-tool-subscript',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-subscript' ).text(),
type: 'button',
icon: 'format-subscript.png',
offset: [ 2, -1222 ],
@@ -406,7 +406,7 @@
type: 'encapsulate',
options: {
pre: '<sub>',
-
periMsg: 'wikieditor-toolbar-tool-subscript-example',
+
periMsg: mw.message(
'wikieditor-toolbar-tool-subscript-example' ).escaped(),
post: '</sub>'
}
}
@@ -414,10 +414,10 @@
}
},
insert: {
- labelMsg:
'wikieditor-toolbar-group-insert',
+ labelMsg:
mw.message( 'wikieditor-toolbar-group-insert' ).text(),
tools: {
gallery: {
-
labelMsg: 'wikieditor-toolbar-tool-gallery',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-gallery' ).text(),
type: 'button',
icon: 'insert-gallery.png',
offset: [ 2, -1510 ],
@@ -426,7 +426,7 @@
options: {
pre: '<gallery>\n',
periMsg: [
-
'wikieditor-toolbar-tool-gallery-example',
+
mw.message( 'wikieditor-toolbar-tool-gallery-example'
).escaped(),
fileNamespace
],
post: '\n</gallery>',
@@ -435,7 +435,7 @@
}
},
table: {
-
labelMsg: 'wikieditor-toolbar-tool-table',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-table' ).text(),
type: 'button',
icon: 'insert-table.png',
offset: [ 2, -1942 ],
@@ -444,14 +444,14 @@
type: 'encapsulate',
options: {
pre: '{| class="wikitable" border="1"\n|',
-
periMsg: 'wikieditor-toolbar-tool-table-example-old',
+
periMsg: mw.message(
'wikieditor-toolbar-tool-table-example-old' ).parse(),
post: '\n|}',
ownline: true
}
}
},
redirect: {
-
labelMsg: 'wikieditor-toolbar-tool-redirect',
+
labelMsg: mw.message( 'wikieditor-toolbar-tool-redirect' ).text(),
type: 'button',
icon: {
'default': 'insert-redirect.png',
@@ -465,7 +465,7 @@
type: 'encapsulate',
options: {
pre: mw.config.get( 'wgWikiEditorMagicWords' ).redirect + ' [[',
-
periMsg: 'wikieditor-toolbar-tool-redirect-example',
+
periMsg: mw.message( 'wikieditor-toolbar-tool-redirect-example'
).parse(),
post: ']]',
ownline: true
}
@@ -476,7 +476,7 @@
}
},
characters: {
- labelMsg:
'wikieditor-toolbar-section-characters',
+ labelMsg: mw.message(
'wikieditor-toolbar-section-characters' ).text(),
type: 'booklet',
deferLoad: true,
pages: {
@@ -602,12 +602,12 @@
}
},
help: {
- labelMsg:
'wikieditor-toolbar-section-help',
+ labelMsg: mw.message(
'wikieditor-toolbar-section-help' ).text(),
type: 'booklet',
deferLoad: true,
pages: {
format: {
- labelMsg:
'wikieditor-toolbar-help-page-format',
+ labelMsg:
mw.message( 'wikieditor-toolbar-help-page-format' ).text(),
layout: 'table',
headings: [
{
textMsg: 'wikieditor-toolbar-help-heading-description' },
@@ -633,7 +633,7 @@
]
},
link: {
- labelMsg:
'wikieditor-toolbar-help-page-link',
+ labelMsg:
mw.message( 'wikieditor-toolbar-help-page-link' ).text(),
layout: 'table',
headings: [
{
textMsg: 'wikieditor-toolbar-help-heading-description' },
@@ -654,7 +654,7 @@
]
},
heading: {
- labelMsg:
'wikieditor-toolbar-help-page-heading',
+ labelMsg:
mw.message( 'wikieditor-toolbar-help-page-heading' ).text(),
layout: 'table',
headings: [
{
textMsg: 'wikieditor-toolbar-help-heading-description' },
@@ -685,7 +685,7 @@
]
},
list: {
- labelMsg:
'wikieditor-toolbar-help-page-list',
+ labelMsg:
mw.message( 'wikieditor-toolbar-help-page-list' ).text(),
layout: 'table',
headings: [
{
textMsg: 'wikieditor-toolbar-help-heading-description' },
@@ -706,7 +706,7 @@
]
},
file: {
- labelMsg:
'wikieditor-toolbar-help-page-file',
+ labelMsg:
mw.message( 'wikieditor-toolbar-help-page-file' ).text(),
layout: 'table',
headings: [
{
textMsg: 'wikieditor-toolbar-help-heading-description' },
@@ -735,7 +735,7 @@
]
},
reference: {
- labelMsg:
'wikieditor-toolbar-help-page-reference',
+ labelMsg:
mw.message( 'wikieditor-toolbar-help-page-reference' ).text(),
layout: 'table',
headings: [
{
textMsg: 'wikieditor-toolbar-help-heading-description' },
@@ -766,7 +766,7 @@
]
},
discussion: {
- labelMsg:
'wikieditor-toolbar-help-page-discussion',
+ labelMsg:
mw.message( 'wikieditor-toolbar-help-page-discussion' ).text(),
layout: 'table',
headings: [
{
textMsg: 'wikieditor-toolbar-help-heading-description' },
--
To view, visit https://gerrit.wikimedia.org/r/405729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12e5dc03396fa8bed9beb362ae91a77e64646113
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 <alangider...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
