Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296746
Change subject: Vary the 'save' labels to 'publish' for public wikis
......................................................................
Vary the 'save' labels to 'publish' for public wikis
Bug: T131132
Change-Id: I4a497265661d5ce0f6144988b514509dfa1bddfd
Depends-On: I56634ed223778a0650cf36ac7256151b13c494f1
---
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMobileSaveDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
8 files changed, 22 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/46/296746/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 97bdf1a..3244276 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -54,6 +54,8 @@
$toolbarScrollOffset =
$skinsToolbarScrollOffset[$skinName];
}
$output->addJsConfigVars( 'wgVisualEditorToolbarScrollOffset',
$toolbarScrollOffset );
+
+ $output->addJsConfigVars( 'wgEditButtonPublishNotSave',
$veConfig->get( 'EditButtonPublishNotSave' ) );
return true;
}
diff --git a/extension.json b/extension.json
index b32a2d6..8901bfa 100644
--- a/extension.json
+++ b/extension.json
@@ -1188,6 +1188,8 @@
"fancycaptcha-reload-text",
"hidetoc",
"ooui-dialog-process-continue",
+ "publishchanges",
+ "publishpage",
"questycaptcha-edit",
"savearticle",
"savechanges",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 4afa165..61f31e1 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -321,6 +321,7 @@
"visualeditor-savedialog-label-resume-editing": "Resume editing",
"visualeditor-savedialog-label-review": "Review your changes",
"visualeditor-savedialog-label-review-good": "Return to save form",
+ "visualeditor-savedialog-label-publish-short": "Publish",
"visualeditor-savedialog-label-save-short": "Save",
"visualeditor-savedialog-label-warning": "Warning",
"visualeditor-savedialog-title-conflict": "Conflict",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 8cbcffe..5dcb3c2 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -327,6 +327,7 @@
"visualeditor-savedialog-identify-user": "Displayed in the save dialog
if saving failed because the session expired and the session is now for a
different user account.\n{{format|jquerymsg}}\nParameters:\n* $1 - username",
"visualeditor-savedialog-label-create": "Label text for save button
when the user is creating a new page\n{{Identical|Create page}}",
"visualeditor-savedialog-label-error": "Label in front of a save dialog
error sentence, separated by {{msg-mw|colon-separator}}.\n{{Identical|Error}}",
+ "visualeditor-savedialog-label-publish-short": "Short label text for
save button on public wikis when the user is editing a current revision of an
extant page on width-restricted devices.\n{{Identical|Publish}}",
"visualeditor-savedialog-label-report": "Label for button to trigger
report",
"visualeditor-savedialog-label-resolve-conflict": "Label for button to
start resoliving an edit conflict",
"visualeditor-savedialog-label-resume-editing": "Label for button to
exit the save dialog without saving, and return to editing.",
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index ca111a1..f7d8cc6 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1488,7 +1488,10 @@
ve.init.mw.ArticleTarget.prototype.setupToolbarSaveButton = function ( config
) {
if ( !this.toolbarSaveButton ) {
this.toolbarSaveButton = new OO.ui.ButtonWidget(
ve.extendObject( {
- label: OO.ui.deferMsg( !mw.config.get(
'wgRelevantArticleId' ) ? 'savearticle' : 'savechanges' ),
+ label: OO.ui.deferMsg( mw.config.get(
'wgEditButtonPublishNotSave' ) ?
+ ( !mw.config.get( 'wgRelevantArticleId'
) ? 'publishpage' : 'publishchanges' ) :
+ ( !mw.config.get( 'wgRelevantArticleId'
) ? 'savearticle' : 'savechanges' )
+ ),
flags: [ 'progressive', 'primary' ],
disabled: !this.restoring
}, config ) );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
index a5bcba2..2b72a57 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
@@ -44,7 +44,7 @@
if ( saveShortcut !== '-' && saveShortcut !== '' ) {
ve.ui.commandHelpRegistry.register( 'other', 'save', {
shortcuts: [ accessKeyPrefix +
saveShortcut.toUpperCase() ],
- label: OO.ui.deferMsg( 'savechanges' ),
+ label: OO.ui.deferMsg( mw.config.get(
'wgEditButtonPublishNotSave' ) ? 'publishchanges' : 'savechanges' ),
demote: true
} );
}
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMobileSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMobileSaveDialog.js
index 128079e..781d71f 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMobileSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMobileSaveDialog.js
@@ -37,7 +37,9 @@
this.actions.forEach( { actions: 'save' }, function (
action ) {
action.setLabel(
ve.msg(
-
'visualeditor-savedialog-label-save-short'
+ mw.config.get(
'wgEditButtonPublishNotSave' ) ?
+
'visualeditor-savedialog-label-publish-short' :
+
'visualeditor-savedialog-label-save-short'
)
);
} );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index fb5179f..e0bb360 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -48,7 +48,11 @@
ve.ui.MWSaveDialog.static.actions = [
{
action: 'save',
- label: OO.ui.deferMsg( !mw.config.get( 'wgRelevantArticleId' )
? 'savearticle' : 'savechanges' ),
+ label: OO.ui.deferMsg(
+ mw.config.get( 'wgEditButtonPublishNotSave' ) ?
+ ( !mw.config.get( 'wgRelevantArticleId' ) ?
'publishpage' : 'publishchanges' ) :
+ ( !mw.config.get( 'wgRelevantArticleId' ) ?
'savearticle' : 'savechanges' )
+ ),
flags: [ 'primary', 'constructive' ],
modes: [ 'save', 'review' ],
accessKey: 's'
@@ -494,7 +498,9 @@
this.actions.forEach( { actions: 'save' }, function (
action ) {
action.setLabel(
ve.msg(
- !mw.config.get(
'wgRelevantArticleId' ) ? 'savearticle' : 'savechanges'
+ mw.config.get(
'wgEditButtonPublishNotSave' ) ?
+ ( !mw.config.get(
'wgRelevantArticleId' ) ? 'publishpage' : 'publishchanges' ) :
+ ( !mw.config.get(
'wgRelevantArticleId' ) ? 'savearticle' : 'savechanges' )
)
);
} );
--
To view, visit https://gerrit.wikimedia.org/r/296746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a497265661d5ce0f6144988b514509dfa1bddfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
