jenkins-bot has submitted this change and it was merged.
Change subject: Remove non-working {{#special:mypage}} from help
......................................................................
Remove non-working {{#special:mypage}} from help
Bug: T44107
Change-Id: Iff987eddfb1fbe6a6ce1c88795b9dc1fd5b47f9e
---
M i18n/en.json
M i18n/qqq.json
M modules/jquery.wikiEditor.toolbar.config.js
3 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
He7d3r: Looks good to me, but someone else must approve
Krinkle: Looks good to me, approved
Fomafix: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 0697fc1..6a10d88 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -200,10 +200,10 @@
"wikieditor-toolbar-help-content-showreferences-result": "<ol
class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b>
<a rel='nofollow' title='http://www.example.org' class='external text'
href='#'>Link text</a>, additional text.</li><li id='cite_note-test-1'><b><a
title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org'
class='external text' href='#'>Link text</a></li></ol>",
"wikieditor-toolbar-help-content-signaturetimestamp-description":
"Signature with timestamp",
"wikieditor-toolbar-help-content-signaturetimestamp-syntax": "--~~~~",
- "wikieditor-toolbar-help-content-signaturetimestamp-result": "--<a
href='#' title='{{#special:mypage}}'>Username</a> (<a href='#'
title='{{#special:mytalk}}'>talk</a>) 15:54, 10 June 2009 (UTC)",
+ "wikieditor-toolbar-help-content-signaturetimestamp-result": "--<a
href='#' title='$1:Username'>Username</a> (<a href='#'
title='$2:Username'>talk</a>) 15:54, 10 June 2009 (UTC)",
"wikieditor-toolbar-help-content-signature-description": "Signature",
"wikieditor-toolbar-help-content-signature-syntax": "~~~",
- "wikieditor-toolbar-help-content-signature-result": "<a href='#'
title='{{#special:mypage}}'>Username</a> (<a href='#'
title='{{#special:mytalk}}'>talk</a>)",
+ "wikieditor-toolbar-help-content-signature-result": "<a href='#'
title='$1:Username'>Username</a> (<a href='#' title='$2:Username'>talk</a>)",
"wikieditor-toolbar-help-content-indent-description": "Indent",
"wikieditor-toolbar-help-content-indent-syntax": "Normal text<br
/>:Indented text<br />::Indented text",
"wikieditor-toolbar-help-content-indent-result": "Normal
text<dl><dd>Indented text<dl><dd>Indented text</dd></dl></dd></dl>"
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8734cbf..1c82984 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -223,10 +223,10 @@
"wikieditor-toolbar-help-content-showreferences-result": "For the
<code><nowiki><li></nowiki></code> tag's <code>id</code> attribute, non-ASCII
characters are URL-encoded as follows: a period (<code>.</code>) followed by a
capital hexadecimal code. For example, <code><nowiki><ref
name=\"thử\"></nowiki></code> produces <code><nowiki><li
id=\"cite_note-th.E1.BB.AD-0\"></nowiki></code>.\n\nwww.example.org is not a
real website, but it has been reserved to use in software documentation. If you
translate the word example and try to go to that web address then you might get
a message that it doesn't exist. But somebody may have created a commercial web
page for that address, such as www.Beispiel.org, using the German word for
example. It is therefore recommended that you do not translate
http://www.example.org at all. If you do wish to translate it you should first
check where the translated link takes you.",
"wikieditor-toolbar-help-content-signaturetimestamp-description":
"{{Identical|Signature with timestamp}}",
"wikieditor-toolbar-help-content-signaturetimestamp-syntax":
"{{notranslate}}",
- "wikieditor-toolbar-help-content-signaturetimestamp-result": "Html
example used in the help section \"discussion\" of the toolbar",
+ "wikieditor-toolbar-help-content-signaturetimestamp-result": "Html
example used in the help section \"discussion\" of the
toolbar.\n\nParameters:\n* $1 - The \"User\" namespace name\n* $2 - The \nUser
talk\" namespace name",
"wikieditor-toolbar-help-content-signature-description":
"{{Identical|Signature}}",
"wikieditor-toolbar-help-content-signature-syntax": "{{notranslate}}",
- "wikieditor-toolbar-help-content-signature-result": "Html example used
in the help section \"discussion\" of the toolbar",
+ "wikieditor-toolbar-help-content-signature-result": "Html example used
in the help section \"discussion\" of the toolbar.\n\nParameters:\n* $1 - The
\"User\" namespace name\n* $2 - The \nUser talk\" namespace name",
"wikieditor-toolbar-help-content-indent-description":
"{{Identical|Indent}}",
"wikieditor-toolbar-help-content-indent-syntax": "Syntax example used
in the help section \"discussion\" of the toolbar",
"wikieditor-toolbar-help-content-indent-result": "Html example used in
the help section \"discussion\" of the toolbar"
diff --git a/modules/jquery.wikiEditor.toolbar.config.js
b/modules/jquery.wikiEditor.toolbar.config.js
index fd4e5d0..2796a1c 100644
--- a/modules/jquery.wikiEditor.toolbar.config.js
+++ b/modules/jquery.wikiEditor.toolbar.config.js
@@ -763,12 +763,19 @@
htmlMsg: 'wikieditor-toolbar-help-content-signaturetimestamp-description'
},
syntax:
{ htmlMsg: 'wikieditor-toolbar-help-content-signaturetimestamp-syntax' },
- result:
{ htmlMsg: 'wikieditor-toolbar-help-content-signaturetimestamp-result' }
+ result:
{ htmlMsg: [ 'wikieditor-toolbar-help-content-signaturetimestamp-result',
+
mw.config.get( 'wgFormattedNamespaces' )[ 2 ],
+
mw.config.get( 'wgFormattedNamespaces' )[ 3 ]
+ ] }
},
{
description: { htmlMsg: 'wikieditor-toolbar-help-content-signature-description'
},
syntax:
{ htmlMsg: 'wikieditor-toolbar-help-content-signature-syntax' },
- result:
{ htmlMsg: 'wikieditor-toolbar-help-content-signature-result' }
+ result:
{ htmlMsg: [
+
'wikieditor-toolbar-help-content-signature-result',
+
mw.config.get( 'wgFormattedNamespaces' )[ 2 ],
+
mw.config.get( 'wgFormattedNamespaces' )[ 3 ]
+ ] }
},
{
description: { htmlMsg: 'wikieditor-toolbar-help-content-indent-description' },
--
To view, visit https://gerrit.wikimedia.org/r/260952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff987eddfb1fbe6a6ce1c88795b9dc1fd5b47f9e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: He7d3r <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
