Simplify handling of messages for section edit links

Change-Id: I5b84fc3863747b4d092a7025475730bb28efeff2
This commit is contained in:
Bartosz Dziewoński 2018-10-13 03:10:42 +02:00
parent e048c3e188
commit 62273183a8
3 changed files with 7 additions and 12 deletions

View file

@ -64,7 +64,7 @@
"editlocaldescriptionsource": "visualeditor-ca-editlocaldescriptionsource",
"createlocaldescription": "create-local",
"createlocaldescriptionsource": "visualeditor-ca-createlocaldescriptionsource",
"editsection": null,
"editsection": "editsection",
"editsectionsource": "visualeditor-ca-editsource-section"
},
"VisualEditorAutoAccountEnable": false,

View file

@ -593,8 +593,7 @@ class VisualEditorHooks {
) {
// Don't add ve-edit, but do update the edit tab (e.g. "Edit source").
$tabMessages = $config->get( 'VisualEditorTabMessages' );
$sourceEditSection = $tabMessages['editsectionsource'] !== null ?
$tabMessages['editsectionsource'] : 'editsection';
$sourceEditSection = $tabMessages['editsectionsource'];
$result['editsection']['text'] = $skin->msg( $sourceEditSection )->inLanguage( $lang )->text();
}
@ -608,8 +607,7 @@ class VisualEditorHooks {
// add VE edit section in VE available namespaces
if ( ApiVisualEditor::isAllowedNamespace( $config, $title->getNamespace() ) ) {
$veEditSection = $tabMessages['editsection'] !== null ?
$tabMessages['editsection'] : 'editsection';
$veEditSection = $tabMessages['editsection'];
$veLink = [
'text' => $skin->msg( $veEditSection )->inLanguage( $lang )->text(),
'targetTitle' => $title,

View file

@ -321,7 +321,7 @@
}
$( '#ca-edit a' ).text( mw.msg( tabMsg ) );
$( '.mw-editsection a' ).text( mw.msg( tabMessages[ sectionKey ] || 'editsection' ) );
$( '.mw-editsection a' ).text( mw.msg( tabMessages[ sectionKey ] ) );
}
$.cookie( 'VEE', editor, { path: '/', expires: 30 } );
@ -752,12 +752,9 @@
$divider = $( '<span>' ),
dividerText = mw.msg( 'pipe-separator' );
if ( tabMessages.editsectionsource !== null ) {
$editSourceLink.text( mw.msg( tabMessages.editsectionsource ) );
}
if ( tabMessages.editsection !== null ) {
$editLink.text( mw.msg( tabMessages.editsection ) );
}
$editSourceLink.text( mw.msg( tabMessages.editsectionsource ) );
$editLink.text( mw.msg( tabMessages.editsection ) );
$divider
.addClass( 'mw-editsection-divider' )
.text( dividerText );