r56460 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r56459‎ | r56460 | r56461 >
Date:23:55, 16 September 2009
Author:brion
Status:ok
Tags:
Comment:
Merge r56458, r56459 from trunk -- fix unstub loops in zh
Modified paths:
  • /branches/wmf-deployment/languages/classes/LanguageZh.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/languages/classes/LanguageZh.php
@@ -132,17 +132,8 @@
133133 global $wgHooks;
134134 parent::__construct();
135135
136 - $variants_all = array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
137 - $variants = array();
 136+ $variants = array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
138137
139 - // If a wiki disabled some variants,
140 - // LanguageConverter shouldn't process them
141 - foreach( $variants_all as $variant ) {
142 - $status = wfMsgExt( "variantname-$variant", array( 'parsemag', 'language' => $this ) );
143 - if( trim($status) != 'disable' )
144 - $variants[] = $variant;
145 - }
146 -
147138 $variantfallbacks = array(
148139 'zh' => array('zh-hans','zh-hant','zh-cn','zh-tw','zh-hk','zh-sg','zh-mo','zh-my'),
149140 'zh-hans' => array('zh-cn','zh-sg','zh-my'),

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r56458Partial revert of r55415, calling wfMsg in Language object constructor causes...werdna23:50, 16 September 2009
r56459Fix E_NOTICE in r55415 breaking Zh variantswerdna23:53, 16 September 2009

Status & tagging log