jenkins-bot has submitted this change and it was merged.
Change subject: Re-sort i18n message keys for clarity; add a comment about TOC
in VisualEditor.php
......................................................................
Re-sort i18n message keys for clarity; add a comment about TOC in
VisualEditor.php
Change-Id: Iad844021077e8c9c2c68dceca55027b7be12e556
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
3 files changed, 23 insertions(+), 21 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index b49ba83..6ada67e 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -219,21 +219,21 @@
// MW core messages
'creating',
'editing',
+ 'parentheses',
+ 'redirectpagesub',
'spamprotectionmatch',
'spamprotectiontext',
'summary-preview',
- 'parentheses',
- 'redirectpagesub',
// Messages needed by VE in init phase only (rest go
below)
- 'visualeditor-loadwarning',
- 'visualeditor-loadwarning-token',
- 'visualeditor-timeout',
'postedit-confirmation-created',
'postedit-confirmation-restored',
'postedit-confirmation-saved',
+ 'visualeditor-loadwarning',
+ 'visualeditor-loadwarning-token',
'visualeditor-savedialog-identify-anon',
'visualeditor-savedialog-identify-user',
+ 'visualeditor-timeout',
),
),
'ext.visualEditor.mobileViewTarget' => $wgVisualEditorResourceTemplate
+ array(
@@ -759,9 +759,9 @@
'visualeditor-mweditmodesource-title',
'visualeditor-mweditmodesource-tool',
'visualeditor-mweditmodesource-warning',
+ 'visualeditor-mweditmodesource-warning-cancel',
'visualeditor-mweditmodesource-warning-switch',
'visualeditor-mweditmodesource-warning-switch-discard',
- 'visualeditor-mweditmodesource-warning-cancel',
'visualeditor-pagemenu-tooltip',
'visualeditor-pagetranslationwarning',
'visualeditor-savedialog-error-badtoken',
@@ -781,17 +781,19 @@
'visualeditor-savedialog-warning-dirty',
'visualeditor-saveerror',
'visualeditor-serializeerror',
+ 'visualeditor-toolbar-cite-label',
'visualeditor-toolbar-format-tooltip',
'visualeditor-toolbar-insert',
'visualeditor-toolbar-savedialog',
'visualeditor-toolbar-style-tooltip',
- 'visualeditor-toolbar-cite-label',
'visualeditor-viewpage-savewarning',
- 'visualeditor-viewpage-savewarning-title',
'visualeditor-viewpage-savewarning-discard',
'visualeditor-viewpage-savewarning-keep',
+ 'visualeditor-viewpage-savewarning-title',
'visualeditor-wikitext-warning-title',
'visualeditor-window-title',
+
+ // Used by the TOC widget (currently experimental)
'toc',
'showtoc',
'hidetoc',
@@ -938,13 +940,13 @@
'messages' => array(
'visualeditor-annotationbutton-linknode-tooltip',
'visualeditor-linkinspector-illegal-title',
+ 'visualeditor-linkinspector-suggest-disambig-page',
'visualeditor-linkinspector-suggest-external-link',
'visualeditor-linkinspector-suggest-matching-page',
- 'visualeditor-linkinspector-suggest-disambig-page',
- 'visualeditor-linkinspector-suggest-redirect-page',
'visualeditor-linkinspector-suggest-new-page',
- 'visualeditor-linknodeinspector-title',
+ 'visualeditor-linkinspector-suggest-redirect-page',
'visualeditor-linknodeinspector-add-label',
+ 'visualeditor-linknodeinspector-title',
),
'targets' => array( 'desktop', 'mobile' ),
),
@@ -1032,10 +1034,10 @@
'visualeditor-dialog-meta-settings-newsectioneditlink-force',
'visualeditor-dialog-meta-settings-newsectioneditlink-label',
'visualeditor-dialog-meta-settings-nocontentconvert-label',
- 'visualeditor-dialog-meta-settings-nogallery-label',
'visualeditor-dialog-meta-settings-noeditsection-help',
'visualeditor-dialog-meta-settings-noeditsection-label',
'visualeditor-dialog-meta-settings-nogallery-help',
+ 'visualeditor-dialog-meta-settings-nogallery-label',
'visualeditor-dialog-meta-settings-notitleconvert-label',
'visualeditor-dialog-meta-settings-redirect-help',
'visualeditor-dialog-meta-settings-redirect-label',
@@ -1239,14 +1241,14 @@
'visualeditor-annotationbutton-language-tooltip',
'visualeditor-dialog-language-auto-direction',
'visualeditor-dialog-language-search-title',
- "visualeditor-languageannotation-description",
- "visualeditor-languageannotation-description-with-dir",
+ 'visualeditor-language-search-input-placeholder',
+ 'visualeditor-languageannotation-description',
+ 'visualeditor-languageannotation-description-with-dir',
'visualeditor-languageinspector-title',
'visualeditor-languageinspector-widget-changelang',
- 'visualeditor-languageinspector-widget-label-language',
- 'visualeditor-languageinspector-widget-label-langcode',
'visualeditor-languageinspector-widget-label-direction',
- 'visualeditor-language-search-input-placeholder',
+ 'visualeditor-languageinspector-widget-label-langcode',
+ 'visualeditor-languageinspector-widget-label-language',
),
'targets' => array( 'desktop', 'mobile' ),
),
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 30d931c..b4033bc 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -187,9 +187,9 @@
"visualeditor-mweditmodesource-title": "Switch to source editing?",
"visualeditor-mweditmodesource-tool": "Switch to source editing",
"visualeditor-mweditmodesource-warning": "You are about to switch to
source editing.\nAny changes you've made to this document can be kept, but you
will not be able switch back to VisualEditor without saving or reloading the
page.\nDo you want to continue?",
+ "visualeditor-mweditmodesource-warning-cancel": "Cancel",
"visualeditor-mweditmodesource-warning-switch": "Keep changes",
"visualeditor-mweditmodesource-warning-switch-discard": "Discard changes",
- "visualeditor-mweditmodesource-warning-cancel": "Cancel",
"visualeditor-mwgalleryinspector-placeholder": "Example.jpg|Caption for
image",
"visualeditor-mwgalleryinspector-title": "Gallery",
"visualeditor-pagemenu-tooltip": "Page options",
@@ -241,9 +241,9 @@
"visualeditor-toolbar-savedialog": "Save page",
"visualeditor-usernamespacepagelink": "Project:User namespace",
"visualeditor-viewpage-savewarning": "Are you sure you want to go back to
view mode without saving first?",
- "visualeditor-viewpage-savewarning-title": "Are you sure?",
"visualeditor-viewpage-savewarning-discard": "Discard edits",
"visualeditor-viewpage-savewarning-keep": "Continue editing",
+ "visualeditor-viewpage-savewarning-title": "Are you sure?",
"visualeditor-wikitext-warning": "You are using VisualEditor -
[[{{MediaWiki:visualeditor-wikitext-warning-link}}|wikitext]] does not work
here. To switch to source editing at any time without losing your changes, open
the dropdown menu next to \"{{int:visualeditor-toolbar-savedialog}}\" and
select \"{{int:visualeditor-mweditmodesource-title}}\".",
"visualeditor-wikitext-warning-link": "Help:Wiki markup",
"visualeditor-wikitext-warning-title": "Wikitext markup detected"
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index f765f95..0ebe6ac 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -196,9 +196,9 @@
"visualeditor-mweditmodesource-title": "Title of dialog to confirm
switching to source mode.",
"visualeditor-mweditmodesource-tool": "Label for tool that changes edit
mode to source editing.",
"visualeditor-mweditmodesource-warning": "Warning message show before
changing edit mode to source editing. It allows the user to keep the changes or
to start source editing from scratch using the message
{{msg-mw|Visualeditor-mweditmodesource-warning-switch}} and
{{msg-mw|Visualeditor-mweditmodesource-warning-switch-discard}}.",
+ "visualeditor-mweditmodesource-warning-cancel": "Label for the cancel
button on the confirmation dialog for switching to source
editing.\n{{Identical|Cancel}}",
"visualeditor-mweditmodesource-warning-switch": "Label for the keep
changes button on the confirmation dialog for switching to source editing.",
"visualeditor-mweditmodesource-warning-switch-discard": "Label for the
discard changes button on the confirmation dialog for switching to source
editing.",
- "visualeditor-mweditmodesource-warning-cancel": "Label for the cancel
button on the confirmation dialog for switching to source
editing.\n{{Identical|Cancel}}",
"visualeditor-mwgalleryinspector-placeholder": "Placeholder text for
the gallery inspector demonstrating how gallery syntax works.",
"visualeditor-mwgalleryinspector-title": "Used as title for the gallery
inspector.\n{{Identical|Gallery}}",
"visualeditor-pagemenu-tooltip": "Tooltip text for the page menu which
has the following items:\n* {{msg-mw|visualeditor-meta-tool}}\n*
{{msg-mw|visualeditor-settings-tool}}\n*
{{msg-mw|visualeditor-advancedsettings-tool}}\n*
{{msg-mw|visualeditor-categories-tool}}\n*
{{msg-mw|visualeditor-languages-tool}}\n*
{{msg-mw|visualeditor-mweditmodesource-title}}\n*
{{msg-mw|visualeditor-dialog-command-help-title}}",
@@ -250,9 +250,9 @@
"visualeditor-toolbar-savedialog": "Label text for button to open save
dialog.\n\nUsed in:\n*
{{msg-mw|Guidedtour-tour-gettingstartedtasktoolbarve-click-save-description}}.\n{{Identical|Save
page}}",
"visualeditor-usernamespacepagelink": "Name of a page describing the
user namespace (NS2) in this project.\n{{doc-important|Do not translate
\"Project\"; it is automatically converted to the wiki's project namespace.}}",
"visualeditor-viewpage-savewarning": "Text shown when the user tries to
leave the editor without saving their changes.\n\nFollowed by the following
buttons:\n* {{msg-mw|Visualeditor-viewpage-savewarning-discard}}\n*
{{msg-mw|Visualeditor-viewpage-savewarning-keep}}",
- "visualeditor-viewpage-savewarning-title": "Title of the dialog shown
when the user tries to leave the editor without saving their
changes.\n\nFollowed by the following buttons:\n*
{{msg-mw|Visualeditor-viewpage-savewarning-discard}}\n*
{{msg-mw|Visualeditor-viewpage-savewarning-keep}}",
"visualeditor-viewpage-savewarning-discard": "Text shown on the button
which closes VE and discards changes when the user confirms that they want to
leave the editor.\n\nPreceded by the prompt
{{msg-mw|Visualeditor-viewpage-savewarning}}.\n\nFollowed by the button
{{msg-mw|Visualeditor-viewpage-savewarning-keep}}.",
"visualeditor-viewpage-savewarning-keep": "Text shown on the button
which does not do anything when the user decides that they do not want to leave
the editor.\n\nPreceded by the button
{{msg-mw|Visualeditor-viewpage-savewarning-discard}}.",
+ "visualeditor-viewpage-savewarning-title": "Title of the dialog shown
when the user tries to leave the editor without saving their
changes.\n\nFollowed by the following buttons:\n*
{{msg-mw|Visualeditor-viewpage-savewarning-discard}}\n*
{{msg-mw|Visualeditor-viewpage-savewarning-keep}}",
"visualeditor-wikitext-warning": "Contents of notification displayed
when Wikitext has been detected.\n\nRefers to:\n*
{{msg-mw|Visualeditor-wikitext-warning-link}}\n*
{{msg-mw|Visualeditor-toolbar-cancel}}\n*
{{msg-mw|Visualeditor-mweditmodesource-title}}\nSee also:\n*
{{msg-mw|Visualeditor-beta-warning}}",
"visualeditor-wikitext-warning-link": "Link to page describing what
Wikitext is.\n\nUsed in:\n* {{msg-mw|Visualeditor-wikitext-warning}}.",
"visualeditor-wikitext-warning-title": "Title of notification displayed
when Wikitext has been detected"
--
To view, visit https://gerrit.wikimedia.org/r/159114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad844021077e8c9c2c68dceca55027b7be12e556
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Alex Monk <[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
