| Index: branches/new-installer/phase3/maintenance/language/messages.inc |
| — | — | @@ -3285,6 +3285,7 @@ |
| 3286 | 3286 | 'config-ns-other', |
| 3287 | 3287 | 'config-project-namespace-help', |
| 3288 | 3288 | 'config-ns-invalid', |
| | 3289 | + 'config-admin-default-username', |
| 3289 | 3290 | 'config-admin-box', |
| 3290 | 3291 | 'config-admin-name', |
| 3291 | 3292 | 'config-admin-password', |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -853,6 +853,10 @@ |
| 854 | 854 | } |
| 855 | 855 | if ( isset( $languages[$contLang] ) ) { |
| 856 | 856 | $this->setVar( 'wgLanguageCode', $contLang ); |
| | 857 | + if ( $this->getVar( '_AdminName' ) === null ) { |
| | 858 | + // Load localised sysop username in *content* language |
| | 859 | + $this->setVar( '_AdminName', wfMsgReal( 'config-admin-default-username', array(), false, $contLang ) ); |
| | 860 | + } |
| 857 | 861 | } |
| 858 | 862 | return 'continue'; |
| 859 | 863 | } |
| Index: branches/new-installer/phase3/includes/installer/Installer.php |
| — | — | @@ -59,7 +59,7 @@ |
| 60 | 60 | '_SameAccount' => true, |
| 61 | 61 | '_CreateDBAccount' => false, |
| 62 | 62 | '_NamespaceType' => 'site-name', |
| 63 | | - '_AdminName' => '', |
| | 63 | + '_AdminName' => null, // will be set later, when the user selects language |
| 64 | 64 | '_AdminPassword' => '', |
| 65 | 65 | '_AdminPassword2' => '', |
| 66 | 66 | '_AdminEmail' => '', |
| Index: branches/new-installer/phase3/languages/messages/MessagesRu.php |
| — | — | @@ -3344,6 +3344,10 @@ |
| 3345 | 3345 | 'unknown_extension_tag' => 'Неизвестный тег дополнения «$1»', |
| 3346 | 3346 | 'duplicate-defaultsort' => 'Внимание. Ключ сортировки по умолчанию «$2» переопределяет прежний ключ сортировки по умолчанию «$1».', |
| 3347 | 3347 | |
| | 3348 | +# Installer |
| | 3349 | + |
| | 3350 | +'config-admin-default-username' => 'ВикиАдминистратор', |
| | 3351 | + |
| 3348 | 3352 | # Special:Version |
| 3349 | 3353 | 'version' => 'Версия MediaWiki', |
| 3350 | 3354 | 'version-extensions' => 'Установленные расширения', |
| Index: branches/new-installer/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4348,6 +4348,7 @@ |
| 4349 | 4349 | All page titles in this namespace start with a certain prefix, which you can specify here. |
| 4350 | 4350 | Traditionally, this prefix is derived from the name of the wiki, but it cannot contain punctuation characters such as # or :', |
| 4351 | 4351 | 'config-ns-invalid' => 'The specified namespace "<nowiki>$1</nowiki>" is invalid. Please specify a different project namespace', |
| | 4352 | +'config-admin-default-username' => 'WikiSysop', |
| 4352 | 4353 | 'config-admin-box' => 'Administrator account', |
| 4353 | 4354 | 'config-admin-name' => 'Your name:', |
| 4354 | 4355 | 'config-admin-password' => 'Password:', |