r23138 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r23137‎ | r23138 | r23139 >
Date:21:11, 20 June 2007
Author:brion
Status:old
Tags:
Comment:
Clean up the account status box in prefs a bit. Could still use some cleanup but it's i18n-able. Dropping the ID number in favor of legible status info
Modified paths:
  • /trunk/extensions/CentralAuth/CentralAuth.i18n.php (modified) (history)
  • /trunk/extensions/CentralAuth/CentralAuth.php (modified) (history)

Diff [purge]

Index: trunk/extensions/CentralAuth/CentralAuth.php
——@@ -80,27 +80,37 @@
8181 if( $global->exists() ) {
8282 if( $global->isAttached() ) {
8383 // Local is attached...
84 - $attached = count( $global->listAttached() ); // $attached var not used.
 84+ $attached = count( $global->listAttached() );
8585 $unattached = count( $global->listUnattached() );
8686 if( $unattached ) {
8787 // Migration incomplete
88 - $message = $global->getId() . " $unattached wikis left to migrate";
 88+ $message = '<strong>' . wfMsgHtml( 'centralauth-prefs-migration' ) . '</strong>' .
 89+ '<br />' .
 90+ wfMsgHtml( 'centralauth-prefs-count-attached', $attached ) .
 91+ '<br />' .
 92+ wfMsgHtml( 'centralauth-prefs-count-unattached', $unattached );
8993 } else {
9094 // Migration complete
91 - $message = $global->getId() . " Migration complete";
 95+ $message = '<strong>' . wfMsgHtml( 'centralauth-prefs-complete' ) . '</strong>' .
 96+ '<br />' .
 97+ wfMsgHtml( 'centralauth-prefs-count-attached', $attached );
9298 }
9399 } else {
94100 // Account is in migration, but the local account is not attached
95 - $message = "This wiki has not been verified to the unified account";
 101+ $message = '<strong>' . wfMsgHtml( 'centralauth-prefs-unattached' ) . '</strong>' .
 102+ '<br />' .
 103+ wfMsgHtml( 'centralauth-prefs-detail-unattached' );
96104 }
97105 } else {
98106 // Not migrated.
99 - $message = "Not using unified account.";
 107+ $message = wfMsgHtml( 'centralauth-prefs-not-managed' );
100108 }
101109
102 - $html .= $prefsForm->addRow(
103 - wfMsgHtml( 'centralauth-globalid' ),
104 - $message . ' (' . $skin->makeKnownLinkObj( $special, 'merge your accounts' ) . ')' );
 110+ $manageLink = $skin->makeKnownLinkObj( $special,
 111+ wfMsgHtml( 'centralauth-prefs-manage' ) );
 112+ $html .= $prefsForm->tableRow(
 113+ wfMsgHtml( 'centralauth-prefs-status' ),
 114+ "$message<br />($manageLink)" );
105115 return true;
106116 }
107117
Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php
——@@ -93,8 +93,25 @@
9494 'No accounts selected to modify.',
9595
9696 // Info panel in preferences
97 - 'centralauth-globalid' =>
98 - 'Unified account ID:',
 97+ 'centralauth-prefs-status' =>
 98+ 'Global account status:',
 99+ 'centralauth-prefs-not-managed' =>
 100+ 'Not using unified account',
 101+ 'centralauth-prefs-unattached' =>
 102+ 'Unconfirmed',
 103+ 'centralauth-prefs-complete' =>
 104+ 'All in order!',
 105+ 'centralauth-prefs-migration' =>
 106+ 'In migration',
 107+ 'centralauth-prefs-count-attached' =>
 108+ 'Your account is active on $1 project sites.',
 109+ 'centralauth-prefs-count-unattached' =>
 110+ 'Unconfirmed accounts with your name remain on $1 projects.',
 111+ 'centralauth-prefs-detail-unattached' =>
 112+ 'This project site has not been confirmed as belonging to the global account.',
 113+ 'centralauth-prefs-manage' =>
 114+ 'Manage your global account',
 115+
99116 );
100117
101118 $wgCentralAuthMessages['de'] = array(
——@@ -192,11 +209,6 @@
193210 'Ungültige Auswahl',
194211 'centralauth-admin-none-selected' =>
195212 'Es wurden keine zu ändernden Benutzerkonten ausgewählt.',
196 -
197 - // Info panel in preferences
198 - 'centralauth-globalid' =>
199 - 'ID der zusammengeführten Benutzerkonten:',
200 -
201213 );
202214
203215 // Based on r18928
——@@ -283,10 +295,6 @@
284296 'Séparer sélection',
285297 'centralauth-admin-merge' =>
286298 'Réunir sélection',
287 -
288 - // Info panel in preferences
289 - 'centralauth-globalid' =>
290 - 'ID compte unifié :',
291299 );
292300
293301 $wgCentralAuthMessages['he'] = array(
——@@ -333,9 +341,6 @@
334342 'centralauth-admin-merge' => 'מיזוג החשבונות שנבחרו',
335343 'centralauth-admin-bad-input' => 'בחירה שגויה של מיזוג',
336344 'centralauth-admin-none-selected' => 'לא נבחרו חשבונות לשינוי.',
337 -
338 - # Info panel in preferences
339 - 'centralauth-globalid' => 'מספר משתמש ממוזג:',
340345 );
341346
342347 $wgCentralAuthMessages['id'] = array(
——@@ -422,10 +427,6 @@
423428 'Pilihan penggabungan tak sah',
424429 'centralauth-admin-none-selected' =>
425430 'Tidak ada akun yang dipilih untuk diubah.',
426 -
427 - // Info panel in preferences
428 - 'centralauth-globalid' =>
429 - 'ID akun gabungan:',
430431 );
431432
432433 $wgCentralAuthMessages['it'] = array(
——@@ -585,10 +586,6 @@
586587 'Талғанғанды түйістірілеме',
587588 'centralauth-admin-merge' =>
588589 'Талғанғанды түйістіріле',
589 -
590 - // Info panel in preferences
591 - 'centralauth-globalid' =>
592 - 'Бірегейленген тіркелгі нөмірі:',
593590 );
594591
595592 $wgCentralAuthMessages['kk-tr'] = array(
——@@ -675,10 +672,6 @@
676673 'Talğanğandı tüýistirileme',
677674 'centralauth-admin-merge' =>
678675 'Talğanğandı tüýistirile',
679 -
680 - // Info panel in preferences
681 - 'centralauth-globalid' =>
682 - 'Biregeýlengen tirkelgi nömiri:',
683676 );
684677
685678 $wgCentralAuthMessages['kk-cn'] = array(
——@@ -765,10 +758,6 @@
766759 'تالعانعاندى تٷيٸستٸرٸلەمە',
767760 'centralauth-admin-merge' =>
768761 'تالعانعاندى تٷيٸستٸرٸلە',
769 -
770 - // Info panel in preferences
771 - 'centralauth-globalid' =>
772 - 'بٸرەگەيلەنگەن تٸركەلگٸ نٶمٸرٸ:',
773762 );
774763
775764 $wgCentralAuthMessages['kk'] = $wgCentralAuthMessages['kk-kz'];
——@@ -868,7 +857,6 @@
869858 'centralauth-admin-merge' => 'Smelt sammen valgte',
870859 'centralauth-admin-bad-input' => 'Ugyldig flettingsvalg',
871860 'centralauth-admin-none-selected' => 'Ingen kontoer valgt for endring.',
872 - 'centralauth-globalid' => 'Sammensmeltet konto-ID:',
873861 );
874862
875863 $wgCentralAuthMessages['oc'] = array(
——@@ -899,7 +887,6 @@
900888 'centralauth-admin-permission' => 'Sols los stewards pòdon acampar los comptes d’autras personas a lor plaça.',
901889 'centralauth-admin-unmerge' => 'Separar la seleccion',
902890 'centralauth-admin-merge' => 'Acampar la seleccion',
903 - 'centralauth-globalid' => 'ID compte unificat:',
904891 );
905892
906893 $wgCentralAuthMessages['ru'] = array(
——@@ -986,10 +973,6 @@
987974 'Разделить выбранные',
988975 'centralauth-admin-merge' =>
989976 'Объединить выбранные',
990 -
991 - // Info panel in preferences
992 - 'centralauth-globalid' =>
993 - 'Идентификатор единой учётной записи:',
994977 );
995978
996979 $wgCentralAuthMessages['sk'] = array(
——@@ -1022,7 +1005,6 @@
10231006 'centralauth-admin-merge' => 'Zlúčenie zvolených',
10241007 'centralauth-admin-bad-input' => 'Neplatný výber pre zlúčenie',
10251008 'centralauth-admin-none-selected' => 'Neboli vybrané účty, ktoré sa majú zmeniť.',
1026 - 'centralauth-globalid' => 'ID zjednoteného účtu:',
10271009 );
10281010
10291011 $wgCentralAuthMessages['sr-ec'] = array(
——@@ -1109,10 +1091,6 @@
11101092 'Одвоји селектоване',
11111093 'centralauth-admin-merge' =>
11121094 'Споји селектоване',
1113 -
1114 - // Info panel in preferences
1115 - 'centralauth-globalid' =>
1116 - 'Јединствен ID налога:',
11171095 );
11181096
11191097 $wgCentralAuthMessages['sr-el'] = array(
——@@ -1199,10 +1177,6 @@
12001178 'Odvoji selektovane',
12011179 'centralauth-admin-merge' =>
12021180 'Spoji selektovane',
1203 -
1204 - // Info panel in preferences
1205 - 'centralauth-globalid' =>
1206 - 'Jedinstven ID naloga:',
12071181 );
12081182
12091183 $wgCentralAuthMessages['pt'] = array(
——@@ -1293,10 +1267,6 @@
12941268 'Selecção para fusão inválida',
12951269 'centralauth-admin-none-selected' =>
12961270 'Não foram seleccionadas contas a serem modificadas.',
1297 -
1298 - // Info panel in preferences
1299 - 'centralauth-globalid' =>
1300 - 'ID de conta unificada:',
13011271 );
13021272
13031273 $wgCentralAuthMessages['pt-br'] = array(
——@@ -1388,10 +1358,6 @@
13891359 'Selecção para fusão inválida',
13901360 'centralauth-admin-none-selected' =>
13911361 'Não foram seleccionadas contas a serem modificadas.',
1392 -
1393 - // Info panel in preferences
1394 - 'centralauth-globalid' =>
1395 - 'ID de conta unificada:',
13961362 );
13971363
13981364 $wgCentralAuthMessages['de'] = array(
——@@ -1501,7 +1467,6 @@
15021468 'centralauth-admin-permission' => 'Nu bisa ngahijikeun rekening batur mah ngan steward.',
15031469 'centralauth-admin-unmerge' => 'Pisahkeun nu dipilih',
15041470 'centralauth-admin-merge' => 'Hijikeun nu dipilih',
1505 - 'centralauth-globalid' => 'ID rekening gabungan:',
15061471 );
15071472
15081473 $wgCentralAuthMessages['zh-cn'] = array(

Status & tagging log