r103657 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103656‎ | r103657 | r103658 >
Date:10:25, 19 November 2011
Author:robin
Status:ok
Tags:
Comment:
Make Narayam work with page content language, so it detects the correct language of the edit field.
Thanks to Santosh
Modified paths:
  • /trunk/extensions/Narayam/Narayam.hooks.php (modified) (history)
  • /trunk/extensions/Narayam/js/ext.narayam.core.js (modified) (history)

Diff [purge]

Index: trunk/extensions/Narayam/Narayam.hooks.php
@@ -50,15 +50,18 @@
5151 * @return array( scheme name => module name )
5252 */
5353 protected static function getSchemes() {
54 - global $wgLanguageCode, $wgLang, $wgNarayamSchemes, $wgRequest;
 54+ global $wgLanguageCode, $wgLang, $wgNarayamSchemes, $wgTitle;
5555
5656 $userlangCode = $wgLang->getCode();
5757 $contlangSchemes = isset( $wgNarayamSchemes[$wgLanguageCode] ) ?
5858 $wgNarayamSchemes[$wgLanguageCode] : array();
5959 $userlangSchemes = isset( $wgNarayamSchemes[$userlangCode] ) ?
6060 $wgNarayamSchemes[$userlangCode] : array();
 61+ $pagelang = $wgTitle->getPageLanguage()->getCode();
 62+ $pagelangSchemes = isset( $wgNarayamSchemes[$pagelang] ) ?
 63+ $wgNarayamSchemes[$pagelang] : array();
6164
62 - $schemes = $userlangSchemes + $contlangSchemes;
 65+ $schemes = $userlangSchemes + $contlangSchemes + $pagelangSchemes;
6366
6467 return $schemes;
6568 }
Index: trunk/extensions/Narayam/js/ext.narayam.core.js
@@ -529,6 +529,9 @@
530530 }
531531 // menu items for the language of wiki.
532532 var requested = [mw.config.get( 'wgUserVariant' ), mw.config.get( 'wgContentLanguage' ), mw.config.get( 'wgUserLanguage' )];
 533+ $( 'textarea[lang]' ).each( function( index ) {
 534+ requested.push( this.lang );
 535+ });
533536 for ( var i = 0; i < requested.length; i++ ) {
534537 var lang = requested[i];
535538 var langschemes = allImes[lang];

Status & tagging log