r67992 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r67991‎ | r67992 | r67993 >
Date:12:23, 14 June 2010
Author:liangent
Status:deferred
Tags:
Comment:
Expand -s and -t to their full form to make their meanings clearer
Modified paths:
  • /trunk/extensions/CategoryMultisortChinese/CategoryMultisortChinese.hooks.php (modified) (history)
  • /trunk/extensions/CategoryMultisortChinese/CategoryMultisortChinese.i18n.php (modified) (history)
  • /trunk/extensions/CategoryMultisortChinese/CategoryMultisortChinese.php (modified) (history)

Diff [purge]

Index: trunk/extensions/CategoryMultisortChinese/CategoryMultisortChinese.i18n.php
@@ -18,11 +18,11 @@
1919 'categorymultisort-sortkey-name-mandarin-tongyong' => 'Mandarin: Tongyong',
2020 'categorymultisort-sortkey-name-cantonese-jyutping' => 'Cantonese: Jyutping',
2121 'categorymultisort-sortkey-name-stroke' => 'Stroke',
22 - 'categorymultisort-sortkey-name-stroke-s' => 'Stroke: Simplified',
23 - 'categorymultisort-sortkey-name-stroke-t' => 'Stroke: Traditional',
 22+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Stroke: Simplified',
 23+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Stroke: Traditional',
2424 'categorymultisort-sortkey-name-radical' => 'Radical',
25 - 'categorymultisort-sortkey-name-radical-s' => 'Radical: Simplified',
26 - 'categorymultisort-sortkey-name-radical-t' => 'Radical: Traditional',
 25+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radical: Simplified',
 26+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radical: Traditional',
2727 );
2828
2929 /** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
@@ -33,11 +33,11 @@
3434 $messages['be-tarask'] = array(
3535 'categorymultisortchinese-desc' => 'Дазваляе праглядаць катэгорыі з рознымі ключамі сартаваньня для розных варыянтаў кітайскай мовы',
3636 'categorymultisort-sortkey-name-stroke' => 'Рыса',
37 - 'categorymultisort-sortkey-name-stroke-s' => 'Рыса: Спрошчаная',
38 - 'categorymultisort-sortkey-name-stroke-t' => 'Рыса: Традыцыйная',
 37+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Рыса: Спрошчаная',
 38+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Рыса: Традыцыйная',
3939 'categorymultisort-sortkey-name-radical' => 'Радыкальны',
40 - 'categorymultisort-sortkey-name-radical-s' => 'Радыкальны: Спрошчаны',
41 - 'categorymultisort-sortkey-name-radical-t' => 'Радыкальны: Традыцыйны',
 40+ 'categorymultisort-sortkey-name-radical-simplified' => 'Радыкальны: Спрошчаны',
 41+ 'categorymultisort-sortkey-name-radical-traditional' => 'Радыкальны: Традыцыйны',
4242 );
4343
4444 /** Breton (Brezhoneg)
@@ -45,8 +45,8 @@
4646 */
4747 $messages['br'] = array(
4848 'categorymultisort-sortkey-name-stroke' => 'Neuz',
49 - 'categorymultisort-sortkey-name-stroke-s' => 'Neuz : eeunaet',
50 - 'categorymultisort-sortkey-name-stroke-t' => 'Neuz : hengounel',
 49+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Neuz : eeunaet',
 50+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Neuz : hengounel',
5151 );
5252
5353 /** German (Deutsch)
@@ -55,11 +55,11 @@
5656 $messages['de'] = array(
5757 'categorymultisortchinese-desc' => 'Ermöglicht es, Kategorien nach unterschiedlichen Sortierkriterien anzuzeigen, die speziell auf die chinesische Sprache zutreffen',
5858 'categorymultisort-sortkey-name-stroke' => 'Strich',
59 - 'categorymultisort-sortkey-name-stroke-s' => 'Strich: Kurzzeichen',
60 - 'categorymultisort-sortkey-name-stroke-t' => 'Strich: Langzeichen',
 59+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Strich: Kurzzeichen',
 60+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Strich: Langzeichen',
6161 'categorymultisort-sortkey-name-radical' => 'Radikal',
62 - 'categorymultisort-sortkey-name-radical-s' => 'Radikal: Kurzzeichen',
63 - 'categorymultisort-sortkey-name-radical-t' => 'Radikal: Langzeichen',
 62+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radikal: Kurzzeichen',
 63+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radikal: Langzeichen',
6464 );
6565
6666 /** Lower Sorbian (Dolnoserbski)
@@ -68,11 +68,11 @@
6969 $messages['dsb'] = array(
7070 'categorymultisortchinese-desc' => 'Dowólujo, kategorije z rozdźělnymi sortěrowańskimi klucami specielnje za chinske pisma zwobrazniś',
7171 'categorymultisort-sortkey-name-stroke' => 'Smuga',
72 - 'categorymultisort-sortkey-name-stroke-s' => 'Smuga: Zjadnorjene',
73 - 'categorymultisort-sortkey-name-stroke-t' => 'Smuga: Tradicionelne',
 72+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Smuga: Zjadnorjene',
 73+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Smuga: Tradicionelne',
7474 'categorymultisort-sortkey-name-radical' => 'Radikal',
75 - 'categorymultisort-sortkey-name-radical-s' => 'Radikal: Zjadnorjene',
76 - 'categorymultisort-sortkey-name-radical-t' => 'Radikal: Tradicionelne',
 75+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radikal: Zjadnorjene',
 76+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radikal: Tradicionelne',
7777 );
7878
7979 /** Spanish (Español)
@@ -82,11 +82,11 @@
8383 $messages['es'] = array(
8484 'categorymultisortchinese-desc' => 'Permitir mostrar las categorías con diferentes atajos específicos para scripts chinos.',
8585 'categorymultisort-sortkey-name-stroke' => 'Trazo',
86 - 'categorymultisort-sortkey-name-stroke-s' => 'Trazo: Simplificado',
87 - 'categorymultisort-sortkey-name-stroke-t' => 'Trazo: Tradicional',
 86+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Trazo: Simplificado',
 87+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Trazo: Tradicional',
8888 'categorymultisort-sortkey-name-radical' => 'Radical',
89 - 'categorymultisort-sortkey-name-radical-s' => 'Radical: Simplificado',
90 - 'categorymultisort-sortkey-name-radical-t' => 'Radical: Tradicional',
 89+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radical: Simplificado',
 90+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radical: Tradicional',
9191 );
9292
9393 /** French (Français)
@@ -96,11 +96,11 @@
9797 $messages['fr'] = array(
9898 'categorymultisortchinese-desc' => 'Permet aux catégories d’être affichées avec différentes clés de tri spécifiques aux écritures chinoises',
9999 'categorymultisort-sortkey-name-stroke' => 'Trait',
100 - 'categorymultisort-sortkey-name-stroke-s' => 'Trait : simplifié',
101 - 'categorymultisort-sortkey-name-stroke-t' => 'Trait : traditionnel',
 100+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Trait : simplifié',
 101+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Trait : traditionnel',
102102 'categorymultisort-sortkey-name-radical' => 'Radical',
103 - 'categorymultisort-sortkey-name-radical-s' => 'Radical : simplifié',
104 - 'categorymultisort-sortkey-name-radical-t' => 'Radical : traditionnel',
 103+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radical : simplifié',
 104+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radical : traditionnel',
105105 );
106106
107107 /** Galician (Galego)
@@ -109,11 +109,11 @@
110110 $messages['gl'] = array(
111111 'categorymultisortchinese-desc' => 'Permite que se poidan ollar as categorías mediante diferentes claves de ordenación específicas para escrituras en chinés',
112112 'categorymultisort-sortkey-name-stroke' => 'Trazo',
113 - 'categorymultisort-sortkey-name-stroke-s' => 'Trazo: simplificado',
114 - 'categorymultisort-sortkey-name-stroke-t' => 'Trazo: tradicional',
 113+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Trazo: simplificado',
 114+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Trazo: tradicional',
115115 'categorymultisort-sortkey-name-radical' => 'Radical',
116 - 'categorymultisort-sortkey-name-radical-s' => 'Radical: simplificado',
117 - 'categorymultisort-sortkey-name-radical-t' => 'Radical: tradicional',
 116+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radical: simplificado',
 117+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radical: tradicional',
118118 );
119119
120120 /** Upper Sorbian (Hornjoserbsce)
@@ -122,11 +122,11 @@
123123 $messages['hsb'] = array(
124124 'categorymultisortchinese-desc' => 'Dowola, kategorije z rozdźělnymi sortěrowanskimi klučemi specielnje za chinske pisma zwobraznić',
125125 'categorymultisort-sortkey-name-stroke' => 'Smužka',
126 - 'categorymultisort-sortkey-name-stroke-s' => 'Smužka: Zjednorjene',
127 - 'categorymultisort-sortkey-name-stroke-t' => 'Smužka: Tradicionelne',
 126+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Smužka: Zjednorjene',
 127+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Smužka: Tradicionelne',
128128 'categorymultisort-sortkey-name-radical' => 'Radikal',
129 - 'categorymultisort-sortkey-name-radical-s' => 'Radikal: Zjednorjene',
130 - 'categorymultisort-sortkey-name-radical-t' => 'Radikal: Tradicionelne',
 129+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radikal: Zjednorjene',
 130+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radikal: Tradicionelne',
131131 );
132132
133133 /** Interlingua (Interlingua)
@@ -135,11 +135,11 @@
136136 $messages['ia'] = array(
137137 'categorymultisortchinese-desc' => 'Permitte le presentation de categorias con differente claves de ordination specific a scripturas chinese',
138138 'categorymultisort-sortkey-name-stroke' => 'Tracto',
139 - 'categorymultisort-sortkey-name-stroke-s' => 'Tracto: Simplificate',
140 - 'categorymultisort-sortkey-name-stroke-t' => 'Tracto: Traditional',
 139+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Tracto: Simplificate',
 140+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Tracto: Traditional',
141141 'categorymultisort-sortkey-name-radical' => 'Radical',
142 - 'categorymultisort-sortkey-name-radical-s' => 'Radical: Simplificate',
143 - 'categorymultisort-sortkey-name-radical-t' => 'Radical: Traditional',
 142+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radical: Simplificate',
 143+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radical: Traditional',
144144 );
145145
146146 /** Luxembourgish (Lëtzebuergesch)
@@ -147,11 +147,11 @@
148148 */
149149 $messages['lb'] = array(
150150 'categorymultisort-sortkey-name-stroke' => 'Strich',
151 - 'categorymultisort-sortkey-name-stroke-s' => 'Strich: Vereinfacht',
152 - 'categorymultisort-sortkey-name-stroke-t' => 'Strich: Traditionell',
 151+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Strich: Vereinfacht',
 152+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Strich: Traditionell',
153153 'categorymultisort-sortkey-name-radical' => 'Radikal',
154 - 'categorymultisort-sortkey-name-radical-s' => 'Radikal: Vereinfacht',
155 - 'categorymultisort-sortkey-name-radical-t' => 'Radikal: Traditionell',
 154+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radikal: Vereinfacht',
 155+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radikal: Traditionell',
156156 );
157157
158158 /** Macedonian (Македонски)
@@ -160,11 +160,11 @@
161161 $messages['mk'] = array(
162162 'categorymultisortchinese-desc' => 'Овозможува категориите да се прегледуваат по различни подредни клучеви согласно кинеските писма',
163163 'categorymultisort-sortkey-name-stroke' => 'Потег',
164 - 'categorymultisort-sortkey-name-stroke-s' => 'Потег: Упростено',
165 - 'categorymultisort-sortkey-name-stroke-t' => 'Потег: Традиционално',
 164+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Потег: Упростено',
 165+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Потег: Традиционално',
166166 'categorymultisort-sortkey-name-radical' => 'Радикал',
167 - 'categorymultisort-sortkey-name-radical-s' => 'Радикал: Упростено',
168 - 'categorymultisort-sortkey-name-radical-t' => 'Радикал: Традиционално',
 167+ 'categorymultisort-sortkey-name-radical-simplified' => 'Радикал: Упростено',
 168+ 'categorymultisort-sortkey-name-radical-traditional' => 'Радикал: Традиционално',
169169 );
170170
171171 /** Dutch (Nederlands)
@@ -173,11 +173,11 @@
174174 $messages['nl'] = array(
175175 'categorymultisortchinese-desc' => 'Maakt het mogelijk categorieën te bekijken met verschillende sorteerwijzen specifiek voor Chinese schriften',
176176 'categorymultisort-sortkey-name-stroke' => 'Streep',
177 - 'categorymultisort-sortkey-name-stroke-s' => 'Streep: Vereenvoudigd',
178 - 'categorymultisort-sortkey-name-stroke-t' => 'Streep: Traditioneel',
 177+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Streep: Vereenvoudigd',
 178+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Streep: Traditioneel',
179179 'categorymultisort-sortkey-name-radical' => 'Radicaal',
180 - 'categorymultisort-sortkey-name-radical-s' => 'Radical: Vereenvoudigd',
181 - 'categorymultisort-sortkey-name-radical-t' => 'Radical: Traditioneel',
 180+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radical: Vereenvoudigd',
 181+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radical: Traditioneel',
182182 );
183183
184184 /** Portuguese (Português)
@@ -187,11 +187,11 @@
188188 $messages['pt'] = array(
189189 'categorymultisortchinese-desc' => 'Permitir que as categorias sejam visionadas com diferentes chaves de ordenação específicas para caligrafias chinesas',
190190 'categorymultisort-sortkey-name-stroke' => 'Traço',
191 - 'categorymultisort-sortkey-name-stroke-s' => 'Traço: Simplificado',
192 - 'categorymultisort-sortkey-name-stroke-t' => 'Traço: Tradicional',
 191+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Traço: Simplificado',
 192+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Traço: Tradicional',
193193 'categorymultisort-sortkey-name-radical' => 'Radical',
194 - 'categorymultisort-sortkey-name-radical-s' => 'Radical: Simplificado',
195 - 'categorymultisort-sortkey-name-radical-t' => 'Radical: Tradicional',
 194+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radical: Simplificado',
 195+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radical: Tradicional',
196196 );
197197
198198 /** Brazilian Portuguese (Português do Brasil)
@@ -200,11 +200,11 @@
201201 $messages['pt-br'] = array(
202202 'categorymultisortchinese-desc' => 'Permitir que as categorias sejam visualizadas com diferentes chaves de ordenação específicas para caligrafias chinesas',
203203 'categorymultisort-sortkey-name-stroke' => 'Traço',
204 - 'categorymultisort-sortkey-name-stroke-s' => 'Traço: Simplificado',
205 - 'categorymultisort-sortkey-name-stroke-t' => 'Traço: Tradicional',
 204+ 'categorymultisort-sortkey-name-stroke-simplified' => 'Traço: Simplificado',
 205+ 'categorymultisort-sortkey-name-stroke-traditional' => 'Traço: Tradicional',
206206 'categorymultisort-sortkey-name-radical' => 'Radical',
207 - 'categorymultisort-sortkey-name-radical-s' => 'Radical: Simplificado',
208 - 'categorymultisort-sortkey-name-radical-t' => 'Radical: Tradicional',
 207+ 'categorymultisort-sortkey-name-radical-simplified' => 'Radical: Simplificado',
 208+ 'categorymultisort-sortkey-name-radical-traditional' => 'Radical: Tradicional',
209209 );
210210
211211 /** Russian (Русский)
@@ -213,24 +213,24 @@
214214 $messages['ru'] = array(
215215 'categorymultisortchinese-desc' => 'Позволяет просматривать категории с использованием различных ключей сортировки для китайских письменностей',
216216 'categorymultisort-sortkey-name-stroke' => 'по штрихам',
217 - 'categorymultisort-sortkey-name-stroke-s' => 'по штрихам: упрощённый',
218 - 'categorymultisort-sortkey-name-stroke-t' => 'по штрихам: традиционный',
 217+ 'categorymultisort-sortkey-name-stroke-simplified' => 'по штрихам: упрощённый',
 218+ 'categorymultisort-sortkey-name-stroke-traditional' => 'по штрихам: традиционный',
219219 'categorymultisort-sortkey-name-radical' => 'по радикалам',
220 - 'categorymultisort-sortkey-name-radical-s' => 'по радикалам: упрощённый',
221 - 'categorymultisort-sortkey-name-radical-t' => 'по радикалам: традиционный',
 220+ 'categorymultisort-sortkey-name-radical-simplified' => 'по радикалам: упрощённый',
 221+ 'categorymultisort-sortkey-name-radical-traditional' => 'по радикалам: традиционный',
222222 );
223223
224224 /** Simplified Chinese (‪中文(简体)‬)
225225 * @author Yfdyh000
226226 */
227227 $messages['zh-hans'] = array(
228 - 'categorymultisort-sortkey-name-stroke-s' => '中文(简体)',
229 - 'categorymultisort-sortkey-name-stroke-t' => '中文(繁体)',
 228+ 'categorymultisort-sortkey-name-stroke-simplified' => '中文(简体)',
 229+ 'categorymultisort-sortkey-name-stroke-traditional' => '中文(繁体)',
230230 );
231231
232232 /** Traditional Chinese (‪中文(繁體)‬) */
233233 $messages['zh-hant'] = array(
234 - 'categorymultisort-sortkey-name-stroke-s' => '中文(簡體)',
235 - 'categorymultisort-sortkey-name-stroke-t' => '中文(繁體)',
 234+ 'categorymultisort-sortkey-name-stroke-simplified' => '中文(簡體)',
 235+ 'categorymultisort-sortkey-name-stroke-traditional' => '中文(繁體)',
236236 );
237237
Index: trunk/extensions/CategoryMultisortChinese/CategoryMultisortChinese.php
@@ -26,13 +26,13 @@
2727 wfLoadExtensionMessages( 'CategoryMultisortChinese' );
2828
2929 if ( in_array( 'zh-hans', $wgContLang->getVariants() ) ) {
30 - $wgCategoryMultisortSortkeySettings['stroke-s'] = $wgCategoryMultisortSortkeySettings['stroke'];
31 - $wgCategoryMultisortSortkeySettings['radical-s'] = $wgCategoryMultisortSortkeySettings['radical'];
 30+ $wgCategoryMultisortSortkeySettings['stroke-simplified'] = $wgCategoryMultisortSortkeySettings['stroke'];
 31+ $wgCategoryMultisortSortkeySettings['radical-simplified'] = $wgCategoryMultisortSortkeySettings['radical'];
3232 }
3333
3434 if ( in_array( 'zh-hant', $wgContLang->getVariants() ) ) {
35 - $wgCategoryMultisortSortkeySettings['stroke-t'] = $wgCategoryMultisortSortkeySettings['stroke'];
36 - $wgCategoryMultisortSortkeySettings['radical-t'] = $wgCategoryMultisortSortkeySettings['radical'];
 35+ $wgCategoryMultisortSortkeySettings['stroke-traditional'] = $wgCategoryMultisortSortkeySettings['stroke'];
 36+ $wgCategoryMultisortSortkeySettings['radical-traditional'] = $wgCategoryMultisortSortkeySettings['radical'];
3737 }
3838 }
3939
Index: trunk/extensions/CategoryMultisortChinese/CategoryMultisortChinese.hooks.php
@@ -62,19 +62,19 @@
6363 $conv = $wgContLang->autoConvertToAllVariants( $text );
6464
6565 if ( array_key_exists( 'zh-hans', $conv ) ) {
66 - $this->onCategoryMultisortSortkeys_setDefaultSortkey( $categoryMultisorts, 'stroke-s',
 66+ $this->onCategoryMultisortSortkeys_setDefaultSortkey( $categoryMultisorts, 'stroke-simplified',
6767 $this->onCategoryMultisortSortkeys_buildStrokeSortkey( $data, $conv['zh-hans'] )
6868 );
69 - $this->onCategoryMultisortSortkeys_setDefaultSortkey( $categoryMultisorts, 'radical-s',
 69+ $this->onCategoryMultisortSortkeys_setDefaultSortkey( $categoryMultisorts, 'radical-simplified',
7070 $this->onCategoryMultisortSortkeys_buildRadicalSortkey( $data, $conv['zh-hans'] )
7171 );
7272 }
7373
7474 if ( array_key_exists( 'zh-hant', $conv ) ) {
75 - $this->onCategoryMultisortSortkeys_setDefaultSortkey( $categoryMultisorts, 'stroke-t',
 75+ $this->onCategoryMultisortSortkeys_setDefaultSortkey( $categoryMultisorts, 'stroke-traditional',
7676 $this->onCategoryMultisortSortkeys_buildStrokeSortkey( $data, $conv['zh-hant'] )
7777 );
78 - $this->onCategoryMultisortSortkeys_setDefaultSortkey( $categoryMultisorts, 'radical-t',
 78+ $this->onCategoryMultisortSortkeys_setDefaultSortkey( $categoryMultisorts, 'radical-traditional',
7979 $this->onCategoryMultisortSortkeys_buildRadicalSortkey( $data, $conv['zh-hant'] )
8080 );
8181 }

Status & tagging log