From 712ea472d34371176bb08b79c723374fa6800dd6 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Sun, 14 Sep 2014 18:18:03 -0700 Subject: [PATCH] Add contextual help to all remaining meta dialog controls Bug: 51798 Change-Id: I3f8141485c89e585595dbb853d32e69cbcaebac6 --- VisualEditor.php | 6 ++++++ modules/ve-mw/i18n/en-gb.json | 2 ++ modules/ve-mw/i18n/en.json | 6 ++++++ modules/ve-mw/i18n/qqq.json | 6 ++++++ .../ui/pages/ve.ui.MWAdvancedSettingsPage.js | 15 ++++++++++----- modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js | 3 ++- 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/VisualEditor.php b/VisualEditor.php index f973b3f3fd..2aea2c7061 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -998,6 +998,7 @@ $wgResourceModules += array( 'visualeditor-dialog-meta-advancedsettings-section', 'visualeditor-dialog-meta-categories-category', 'visualeditor-dialog-meta-categories-data-label', + 'visualeditor-dialog-meta-categories-defaultsort-help', 'visualeditor-dialog-meta-categories-defaultsort-label', 'visualeditor-dialog-meta-categories-hidden', 'visualeditor-dialog-meta-categories-input-hiddencategorieslabel', @@ -1016,22 +1017,27 @@ $wgResourceModules += array( 'visualeditor-dialog-meta-languages-section', 'visualeditor-dialog-meta-settings-displaytitle', 'visualeditor-dialog-meta-settings-displaytitle-enable', + 'visualeditor-dialog-meta-settings-displaytitle-help', 'visualeditor-dialog-meta-settings-hiddencat-help', 'visualeditor-dialog-meta-settings-hiddencat-label', 'visualeditor-dialog-meta-settings-index-default', 'visualeditor-dialog-meta-settings-index-disable', 'visualeditor-dialog-meta-settings-index-force', + 'visualeditor-dialog-meta-settings-index-help', 'visualeditor-dialog-meta-settings-index-label', 'visualeditor-dialog-meta-settings-label', 'visualeditor-dialog-meta-settings-newsectioneditlink-default', 'visualeditor-dialog-meta-settings-newsectioneditlink-disable', 'visualeditor-dialog-meta-settings-newsectioneditlink-force', + 'visualeditor-dialog-meta-settings-newsectioneditlink-help', 'visualeditor-dialog-meta-settings-newsectioneditlink-label', + 'visualeditor-dialog-meta-settings-nocontentconvert-help', 'visualeditor-dialog-meta-settings-nocontentconvert-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-help', 'visualeditor-dialog-meta-settings-notitleconvert-label', 'visualeditor-dialog-meta-settings-redirect-help', 'visualeditor-dialog-meta-settings-redirect-label', diff --git a/modules/ve-mw/i18n/en-gb.json b/modules/ve-mw/i18n/en-gb.json index 681a3bc2e7..006f4e87b2 100644 --- a/modules/ve-mw/i18n/en-gb.json +++ b/modules/ve-mw/i18n/en-gb.json @@ -7,5 +7,7 @@ ] }, "visualeditor-dialog-media-position-center": "Centre", + "visualeditor-dialog-meta-categories-defaultsort-help": "You can over-ride how this page is sorted when displayed within a category by setting a different index to sort with instead. This is often used to make pages about people show by last name, but be named with their first name shown first.", + "visualeditor-dialog-meta-settings-displaytitle-help": "You can over-ride how this page's title is displayed by setting a different label to show instead.", "visualeditor-loadwarning-token": "Error loading edit token from server: $1. Would you like to try again?" } diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json index 9c671ebd3e..2a365bba72 100644 --- a/modules/ve-mw/i18n/en.json +++ b/modules/ve-mw/i18n/en.json @@ -74,6 +74,7 @@ "visualeditor-dialog-meta-advancedsettings-section": "Advanced settings", "visualeditor-dialog-meta-categories-category": "Category", "visualeditor-dialog-meta-categories-data-label": "Categories", + "visualeditor-dialog-meta-categories-defaultsort-help": "You can override how this page is sorted when displayed within a category by setting a different index to sort with instead. This is often used to make pages about people show by last name, but be named with their first name shown first.", "visualeditor-dialog-meta-categories-defaultsort-label": "Sort this page by default as", "visualeditor-dialog-meta-categories-hidden": "This category is set not to show on pages to which it is added.", "visualeditor-dialog-meta-categories-input-hiddencategorieslabel": "Hidden categories", @@ -92,22 +93,27 @@ "visualeditor-dialog-meta-languages-section": "Languages", "visualeditor-dialog-meta-settings-displaytitle": "Display title", "visualeditor-dialog-meta-settings-displaytitle-enable": "Enable display title", + "visualeditor-dialog-meta-settings-displaytitle-help": "You can override how this page's title is displayed by setting a different label to show instead.", "visualeditor-dialog-meta-settings-hiddencat-help": "You can prevent this category from showing up in the list of categories on member pages. This is useful for categories that are of interest to editors but not most readers, like pages which need an illustration.", "visualeditor-dialog-meta-settings-hiddencat-label": "Hidden category", "visualeditor-dialog-meta-settings-index-default": "Default", "visualeditor-dialog-meta-settings-index-disable": "No", "visualeditor-dialog-meta-settings-index-force": "Yes", + "visualeditor-dialog-meta-settings-index-help": "You can force search engines to list this page in their relevant results, or force them to not do so.", "visualeditor-dialog-meta-settings-index-label": "Let this page be indexed by search engines", "visualeditor-dialog-meta-settings-label": "Page settings", "visualeditor-dialog-meta-settings-newsectioneditlink-default": "Default", "visualeditor-dialog-meta-settings-newsectioneditlink-disable": "No", "visualeditor-dialog-meta-settings-newsectioneditlink-force": "Yes", + "visualeditor-dialog-meta-settings-newsectioneditlink-help": "You can force the display of an extra tab besides the \"{{int:vector-view-edit}}\" tab on this page which will make it easy to add a new section, or force it to not appear if it otherwise would.", "visualeditor-dialog-meta-settings-newsectioneditlink-label": "Show a tab on this page to add a new section", + "visualeditor-dialog-meta-settings-nocontentconvert-help": "You can prevent this page's contents being automatically converted into other scripts.", "visualeditor-dialog-meta-settings-nocontentconvert-label": "Don't convert content between language variants", "visualeditor-dialog-meta-settings-noeditsection-help": "You can stop the edit links from appearing next to each section in the unusual case where that is appropriate.", "visualeditor-dialog-meta-settings-noeditsection-label": "Disable the edit links next to each heading on this page.", "visualeditor-dialog-meta-settings-nogallery-help": "You can prevent this category from displaying member files as a gallery, if that is inappropriate in this case.", "visualeditor-dialog-meta-settings-nogallery-label": "Disable gallery", + "visualeditor-dialog-meta-settings-notitleconvert-help": "You can prevent this page's title being automatically converted into other scripts.", "visualeditor-dialog-meta-settings-notitleconvert-label": "Don't convert title between language variants", "visualeditor-dialog-meta-settings-redirect-help": "You can make this page into a redirect, a page which will automatically take readers to another page on this wiki. This is useful for mis-spellings and alternative names or concepts. If you do so, readers will not see the contents of this page.", "visualeditor-dialog-meta-settings-redirect-label": "Redirect this page to", diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json index fa36f3d39d..4ff819e4bf 100644 --- a/modules/ve-mw/i18n/qqq.json +++ b/modules/ve-mw/i18n/qqq.json @@ -83,6 +83,7 @@ "visualeditor-dialog-meta-advancedsettings-section": "Label for the advanced settings dialog section.\n{{Identical|Advanced settings}}", "visualeditor-dialog-meta-categories-category": "Title of popup for editing category options.\n{{Identical|Category}}", "visualeditor-dialog-meta-categories-data-label": "Label for the categories sub-section.\n{{Identical|Category}}", + "visualeditor-dialog-meta-categories-defaultsort-help": "Message displayed as contextual help about the {{DEFAULTSORT:…}} control to editors in the page categories panel.", "visualeditor-dialog-meta-categories-defaultsort-label": "Label for field setting the category default sort", "visualeditor-dialog-meta-categories-hidden": "Text shown on the category popup if the category is hidden", "visualeditor-dialog-meta-categories-input-hiddencategorieslabel": "{{Identical|Hidden category}}", @@ -101,22 +102,27 @@ "visualeditor-dialog-meta-languages-section": "Label for the language links dialog section.\n{{Identical|Language}}", "visualeditor-dialog-meta-settings-displaytitle": "Label for the text box in which the user can set what the title of the page should be displayed as.", "visualeditor-dialog-meta-settings-displaytitle-enable": "Label for the checkbox to enable the use of the display title text box.", + "visualeditor-dialog-meta-settings-displaytitle-help": "Message displayed as contextual help about the {{DISPLAYTITLE:…}} control to editors in the advanced page settings panel.", "visualeditor-dialog-meta-settings-hiddencat-help": "Message displayed as contextual help about the __HIDDENCAT__ tag to editors in the page settings panel on categories.", "visualeditor-dialog-meta-settings-hiddencat-label": "Prompt for the checkbox to let the user hide this category from pages.", "visualeditor-dialog-meta-settings-index-default": "Label for the option to have default indexing behavior.\n{{Identical|Default}}", "visualeditor-dialog-meta-settings-index-disable": "Label for the option for indexing to be forced off.\n{{Identical|No}}", "visualeditor-dialog-meta-settings-index-force": "Label for the option for indexing to be forced on.\n{{Identical|Yes}}", + "visualeditor-dialog-meta-settings-index-help": "Message displayed as contextual help about the __INDEX__ and __NOINDEX__ tags to editors in the advanced page settings panel.", "visualeditor-dialog-meta-settings-index-label": "Prompt to let the user set the indexing behaviour.", "visualeditor-dialog-meta-settings-label": "Title for the page settings dialog section.\n\nFollowed by the following labels:\n* {{msg-mw|Visualeditor-dialog-meta-settings-toc-default}}\n* {{msg-mw|Visualeditor-dialog-meta-settings-toc-force}}\n* {{msg-mw|Visualeditor-dialog-meta-settings-toc-disable}}\n{{Identical|Page settings}}", "visualeditor-dialog-meta-settings-newsectioneditlink-default": "Label for the option to have the namespace's default new section creating link behavior.\n{{Identical|Default}}", "visualeditor-dialog-meta-settings-newsectioneditlink-disable": "Label for the option to prevent the display of a new section creating link.\n{{Identical|No}}", "visualeditor-dialog-meta-settings-newsectioneditlink-force": "Label for the option to force the display of a new section creating link.\n{{Identical|Yes}}", + "visualeditor-dialog-meta-settings-newsectioneditlink-help": "Message displayed as contextual help about the __NEWSECTIONLINK__ and __NONEWSECTIONLINK__ tags to editors in the advanced page settings panel.", "visualeditor-dialog-meta-settings-newsectioneditlink-label": "Prompt to let the user set the new section creating link behavior.\n\nFollowed by the following buttons:\n* {{msg-mw|Visualeditor-dialog-meta-settings-newsectioneditlink-force}}\n* {{msg-mw|Visualeditor-dialog-meta-settings-newsectioneditlink-default}}\n* {{msg-mw|Visualeditor-dialog-meta-settings-newsectioneditlink-disable}}", + "visualeditor-dialog-meta-settings-nocontentconvert-help": "Message displayed as contextual help about the __NOCONTENTCONVERT__ tag to editors in the advanced page settings panel, on wikis with language conversion.", "visualeditor-dialog-meta-settings-nocontentconvert-label": "Prompt for the checkbox to let the user disable content conversion between language variants on the page.", "visualeditor-dialog-meta-settings-noeditsection-help": "Message displayed as contextual help about the __NOEDITSECTION__ tag to editors in the page settings panel.", "visualeditor-dialog-meta-settings-noeditsection-label": "Prompt for the checkbox to let the user disable section edit links on the page.", "visualeditor-dialog-meta-settings-nogallery-help": "Message displayed as contextual help about the __NOGALLERY__ tag to editors in the page settings panel on categories.", "visualeditor-dialog-meta-settings-nogallery-label": "Prompt for the checkbox to let the user disable gallery on the page.", + "visualeditor-dialog-meta-settings-notitleconvert-help": "Message displayed as contextual help about the __NOTITLECONVERT__ tag to editors in the advanced page settings panel, on wikis with language conversion.", "visualeditor-dialog-meta-settings-notitleconvert-label": "Prompt for the checkbox to let the user disable title conversion between language variants on the page.", "visualeditor-dialog-meta-settings-redirect-help": "Message displayed as contextual help about redirects to editors in the page settings panel.", "visualeditor-dialog-meta-settings-redirect-label": "Label for the checkbox to let the user redirect the page.\n\nFollowed by input box which has the placeholder {{msg-mw|Visualeditor-dialog-meta-settings-redirect-placeholder}}.", diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js index d223b3ad97..e358b12eae 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js @@ -55,7 +55,8 @@ ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage( name, config { $: this.$, align: 'top', - label: ve.msg( 'visualeditor-dialog-meta-settings-index-label' ) + label: ve.msg( 'visualeditor-dialog-meta-settings-index-label' ), + help: ve.msg( 'visualeditor-dialog-meta-settings-index-help' ) } ); @@ -80,7 +81,8 @@ ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage( name, config { $: this.$, align: 'top', - label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-label' ) + label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-label' ), + help: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-help' ) } ); @@ -92,7 +94,8 @@ ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage( name, config { $: this.$, align: 'inline', - label: ve.msg( 'visualeditor-dialog-meta-settings-displaytitle-enable' ) + label: ve.msg( 'visualeditor-dialog-meta-settings-displaytitle-enable' ), + help: ve.msg( 'visualeditor-dialog-meta-settings-displaytitle-help' ) } ); this.displayTitleInput = new OO.ui.TextInputWidget( { @@ -115,11 +118,13 @@ ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage( name, config this.metaItemCheckboxes.push( { metaName: 'mwNoContentConvert', - label: ve.msg( 'visualeditor-dialog-meta-settings-nocontentconvert-label' ) + label: ve.msg( 'visualeditor-dialog-meta-settings-nocontentconvert-label' ), + help: ve.msg( 'visualeditor-dialog-meta-settings-nocontentconvert-help' ) }, { metaName: 'mwNoTitleConvert', - label: ve.msg( 'visualeditor-dialog-meta-settings-notitleconvert-label' ) + label: ve.msg( 'visualeditor-dialog-meta-settings-notitleconvert-label' ), + help: ve.msg( 'visualeditor-dialog-meta-settings-notitleconvert-help' ) } ); } diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js index 2c14bce10c..373ae7aba4 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js @@ -51,7 +51,8 @@ ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( name, config ) { { $: this.$, align: 'top', - label: ve.msg( 'visualeditor-dialog-meta-categories-defaultsort-label' ) + label: ve.msg( 'visualeditor-dialog-meta-categories-defaultsort-label' ), + help: ve.msg( 'visualeditor-dialog-meta-categories-defaultsort-help' ) } );