Index: trunk/phase3/includes/installer/Installer.i18n.php |
— | — | @@ -308,7 +308,6 @@ |
309 | 309 | Traditionally, this prefix is derived from the name of the wiki, but it cannot contain punctuation characters such as "#" or ":".', |
310 | 310 | 'config-ns-invalid' => 'The specified namespace "<nowiki>$1</nowiki>" is invalid. |
311 | 311 | Specify a different project namespace', |
312 | | - 'config-admin-default-username' => 'WikiSysop', |
313 | 312 | 'config-admin-box' => 'Administrator account', |
314 | 313 | 'config-admin-name' => 'Your name:', |
315 | 314 | 'config-admin-password' => 'Password:', |
— | — | @@ -669,7 +668,6 @@ |
670 | 669 | Dit voorvoegsel wordt meestal afgeleid van de naam van de wiki, maar het kan geen bijzondere tekens bevatten als \"#\" of \":\".", |
671 | 670 | 'config-ns-invalid' => 'De aangegeven naamruimte "<nowiki>$1</nowiki>" is ongeldig. |
672 | 671 | Geef een andere naamruimte op.', |
673 | | - 'config-admin-default-username' => 'WikiBeheerder', |
674 | 672 | 'config-admin-box' => 'Beheerdersaccount', |
675 | 673 | 'config-admin-name' => 'Uw naam:', |
676 | 674 | 'config-admin-password' => 'Wachtwoord:', |
— | — | @@ -777,5 +775,4 @@ |
778 | 776 | $messages['ru'] = array( |
779 | 777 | 'config-title' => 'Установка MediaWiki $1', |
780 | 778 | 'config-page-language' => 'Язык', |
781 | | - 'config-admin-default-username' => 'ВикиАдминистратор', |
782 | 779 | ); |
Index: trunk/phase3/includes/installer/WebInstaller.php |
— | — | @@ -930,10 +930,6 @@ |
931 | 931 | } |
932 | 932 | if ( isset( $languages[$contLang] ) ) { |
933 | 933 | $this->setVar( 'wgLanguageCode', $contLang ); |
934 | | - if ( $this->getVar( '_AdminName' ) === null ) { |
935 | | - // Load localised sysop username in *content* language |
936 | | - $this->setVar( '_AdminName', wfMsgForContent( 'config-admin-default-username' ) ); |
937 | | - } |
938 | 934 | } |
939 | 935 | return 'continue'; |
940 | 936 | } |
Index: trunk/phase3/includes/installer/Installer.php |
— | — | @@ -59,7 +59,7 @@ |
60 | 60 | '_SameAccount' => true, |
61 | 61 | '_CreateDBAccount' => false, |
62 | 62 | '_NamespaceType' => 'site-name', |
63 | | - '_AdminName' => null, // will be set later, when the user selects language |
| 63 | + '_AdminName' => '', // will be set later, when the user selects language |
64 | 64 | '_AdminPassword' => '', |
65 | 65 | '_AdminPassword2' => '', |
66 | 66 | '_AdminEmail' => '', |