wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-24 10:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify handling of messages for section edit links

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extension.json
View file

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

6
includes/VisualEditorHooks.php
View file

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

11
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
View file

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