Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/54851
Change subject: TUX broken if ULS is not enabled ...................................................................... TUX broken if ULS is not enabled Made TUX work even if ULS is disabled be explicitly adding uls resource loader module to dependencies. This does not add the language selector to the page, but it enables input methods and webfonts and also ui language setting which does not work if used. More work in ULS is needed to only load the necessary things for language selection. Bug: 45893 Change-Id: I307c2fe1924c92eeee22541ffe8db9edd92ed455 Mingle-Story: 2716 Mingle-Task: 2787 --- M README M Resources.php M resources/js/ext.translate.special.translate.js 3 files changed, 32 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/51/54851/1 diff --git a/README b/README index 2af451b..223228d 100644 --- a/README +++ b/README @@ -4,13 +4,13 @@ == Installation == For very very quick start add the following to LocalSettings.php: -require( "$IP/extensions/Translate/Translate.php" ); -$wgEnablePageTranslation = true; -$wgGroupPermissions['user']['translate'] = true; -$wgGroupPermissions['user']['translate-messagereview'] = true; -$wgGroupPermissions['sysop']['pagetranslation'] = true; + require( "$IP/extensions/Translate/Translate.php" ); + $wgGroupPermissions['user']['translate'] = true; + $wgGroupPermissions['user']['translate-messagereview'] = true; + $wgGroupPermissions['sysop']['pagetranslation'] = true; More documenation is at + https://www.mediawiki.org/wiki/Help:Extension:Translate/Installation https://www.mediawiki.org/wiki/Help:Extension:Translate/Configuration == Contributing == diff --git a/Resources.php b/Resources.php index c34acd7..c8e7be7 100644 --- a/Resources.php +++ b/Resources.php @@ -288,6 +288,7 @@ 'ext.translate.base', 'ext.translate.groupselector', 'ext.translate.messagetable', + 'ext.uls.init', ), 'messages' => array( 'translate-workflow-set-do', diff --git a/resources/js/ext.translate.special.translate.js b/resources/js/ext.translate.special.translate.js index 899d6cf..d5c9eaa 100644 --- a/resources/js/ext.translate.special.translate.js +++ b/resources/js/ext.translate.special.translate.js @@ -320,38 +320,36 @@ $( '.tux-messagelist' ).messagetable(); - // Use ULS for language selection if it's available - if ( $.uls ) { - ulsOptions = { - onSelect: function ( language ) { - mw.translate.changeLanguage( language ); - }, - languages: mw.config.get( 'wgULSLanguages' ), - searchAPI: mw.util.wikiScript( 'api' ) + '?action=languagesearch', - quickList: function () { - return mw.uls.getFrequentLanguageList(); - } - }; - - // If a documentation pseudo-language is defined, - // add it to the language selector - docLanguageCode = mw.config.get( 'wgTranslateDocumentationLanguageCode' ); - if ( docLanguageCode ) { - docLanguageAutonym = mw.msg( 'translate-documentation-language' ); - ulsOptions.languages[docLanguageCode] = docLanguageAutonym; - - $.uls.data.addLanguage( docLanguageCode, { - script: $.uls.data.getScript( mw.config.get( 'wgContentLanguage' ) ), - regions: ['SP'], - autonym: docLanguageAutonym - } ); - - ulsOptions.showRegions = ['WW', 'SP', 'AM', 'EU', 'ME', 'AF', 'AS', 'PA']; + // Use ULS for language selection + ulsOptions = { + onSelect: function ( language ) { + mw.translate.changeLanguage( language ); + }, + languages: mw.config.get( 'wgULSLanguages' ), + searchAPI: mw.util.wikiScript( 'api' ) + '?action=languagesearch', + quickList: function () { + return mw.uls.getFrequentLanguageList(); } + }; - $( '.ext-translate-language-selector .uls' ).uls( ulsOptions ); + // If a documentation pseudo-language is defined, + // add it to the language selector + docLanguageCode = mw.config.get( 'wgTranslateDocumentationLanguageCode' ); + if ( docLanguageCode ) { + docLanguageAutonym = mw.msg( 'translate-documentation-language' ); + ulsOptions.languages[docLanguageCode] = docLanguageAutonym; + + $.uls.data.addLanguage( docLanguageCode, { + script: $.uls.data.getScript( mw.config.get( 'wgContentLanguage' ) ), + regions: ['SP'], + autonym: docLanguageAutonym + } ); + + ulsOptions.showRegions = ['WW', 'SP', 'AM', 'EU', 'ME', 'AF', 'AS', 'PA']; } + $( '.ext-translate-language-selector .uls' ).uls( ulsOptions ); + if ( $.fn.translateeditor ) { // New translation editor $( '.tux-message' ).translateeditor(); -- To view, visit https://gerrit.wikimedia.org/r/54851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I307c2fe1924c92eeee22541ffe8db9edd92ed455 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
