| Index: branches/new-installer/phase3/maintenance/language/messages.inc |
| — | — | @@ -3285,6 +3285,7 @@ |
| 3286 | 3286 | 'config-ns-generic', |
| 3287 | 3287 | 'config-ns-site-name', |
| 3288 | 3288 | 'config-ns-other', |
| | 3289 | + 'config-ns-other-default', |
| 3289 | 3290 | 'config-project-namespace-help', |
| 3290 | 3291 | 'config-ns-invalid', |
| 3291 | 3292 | 'config-admin-default-username', |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -1087,6 +1087,11 @@ |
| 1088 | 1088 | $js = 'enableControlArray("config__NamespaceType_other", ["config_wgMetaNamespace"])'; |
| 1089 | 1089 | $attribs = array( 'onclick' => $js ); |
| 1090 | 1090 | |
| | 1091 | + // Set wgMetaNamespace to something valid before we show the form. |
| | 1092 | + // $wgMetaNamespace defaults to $wgSiteName which is 'MediaWiki' |
| | 1093 | + $metaNS = $this->getVar( 'wgMetaNamespace' ); |
| | 1094 | + $this->setVar( 'wgMetaNamespace', wfMsgNoTrans( 'config-ns-other-default' ) ); |
| | 1095 | + |
| 1091 | 1096 | $this->addHTML( |
| 1092 | 1097 | $this->parent->getTextBox( array( |
| 1093 | 1098 | 'var' => 'wgSitename', |
| — | — | @@ -1143,6 +1148,9 @@ |
| 1144 | 1149 | ) ) |
| 1145 | 1150 | ); |
| 1146 | 1151 | |
| | 1152 | + // Restore the default value |
| | 1153 | + $this->setVar( 'wgMetaNamespace', $metaNS ); |
| | 1154 | + |
| 1147 | 1155 | $this->endForm(); |
| 1148 | 1156 | return 'output'; |
| 1149 | 1157 | } |
| Index: branches/new-installer/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4472,6 +4472,7 @@ |
| 4473 | 4473 | 'config-ns-generic' => 'Project', |
| 4474 | 4474 | 'config-ns-site-name' => 'Same as the wiki name: $1', |
| 4475 | 4475 | 'config-ns-other' => 'Other (please specify)', |
| | 4476 | +'config-ns-other-default' => 'MyWiki', |
| 4476 | 4477 | 'config-project-namespace-help' => 'Following Wikipedia\'s example, many wikis keep their policy and help pages separate from their content pages, in a "<strong>project namespace</strong>". |
| 4477 | 4478 | All page titles in this namespace start with a certain prefix, which you can specify here. |
| 4478 | 4479 | Traditionally, this prefix is derived from the name of the wiki, but it cannot contain punctuation characters such as # or :', |