r65132 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r65131‎ \| r65132 \| r65133 >
Date:	16:23, 16 April 2010
Author:	siebrand
Status:	resolved (Comments)
Tags:
Comment:	Tweak messages
Modified paths:	/branches/new-installer/phase3/includes/installer/Installer.i18n.php (modified) (history) /branches/new-installer/phase3/includes/installer/WebInstaller.php (modified) (history)

Diff [purge]

Index: branches/new-installer/phase3/includes/installer/Installer.i18n.php
—	—	@@ -30,7 +30,7 @@
31	31	'config-back' => '← Back',
32	32	'config-continue' => 'Continue →',
33	33	'config-page-language' => 'Language',
34		~~- 'config-page-welcome' => 'Welcome',~~
	34	+ 'config-page-welcome' => 'Welcome to MediaWiki!',
35	35	'config-page-dbconnect' => 'Connect to database',
36	36	'config-page-upgrade' => 'Upgrade existing',
37	37	'config-page-dbsettings' => 'Database settings',
—	—	@@ -45,9 +45,7 @@
46	46	'config-page-upgradedoc' => 'Upgrading',
47	47	'config-help-restart' => 'Do you want to clear all saved data that you have entered and restart the installation process?',
48	48	'config-restart' => 'Yes, restart it',
49		~~- 'config-welcome' => 'Welcome to MediaWiki!~~
50		-
51		~~-=== Technical data ===~~
	49	+ 'config-welcome' => '=== Technical data ===
52	50	Below is some technical data that you can provide if you need help during installation.',
53	51	'config-copyright' => "=== Copyright and Terms ===
54	52
—	—	@@ -68,7 +66,7 @@
69	67	You can install MediaWiki.</span>', // FIXME: take span out of message.
70	68	'config-env-bad' => 'The environment has been checked.
71	69	You cannot install MediaWiki.',
72		~~- 'config-env-php' => 'PHP $1 installed',~~
	70	+ 'config-env-php' => 'PHP $1 installed.',
73	71	'config-env-latest-ok' => 'You are installing the latest version of Mediawiki.',
74	72	'config-env-latest-new' => "'''Note:''' You are installing a development version of Mediawiki.",
75	73	'config-env-latest-old' => "'''Warning:''' You are installing an outdated version of Mediawiki.",
—	—	@@ -81,7 +79,7 @@
82	80	If you are on shared hosting, ask your hosting provider to install a suitable database driver.
83	81	If you compiled PHP yourself, reconfigure it with a database client enabled, for example using <code>./configure --with-mysql</code>.
84	82	If you installed PHP from a Debian or Ubuntu package, then you also need install the php5-mysql module.',
85		~~- 'config-have-db' => 'Found database drivers: $1',~~
	83	+ 'config-have-db' => 'Found database drivers: $1.',
86	84	'config-register-globals' => "'''Warning: PHP's <code>[http://php.net/register_globals register_globals]</code> option is enabled.'''
87	85	'''Disable it if you can.'''
88	86	MediaWiki will work, but your server is exposed to potential security vulnerabilities.",
—	—	@@ -126,8 +124,8 @@
127	125	Image thumbnailing will be enabled if you enable uploads.',
128	126	'config-no-scaling' => 'Could not find GD library or ImageMagick.
129	127	Image thumbnailing will be disabled.',
130		~~- 'config-dir' => 'Installation directory: <code>$1</code>',~~
131		~~- 'config-uri' => 'Script URI path: <code>$1</code>',~~
	128	+ 'config-dir' => 'Installation directory: <code>$1</code>.',
	129	+ 'config-uri' => 'Script URI path: <code>$1</code>.',
132	130	'config-no-uri' => "'''Error:''' Could not determine the current URI.
133	131	Installation aborted.",
134	132	'config-dir-not-writable' => "'''Error:''' Cannot write config file.
—	—	@@ -136,7 +134,7 @@
137	135	To make the directory writable on a Unix/Linux system:
138	136	<pre>cd $1
139	137	chmod a+w config</pre>",
140		~~- 'config-file-extension' => 'Installing MediaWiki with <code>$1</code> file extensions',~~
	138	+ 'config-file-extension' => 'Installing MediaWiki with <code>$1</code> file extensions.',
141	139	'config-shell-locale' => 'Detected shell locale "$1"',
142	140	'config-uploads-safe' => 'Default uploads directory is safe from arbitrary scripts execution.',
143	141	'config-uploads-not-safe' => "'''Warning:''' Your default uploads directory <code>$1</code> is vulnerable to arbitrary scripts execution.
—	—	@@ -238,14 +236,14 @@
239	237	'config-db-web-create' => 'Create the account if it does not already exist',
240	238	'config-db-web-no-create-privs' => 'The account you specified for installation does not have enough privileges to create an account.
241	239	The account you specify here must already exist.',
242		~~- 'config-mysql-engine' => 'Storage engine',~~
	240	+ 'config-mysql-engine' => 'Storage engine:',
243	241	'config-mysql-innodb' => 'InnoDB',
244	242	'config-mysql-myisam' => 'MyISAM',
245	243	'config-mysql-engine-help' => "'''InnoDB''' is almost always the best option, since it has good concurrency support.
246	244
247	245	'''MyISAM''' may be faster in single-user or read-only installations.
248	246	MyISAM databases tend to get corrupted more often than InnoDB databases.",
249		~~- 'config-mysql-charset' => 'Database character set',~~
	247	+ 'config-mysql-charset' => 'Database character set:',
250	248	'config-mysql-binary' => 'Binary',
251	249	'config-mysql-utf8' => 'UTF-8',
252	250	'config-mysql-charset-help' => "In '''binary mode''', MediaWiki stores UTF-8 text to the database in binary fields.
—	—	@@ -255,7 +253,7 @@
256	254	'config-site-name' => 'Name of wiki:',
257	255	'config-site-name-help' => "This will appear in the browser's title bar and various other places.",
258	256	'config-site-name-blank' => 'Enter a site name.',
259		~~- 'config-project-namespace' => 'Project namespace',~~
	257	+ 'config-project-namespace' => 'Project namespace:',
260	258	'config-ns-generic' => 'Project',
261	259	'config-ns-site-name' => 'Same as the wiki name: $1',
262	260	'config-ns-other' => 'Other (specify)',
—	—	@@ -287,25 +285,25 @@
288	286	You can now skip the remaining configuration and install the wiki right now.',
289	287	'config-optional-continue' => 'Ask me more questions.',
290	288	'config-optional-skip' => "I'm bored already, just install the wiki.",
291		~~- 'config-profile' => 'User rights profile',~~
	289	+ 'config-profile' => 'User rights profile:',
292	290	'config-profile-wiki' => 'Traditional wiki',
293	291	'config-profile-no-anon' => 'Account creation required',
294		~~- 'config-profile-fishbowl' => 'Fishbowl',~~
	292	+ 'config-profile-fishbowl' => 'Authorized editors only',
295	293	'config-profile-private' => 'Private wiki',
296	294	'config-profile-help' => "Wikis work best when you let as many people edit them as possible.
297		~~-In MediaWiki, it's easy to review the recent changes, and to revert any damage that is done by naïve or malicious users.~~
	295	+In MediaWiki, it is easy to review the recent changes, and to revert any damage that is done by naive or malicious users.
298	296
299		~~-However, many people have found MediaWiki to be useful in a wide variety of roles, and sometimes it's not easy to convince everyone around you of the benefits of the wiki way.~~
300		~~-So we give you the choice.~~
	297	+However, many have found MediaWiki to be useful in a wide variety of roles, and sometimes it is not easy to convince everyone of the benefits of the wiki way.
	298	+So you have the the choice.
301	299
302	300	A '''traditional wiki''' allows anyone to edit, without even logging in.
303		~~-Some people prefer a wiki with '''account creation required''', since this provides extra accountability (but may deter casual contributors).~~
	301	+A wiki with '''account creation required''' provides extra accountability, but may deter casual contributors.
304	302
305		~~-A '''fishbowl''' only allows approved users to edit, but the public can view the pages, including history.~~
	303	+The '''authorized editors only''' scenario allows approved users to edit, but the public can view the pages, including history.
306	304	A '''private wiki''' only allows approved users to view pages, with the same group allowed to edit.
307	305
308	306	More complex user rights configurations are available after installation, see the [http://www.mediawiki.org/wiki/Manual:User_rights relevant manual entry].",
309		~~- 'config-license' => 'Copyright and license',~~
	307	+ 'config-license' => 'Copyright and license:',
310	308	'config-license-none' => 'No license footer',
311	309	'config-license-gfdl-old' => 'GNU Free Documentation License 1.2 or later',
312	310	'config-license-gfdl-current' => 'GNU Free Documentation License 1.3 or later',
—	—	@@ -358,7 +356,7 @@
359	357	'config-cc-again' => 'Pick again...',
360	358	'config-cc-not-chosen' => 'Choose which Creative Commons license you want and click "proceed".',
361	359	'config-advanced-settings' => 'Advanced configuration',
362		~~- 'config-cache-options' => 'Settings for object caching',~~
	360	+ 'config-cache-options' => 'Settings for object caching:',
363	361	'config-cache-help' => 'Object caching is used to improve the speed of MediaWiki by caching frequently used data.
364	362	Medium to large sites are highly encouraged to enable this, and small sites will see benefits as well.',
365	363	'config-cache-none' => 'No caching.
—	—	@@ -366,8 +364,8 @@
367	365	'config-cache-accel' => 'PHP object caching (APC, eAccelerator or XCache)',
368	366	'config-cache-memcached' => 'Use Memcached (requires additional setup and configuration)',
369	367	'config-cache-db' => 'Cache data into the database',
370		~~- 'config-cache-anything' => 'MediaWiki will attempt to cache data anywhere possible, except in Memcached, unless indicated explicitely.',~~
371		~~- 'config-memcached-servers' => 'Memcached servers',~~
	368	+ 'config-cache-anything' => 'MediaWiki will attempt to cache data anywhere possible, except in Memcached, unless indicated explicitely',
	369	+ 'config-memcached-servers' => 'Memcached servers:',
372	370	'config-memcached-help' => 'List of IP addresses to use for Memcached.
373	371	Should be separated with commas and specify the port to be used (for example: 1.2.3.4:56, 7.8.9.10:11).',
374	372	'config-extensions' => 'Extensions',
—	—	@@ -424,7 +422,7 @@
425	423	'config-back' => '← Terug',
426	424	'config-continue' => 'Doorgaan →',
427	425	'config-page-language' => 'Taal',
428		~~- 'config-page-welcome' => 'Welkom',~~
	426	+ 'config-page-welcome' => 'Welkom bij MediaWiki!',
429	427	'config-page-dbconnect' => 'Verbinding maken met database',
430	428	'config-page-upgrade' => 'Bestaande bijwerken',
431	429	'config-page-dbsettings' => 'Databaseinstellingen',
—	—	@@ -439,16 +437,14 @@
440	438	'config-page-upgradedoc' => 'Bijwerken',
441	439	'config-help-restart' => 'Wilt u alle opgeslagen gegevens die u hebt ingevoerd wissen en het installatieproces opnieuw starten?',
442	440	'config-restart' => 'Ja, opnieuw starten',
443		~~- 'config-welcome' => 'Welkom bij MediaWiki!~~
444		-
445		~~-===Technische gegevens===~~
	441	+ 'config-welcome' => '===Technische gegevens===
446	442	Hieronder staan een aantal technische gegevens die u kunt aanleveren als u ondersteuning nodig hebt bij de installatie.',
447	443	'config-authors' => 'MediaWiki is Copyright © 2001-2010 door Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz, Andrew Garrett, Raimond Spekking, Alexandre Emsenhuber, Siebrand Mazeland, Chad Horohoe en anderen.',
448	444	'config-env-good' => 'De omgeving is gecontroleerd.
449	445	U kunt MediaWiki installeren.',
450	446	'config-env-bad' => 'De omgeving is gecontroleerd.
451	447	U kunt MediaWiki niet installeren.',
452		~~- 'config-env-php' => 'PHP $1 is geïnstalleerd',~~
	448	+ 'config-env-php' => 'PHP $1 is geïnstalleerd.',
453	449	'config-env-latest-ok' => 'U bent bezig de meest recente versie van MediaWiki te installeren.',
454	450	'config-env-latest-new' => "'''Let op:''' U bent bezig een ontwikkelversie van MediaWiki te installeren.",
455	451	'config-env-latest-old' => "'''Waarschuwing:''' U bent bezig een verouderde versie van MediaWiki te installeren.",
—	—	@@ -460,7 +456,7 @@
461	457
462	458	Als u op een gedeelde omgeving zit, vraag dan uw hostingprovider een geschikte databasedriver te installeren.
463	459	Als u PHP zelf hebt gecompileerd, wijzig dan uw instellingen zodat een databasedriver wordt geactiveerd, bijvoorbeeld via <code>./configure --with-mysql</code>.',
464		~~- 'config-have-db' => 'Gevonden databasedrivers: $1',~~
	460	+ 'config-have-db' => 'Gevonden databasedrivers: $1.',
465	461	'config-register-globals' => "'''Waarschuwing: De PHP-optie <code>[http://php.net/register_globals register_globals]</code> is ingeschakeld.'''
466	462	'''Schakel deze uit als dat mogelijk is.'''
467	463	MediaWiki kan ermee werken, maar uw server is dan meer kwetsbaar voor beveiligingslekken.",
—	—	@@ -503,8 +499,8 @@
504	500	Het aanmaken van miniaturen van afbeeldingen wordt ingeschakeld als u uploaden inschakelt.',
505	501	'config-no-scaling' => 'De GD-bibliotheek en ImageMagick zijn niet aangetroffen.
506	502	Het maken van miniaturen van afbeeldingen wordt uitgeschakeld.',
507		~~- 'config-dir' => 'Installatiemap: <code>$1</code>',~~
508		~~- 'config-uri' => 'Script URI-pad: <code>$1</code>',~~
	503	+ 'config-dir' => 'Installatiemap: <code>$1</code>.',
	504	+ 'config-uri' => 'Script URI-pad: <code>$1</code>.',
509	505	'config-no-uri' => "'''Fout:''' de huidige URI kon niet vastgesteld worden.
510	506	De installatie is afgebroken.",
511	507	'config-dir-not-writable' => "'''Fout:''' het bestand met instellingen kon niet weggeschreven worden.
—	—	@@ -609,20 +605,20 @@
610	606	'config-db-web-create' => 'Maak de gebruiker aan als deze nog niet bestaat',
611	607	'config-db-web-no-create-privs' => 'De gebruiker die u hebt opgegeven voor de installatie heeft niet voldoende rechten om een gebruiker aan te maken.
612	608	De gebruiker die u hier opgeeft moet al bestaan.',
613		~~- 'config-mysql-engine' => 'Opslagmethode',~~
	609	+ 'config-mysql-engine' => 'Opslagmethode:',
614	610	'config-mysql-innodb' => 'InnoDB',
615	611	'config-mysql-myisam' => 'MyISAM',
616	612	'config-mysql-engine-help' => "'''InnoDB''' is vrijwel altijd de beste instelling, omdat deze goed omgaat met meerdere verzoeken tegelijkertijd.
617	613
618	614	'''MyISAM''' is bij een zeer beperkt aantal gebruikers mogelijk sneller, of als de wiki alleen-lezen is.
619	615	MyISAM-databases raken vaker corrupt dan InnoDB-databases.",
620		~~- 'config-mysql-charset' => 'Tekenset voor de database',~~
	616	+ 'config-mysql-charset' => 'Tekenset voor de database:',
621	617	'config-mysql-binary' => 'Binair',
622	618	'config-mysql-utf8' => 'UTF-8',
623	619	'config-site-name' => 'Naam van de wiki:',
624	620	'config-site-name-help' => 'Deze naam verschijnt in de titelbalk van browsers en op andere plaatsen.',
625	621	'config-site-name-blank' => 'Geef een naam op voor de site.',
626		~~- 'config-project-namespace' => 'Projectnaamruimte',~~
	622	+ 'config-project-namespace' => 'Projectnaamruimte:',
627	623	'config-ns-generic' => 'Project',
628	624	'config-ns-site-name' => 'Zelfde als de wiki: $1',
629	625	'config-ns-other' => 'Andere (geen aan welke)',
—	—	@@ -654,11 +650,11 @@
655	651	Als u wilt kunt u de overige instellingen overslaan en de wiki nu installeren.',
656	652	'config-optional-continue' => 'Meer vragen',
657	653	'config-optional-skip' => 'Installeer de wiki',
658		~~- 'config-profile' => 'Gebruikersrechtenprofiel',~~
	654	+ 'config-profile' => 'Gebruikersrechtenprofiel:',
659	655	'config-profile-wiki' => 'Traditionele wiki',
660	656	'config-profile-no-anon' => 'Gebruiker aanmaken verplicht',
661	657	'config-profile-private' => 'Privéwiki',
662		~~- 'config-license' => 'Auteursrechten en licentie',~~
	658	+ 'config-license' => 'Auteursrechten en licentie:',
663	659	'config-license-none' => 'Geen licentie in de voettekst',
664	660	'config-license-gfdl-old' => 'GNU Free Documentation License 1.2 of hoger',
665	661	'config-license-gfdl-current' => 'GNU Free Documentation License 1.3 of hoger',
—	—	@@ -697,7 +693,7 @@
698	694	Voer de licentie handmatig in.',
699	695	'config-cc-not-chosen' => 'Kies alstublieft de Creative Commons-licentie die u wilt gebruiken en klik op "doorgaan".',
700	696	'config-advanced-settings' => 'Gevorderde instellingen',
701		~~- 'config-cache-options' => 'Instellingen voor het cachen van objecten',~~
	697	+ 'config-cache-options' => 'Instellingen voor het cachen van objecten:',
702	698	'config-cache-help' => 'Het cachen van objecten wordt gebruikt om de snelheid van MediaWiki te verbeteren door vaak gebruikte gegevens te bewaren.
703	699	Middelgrote tot grote websites wordt geadviseerd dit in te schakelen en ook kleine sites merken de voordelen.',
704	700	'config-cache-none' => 'Niets cachen.
—	—	@@ -705,8 +701,8 @@
706	702	'config-cache-accel' => 'Cachen van objecten via PHP (APC, eAccelerator or XCache)',
707	703	'config-cache-memcached' => 'Memcached gebruiken (dit vereist aanvullende instellingen)',
708	704	'config-cache-db' => 'Gegevens cachen in de database',
709		~~- 'config-cache-anything' => 'MediaWiki zal proberen de gegevens te cachen waar mogelijk, behalve in Memcached, tenzij expliciet aangegeven.',~~
710		~~- 'config-memcached-servers' => 'Memcachedservers',~~
	705	+ 'config-cache-anything' => 'MediaWiki zal proberen de gegevens te cachen waar mogelijk, behalve in Memcached, tenzij expliciet aangegeven',
	706	+ 'config-memcached-servers' => 'Memcachedservers:',
711	707	'config-memcached-help' => "Lijst met IP-adressen te gebruiken voor Memcached.
712	708	Deze moeten worden gescheiden met komma's en geef de poort op die moet worden gebruikt (bijvoorbeeld: 1.2.3.4:56, 7.8.9.10:11).",
713	709	'config-extensions' => 'Uitbreidingen',
Index: branches/new-installer/phase3/includes/installer/WebInstaller.php
—	—	@@ -47,7 +47,7 @@
48	48	*/
49	49	var $happyPages;
50	50
51		- /**
	51	+ /**
52	52	* List of "skipped" pages. These are pages that will automatically continue
53	53	* to the next page on any GET request. To avoid breaking the "back" button,
54	54	* they need to be skipped during a back operation.
—	—	@@ -71,7 +71,7 @@
72	72	$this->request = $request;
73	73	}
74	74
75		- /**
	75	+ /**
76	76	* Main entry point.
77	77	* @param array $session Initial session array
78	78	* @return array New session array
—	—	@@ -242,7 +242,7 @@
243	243	private function getSessionSavePath() {
244	244	$path = ini_get( 'session.save_path' );
245	245	$path = ltrim( substr( $path, strrpos( $path, ';' ) ), ';');
246		-
	246	+
247	247	return $path;
248	248	}
249	249
—	—	@@ -383,7 +383,7 @@
384	384	$lastHappy = -1;
385	385	foreach ( $this->pageSequence as $id => $pageName ) {
386	386	$happy = !empty( $this->happyPages[$id] );
387		~~- $s .= $this->getPageListItem( $pageName,~~
	387	+ $s .= $this->getPageListItem( $pageName,
388	388	$happy \|\| $lastHappy == $id - 1, $currentPageName );
389	389	if ( $happy ) {
390	390	$lastHappy = $id;
—	—	@@ -394,8 +394,8 @@
395	395	$s .= $this->getPageListItem( $pageName, true, $currentPageName );
396	396	}
397	397	$s .= "</ul></div>\n". // end list pane
398		~~- "<div class=\"config-page\">\n" .~~
399		~~- Xml::element( 'h2', array(),~~
	398	+ "<div class=\"config-page\">\n" .
	399	+ Xml::element( 'h2', array(),
400	400	wfMsg( 'config-page-' . strtolower( $currentPageName ) ) );
401	401
402	402	$this->output->addHTMLNoFlush( $s );
—	—	@@ -413,8 +413,8 @@
414	414	if ( in_array( $currentPageName, $this->pageSequence ) ) {
415	415	$query['lastPage'] = $currentPageName;
416	416	}
417		~~- $link = Xml::element( 'a',~~
418		~~- array(~~
	417	+ $link = Xml::element( 'a',
	418	+ array(
419	419	'href' => $this->getUrl( $query )
420	420	),
421	421	$name
—	—	@@ -428,11 +428,11 @@
429	429	$s .= $link;
430	430	}
431	431	} else {
432		~~- $s .= Xml::element( 'span',~~
433		~~- array(~~
434		~~- 'class' => 'config-page-disabled'~~
435		~~- ),~~
436		~~- $name~~
	432	+ $s .= Xml::element( 'span',
	433	+ array(
	434	+ 'class' => 'config-page-disabled'
	435	+ ),
	436	+ $name
437	437	);
438	438	}
439	439	$s .= "</li>\n";
—	—	@@ -443,8 +443,8 @@
444	444	* Output some stuff after a page is finished
445	445	*/
446	446	function endPageWrapper() {
447		~~- $this->output->addHTMLNoFlush(~~
448		~~- "</div>\n" .~~
	447	+ $this->output->addHTMLNoFlush(
	448	+ "</div>\n" .
449	449	"<br style=\"clear:both\"/>\n" .
450	450	"</div>" );
451	451	}
—	—	@@ -472,16 +472,16 @@
473	473	* @param string $class Additional class name to add to the wrapper div
474	474	*/
475	475	function getInfoBox( $text, $icon = 'info-32.png', $class = false ) {
476		~~- $s =~~
	476	+ $s =
477	477	"<div class=\"config-info $class\">\n" .
478	478	"<div class=\"config-info-left\">\n" .
479		~~- Xml::element( 'img',~~
480		~~- array(~~
	479	+ Xml::element( 'img',
	480	+ array(
481	481	'src' => '../skins/common/images/' . $icon,
482	482	'alt' => wfMsg( 'config-information' ),
483	483	)
484		~~- ) . "\n" .~~
485		~~- "</div>\n" .~~
	484	+ ) . "\n" .
	485	+ "</div>\n" .
486	486	"<div class=\"config-info-right\">\n" .
487	487	$this->parse( $text ) . "\n" .
488	488	"</div>\n" .
—	—	@@ -503,8 +503,8 @@
504	504	$id = $this->helpId++;
505	505	$alt = wfMsg( 'help' );
506	506
507		~~- return~~
508		~~- "<div class=\"config-help-wrapper\">\n" .~~
	507	+ return
	508	+ "<div class=\"config-help-wrapper\">\n" .
509	509	"<div class=\"config-help-message\">\n" .
510	510	$html .
511	511	"</div>\n" .
—	—	@@ -534,14 +534,14 @@
535	535	function showMessage( $msg /, ... / ) {
536	536	$args = func_get_args();
537	537	array_shift( $args );
538		~~- $html = '<div class="config-message">' .~~
	538	+ $html = '<div class="config-message">' .
539	539	$this->parse( wfMsgReal( $msg, $args, false, false, false ) ) .
540	540	"</div>\n";
541	541	$this->output->addHTML( $html );
542	542	}
543	543
544	544	/**
545		~~- * Label a control by wrapping a config-input div around it and putting a~~
	545	+ * Label a control by wrapping a config-input div around it and putting a
546	546	* label before it
547	547	*/
548	548	function label( $msg, $forId, $contents ) {
—	—	@@ -554,10 +554,10 @@
555	555	if ( $forId ) {
556	556	$attributes['for'] = $forId;
557	557	}
558		~~- return~~
	558	+ return
559	559	"<div class=\"config-input\">\n" .
560		~~- Xml::tags( 'label',~~
561		~~- $attributes,~~
	560	+ Xml::tags( 'label',
	561	+ $attributes,
562	562	$labelText ) . "\n" .
563	563	$contents .
564	564	"</div>\n";
—	—	@@ -584,15 +584,15 @@
585	585	$params['attribs'] = array();
586	586	}
587	587	return
588		~~- $this->label(~~
589		~~- $params['label'],~~
	588	+ $this->label(
	589	+ $params['label'],
590	590	$params['controlName'],
591	591	Xml::input(
592	592	$params['controlName'],
593	593	30, // intended to be overridden by CSS
594	594	$params['value'],
595		~~- $params['attribs'] + array(~~
596		~~- 'id' => $params['controlName'],~~
	595	+ $params['attribs'] + array(
	596	+ 'id' => $params['controlName'],
597	597	'class' => 'config-input-text',
598	598	'tabindex' => $this->nextTabIndex()
599	599	)
—	—	@@ -648,10 +648,10 @@
649	649	} else {
650	650	$labelText = $this->parse( wfMsg( $params['label'] ) );
651	651	}
652		~~- return~~
	652	+ return
653	653	"<div class=\"config-input-check\">\n" .
654	654	"<label>\n" .
655		~~- Xml::check(~~
	655	+ Xml::check(
656	656	$params['controlName'],
657	657	$params['value'],
658	658	$params['attribs'] + array(
—	—	@@ -707,12 +707,12 @@
708	708	$id = $params['controlName'] . '_' . $value;
709	709	$itemAttribs['id'] = $id;
710	710	$itemAttribs['tabindex'] = $this->nextTabIndex();
711		~~- $s .=~~
712		~~- '<li>' .~~
	711	+ $s .=
	712	+ '<li>' .
713	713	Xml::radio( $params['controlName'], $value, $checked, $itemAttribs ) .
714	714	' ' .
715		~~- Xml::tags( 'label', array( 'for' => $id ), $this->parse(~~
716		~~- wfMsgNoTrans( $params['itemLabelPrefix'] . strtolower( $value ) )~~
	715	+ Xml::tags( 'label', array( 'for' => $id ), $this->parse(
	716	+ wfMsgNoTrans( $params['itemLabelPrefix'] . strtolower( $value ) )
717	717	) ) .
718	718	"</li>\n";
719	719	}
—	—	@@ -730,7 +730,7 @@
731	731
732	732	function showStatusError( $status ) {
733	733	$text = $status->getWikiText();
734		~~- $this->output->addWikiText(~~
	734	+ $this->output->addWikiText(
735	735	"<div class=\"config-message\">\n" .
736	736	$text .
737	737	"</div>"
—	—	@@ -800,13 +800,13 @@
801	801	}
802	802
803	803	function startForm() {
804		~~- $this->addHTML(~~
	804	+ $this->addHTML(
805	805	"<div class=\"config-section\">\n" .
806		~~- Xml::openElement(~~
807		~~- 'form',~~
808		~~- array(~~
809		~~- 'method' => 'post',~~
810		~~- 'action' => $this->parent->getUrl( array( 'page' => $this->getName() ) )~~
	806	+ Xml::openElement(
	807	+ 'form',
	808	+ array(
	809	+ 'method' => 'post',
	810	+ 'action' => $this->parent->getUrl( array( 'page' => $this->getName() ) )
811	811	)
812	812	) . "\n"
813	813	);
—	—	@@ -821,12 +821,12 @@
822	822	}
823	823	if ( $continue ) {
824	824	// Fake submit button for enter keypress
825		~~- $s .= Xml::submitButton( wfMsg( "config-$continue" ),~~
	825	+ $s .= Xml::submitButton( wfMsg( "config-$continue" ),
826	826	array( 'name' => "enter-$continue", 'style' => 'display:none' ) ) . "\n";
827	827	}
828	828	if ( $id !== 0 ) {
829		~~- $s .= Xml::submitButton( wfMsg( 'config-back' ),~~
830		~~- array(~~
	829	+ $s .= Xml::submitButton( wfMsg( 'config-back' ),
	830	+ array(
831	831	'name' => 'submit-back',
832	832	'tabindex' => $this->parent->nextTabIndex()
833	833	) ) . "\n";
—	—	@@ -886,7 +886,7 @@
887	887	if ( $this->parent->getSession( 'test' ) === null ) {
888	888	$requestTime = $r->getVal( 'LanguageRequestTime' );
889	889	if ( !$requestTime ) {
890		~~- // The most likely explanation is that the user was knocked back~~
	890	+ // The most likely explanation is that the user was knocked back
891	891	// from another page on POST due to session expiry
892	892	$msg = 'config-session-expired';
893	893	} elseif ( time() - $requestTime > $lifetime ) {
—	—	@@ -916,7 +916,7 @@
917	917	}
918	918
919	919	$this->parent->setSession( 'test', true );
920		-
	920	+
921	921	if ( !isset( $languages[$userLang] ) ) {
922	922	$userLang = $this->getVar( '_UserLang', 'en' );
923	923	}
—	—	@@ -924,14 +924,14 @@
925	925	$contLang = $this->getVar( 'wgLanguageCode', 'en' );
926	926	}
927	927	$this->startForm();
928		~~- $s =~~
	928	+ $s =
929	929	Xml::hidden( 'LanguageRequestTime', time() ) .
930	930	$this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang ) .
931	931	$this->parent->getHelpBox( 'config-your-language-help' ) .
932	932	$this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang ) .
933	933	$this->parent->getHelpBox( 'config-wiki-language-help' );
934	934
935		-
	935	+
936	936	$this->addHTML( $s );
937	937	$this->endForm();
938	938	}
—	—	@@ -942,7 +942,7 @@
943	943	function getLanguageSelector( $name, $label, $selectedCode ) {
944	944	global $wgDummyLanguageCodes;
945	945	$s = Xml::openElement( 'select', array( 'id' => $name, 'name' => $name ) ) . "\n";
946		-
	946	+
947	947	$languages = Language::getLanguageNames();
948	948	ksort( $languages );
949	949	$dummies = array_flip( $wgDummyLanguageCodes );
—	—	@@ -953,7 +953,6 @@
954	954	$s .= "\n</select>\n";
955	955	return $this->parent->label( $label, $name, $s );
956	956	}
957		-
958	957	}
959	958
960	959	class WebInstaller_Welcome extends WebInstallerPage {
—	—	@@ -994,7 +993,7 @@
995	994	$defaultType = $this->getVar( 'wgDBtype' );
996	995	foreach ( $this->parent->getVar( '_CompiledDBs' ) as $type ) {
997	996	$installer = $this->parent->getDBInstaller( $type );
998		~~- $types .=~~
	997	+ $types .=
999	998	'<li>' .
1000	999	Xml::radioLabel(
1001	1000	$installer->getReadableName(),
—	—	@@ -1006,7 +1005,7 @@
1007	1006	) .
1008	1007	"</li>\n";
1009	1008
1010		~~- $settings .=~~
	1009	+ $settings .=
1011	1010	Xml::openElement( 'div', array( 'id' => 'DB_wrapper_' . $type, 'class' => 'dbWrapper' ) ) .
1012	1011	Xml::element( 'h3', array(), wfMsg( 'config-header-' . $type ) ) .
1013	1012	$installer->getConnectForm() .
—	—	@@ -1014,7 +1013,7 @@
1015	1014	}
1016	1015	$types .= "</ul><br clear=\"left\"/>\n";
1017	1016
1018		~~- $this->addHTML(~~
	1017	+ $this->addHTML(
1019	1018	$this->parent->label( 'config-db-type', false, $types ) .
1020	1019	$settings
1021	1020	);
—	—	@@ -1049,7 +1048,7 @@
1050	1049	}
1051	1050	}
1052	1051
1053		~~- // wgDBtype is generally valid here because otherwise the previous page~~
	1052	+ // wgDBtype is generally valid here because otherwise the previous page
1054	1053	// (connect) wouldn't have declared its happiness
1055	1054	$type = $this->getVar( 'wgDBtype' );
1056	1055	$installer = $this->parent->getDBInstaller( $type );
—	—	@@ -1067,20 +1066,20 @@
1068	1067	}
1069	1068
1070	1069	$this->startForm();
1071		~~- $this->addHTML( $this->parent->getInfoBox(~~
	1070	+ $this->addHTML( $this->parent->getInfoBox(
1072	1071	wfMsgNoTrans( 'config-can-upgrade', $GLOBALS['wgVersion'] ) ) );
1073	1072	$this->endForm();
1074	1073	}
1075	1074
1076	1075	function showDoneMessage() {
1077	1076	$this->startForm();
1078		~~- $this->addHTML(~~
	1077	+ $this->addHTML(
1079	1078	$this->parent->getInfoBox(
1080		~~- wfMsgNoTrans( 'config-upgrade-done',~~
1081		~~- $GLOBALS['wgServer'] .~~
1082		~~- $this->getVar( 'wgScriptPath' ) . '/index' .~~
	1079	+ wfMsgNoTrans( 'config-upgrade-done',
	1080	+ $GLOBALS['wgServer'] .
	1081	+ $this->getVar( 'wgScriptPath' ) . '/index' .
1083	1082	$this->getVar( 'wgScriptExtension' )
1084		~~- ), 'tick-32.png'~~
	1083	+ ), 'tick-32.png'
1085	1084	)
1086	1085	);
1087	1086	$this->endForm( 'regenerate' );
—	—	@@ -1135,7 +1134,7 @@
1136	1135	$metaNS = $this->getVar( 'wgMetaNamespace' );
1137	1136	$this->setVar( 'wgMetaNamespace', wfMsgForContent( 'config-ns-other-default' ) );
1138	1137
1139		~~- $this->addHTML(~~
	1138	+ $this->addHTML(
1140	1139	$this->parent->getTextBox( array(
1141	1140	'var' => 'wgSitename',
1142	1141	'label' => 'config-site-name',
—	—	@@ -1180,7 +1179,7 @@
1181	1180	$this->parent->getHelpBox( 'config-subscribe-help' ) .
1182	1181	$this->parent->getFieldsetEnd() .
1183	1182	$this->parent->getInfoBox( wfMsg( 'config-almost-done' ) ) .
1184		~~- $this->parent->getRadioSet( array(~~
	1183	+ $this->parent->getRadioSet( array(
1185	1184	'var' => '_SkipOptional',
1186	1185	'itemLabelPrefix' => 'config-optional-',
1187	1186	'values' => array( 'continue', 'skip' )
—	—	@@ -1196,10 +1195,10 @@
1197	1196
1198	1197	function submit() {
1199	1198	$retVal = true;
1200		~~- $this->parent->setVarsFromRequest( array( 'wgSitename', '_NamespaceType',~~
1201		~~- '_AdminName', '_AdminPassword', '_AdminPassword2', '_AdminEmail',~~
	1199	+ $this->parent->setVarsFromRequest( array( 'wgSitename', '_NamespaceType',
	1200	+ '_AdminName', '_AdminPassword', '_AdminPassword2', '_AdminEmail',
1202	1201	'_Subscribe', '_SkipOptional' ) );
1203		-
	1202	+
1204	1203	// Validate site name
1205	1204	if ( strval( $this->getVar( 'wgSitename' ) ) === '' ) {
1206	1205	$this->parent->showError( 'config-site-name-blank' );
—	—	@@ -1275,8 +1274,8 @@
1276	1275	}
1277	1276	return $retVal;
1278	1277	}
	1278	+}
1279	1279
1280		-}
1281	1280	class WebInstaller_Options extends WebInstallerPage {
1282	1281	function execute() {
1283	1282	if ( $this->getVar( '_SkipOptional' ) == 'skip' ) {
—	—	@@ -1309,7 +1308,7 @@
1310	1309	) ) .
1311	1310	$this->getCCChooser() .
1312	1311	$this->parent->getHelpBox( 'config-license-help' ) .
1313		-
	1312	+
1314	1313	# E-mail
1315	1314	$this->parent->getFieldsetStart( 'config-email-settings' ) .
1316	1315	$this->parent->getCheckBox( array(
—	—	@@ -1366,14 +1365,14 @@
1367	1366	$this->addHTML( $this->parent->getFieldsetStart( 'config-upload-settings' ) );
1368	1367	if ( $this->getVar( '_UploadsAreSafe' ) ) {
1369	1368	$this->addHTML(
1370		~~- $this->parent->getCheckBox( array(~~
	1369	+ $this->parent->getCheckBox( array(
1371	1370	'var' => 'wgEnableUploads',
1372	1371	'label' => 'config-upload-enable',
1373	1372	'attribs' => array( 'class' => 'showHideRadio', 'rel' => 'uploadwrapper' ),
1374	1373	) ) .
1375	1374	$this->parent->getHelpBox( 'config-upload-help' ) .
1376	1375	'<div id="uploadwrapper" style="display: none;">' .
1377		~~- $this->parent->getTextBox( array(~~
	1376	+ $this->parent->getTextBox( array(
1378	1377	'var' => 'wgDeletedDirectory',
1379	1378	'label' => 'config-upload-deleted',
1380	1379	) ) .
—	—	@@ -1434,7 +1433,7 @@
1435	1434	) );
1436	1435	$styleUrl = $wgServer . dirname( dirname( $this->parent->getUrl() ) ) .
1437	1436	'/skins/common/config-cc.css';
1438		~~- $iframeUrl = 'http://creativecommons.org/license/?' .~~
	1437	+ $iframeUrl = 'http://creativecommons.org/license/?' .
1439	1438	wfArrayToCGI( array(
1440	1439	'partner' => 'MediaWiki',
1441	1440	'exit_url' => $exitUrl,
—	—	@@ -1445,7 +1444,7 @@
1446	1445	}
1447	1446
1448	1447	function getCCChooser() {
1449		~~- $iframeAttribs = array(~~
	1448	+ $iframeAttribs = array(
1450	1449	'class' => 'config-cc-iframe',
1451	1450	'name' => 'config-cc-iframe',
1452	1451	'id' => 'config-cc-iframe',
—	—	@@ -1470,23 +1469,23 @@
1471	1470	// If you change this height, also change it in config.css
1472	1471	$expandJs = str_replace( '$1', '54em', $js );
1473	1472	$reduceJs = str_replace( '$1', '70px', $js );
1474		~~- return~~
	1473	+ return
1475	1474	'<p>'.
1476	1475	Xml::element( 'img', array( 'src' => $this->getVar( 'wgRightsIcon' ) ) ) .
1477		~~- '  ' .~~
	1476	+ '  ' .
1478	1477	htmlspecialchars( $this->getVar( 'wgRightsText' ) ) .
1479	1478	"</p>\n" .
1480	1479	"<p style=\"text-align: center\">" .
1481		~~- Xml::element( 'a',~~
1482		~~- array(~~
	1480	+ Xml::element( 'a',
	1481	+ array(
1483	1482	'href' => $this->getCCPartnerUrl(),
1484	1483	'onclick' => $expandJs,
1485		~~- ),~~
1486		~~- wfMsg( 'config-cc-again' )~~
	1484	+ ),
	1485	+ wfMsg( 'config-cc-again' )
1487	1486	) .
1488	1487	"</p>\n" .
1489	1488	"<script type=\"text/javascript\">\n" .
1490		~~- # Reduce the wrapper div height~~
	1489	+ # Reduce the wrapper div height
1491	1490	htmlspecialchars( $reduceJs ) .
1492	1491	"\n" .
1493	1492	"</script>\n";
—	—	@@ -1494,7 +1493,7 @@
1495	1494
1496	1495
1497	1496	function submitCC() {
1498		~~- $newValues = $this->parent->setVarsFromRequest(~~
	1497	+ $newValues = $this->parent->setVarsFromRequest(
1499	1498	array( 'wgRightsUrl', 'wgRightsText', 'wgRightsIcon' ) );
1500	1499	if ( count( $newValues ) != 3 ) {
1501	1500	$this->parent->showError( 'config-cc-error' );
—	—	@@ -1505,13 +1504,13 @@
1506	1505	}
1507	1506
1508	1507	function submit() {
1509		~~- $this->parent->setVarsFromRequest( array( '_RightsProfile', '_LicenseCode',~~
	1508	+ $this->parent->setVarsFromRequest( array( '_RightsProfile', '_LicenseCode',
1510	1509	'wgEnableEmail', 'wgPasswordSender', 'wgLogo',
1511	1510	'wgEnableUserEmail', 'wgEnotifUserTalk', 'wgEnotifWatchlist',
1512	1511	'wgEmailAuthentication', 'wgMainCacheType', '_MemCachedServers' ) );
1513	1512
1514		~~- if ( !in_array( $this->getVar( '_RightsProfile' ),~~
1515		~~- array_keys( $this->parent->rightsProfiles ) ) )~~
	1513	+ if ( !in_array( $this->getVar( '_RightsProfile' ),
	1514	+ array_keys( $this->parent->rightsProfiles ) ) )
1516	1515	{
1517	1516	reset( $this->parent->rightsProfiles );
1518	1517	$this->setVar( '_RightsProfile', key( $this->parent->rightsProfiles ) );
—	—	@@ -1538,7 +1537,7 @@
1539	1538	$this->setVar( 'wgRightsIcon', '' );
1540	1539	}
1541	1540
1542		~~- $this->setVar( 'wgEnableUploads',~~
	1541	+ $this->setVar( 'wgEnableUploads',
1543	1542	$this->getVar( 'wgEnableUploads' ) && $this->getVar( '_UploadsAreSafe' )
1544	1543	);
1545	1544
—	—	@@ -1552,6 +1551,7 @@
1553	1552	return true;
1554	1553	}
1555	1554	}
	1555	+
1556	1556	class WebInstaller_Install extends WebInstallerPage {
1557	1557
1558	1558	function execute() {
—	—	@@ -1579,13 +1579,14 @@
1580	1580
1581	1581	private function endStage( $success = true ) {
1582	1582	$msg = $success ? 'config-install-step-done' : 'config-install-step-failed';
1583		~~- $html = wfMsgHtml( $msg );~~
	1583	+ $html = wfMsfHtml( 'word-separator' ) . wfMsgHtml( $msg );
1584	1584	if ( !$success ) {
1585	1585	$html = "<span class=\"error\">$html</span>";
1586	1586	}
1587	1587	$this->addHTML( $html . "</li>\n" );
1588	1588	}
1589	1589	}
	1590	+
1590	1591	class WebInstaller_Complete extends WebInstallerPage {
1591	1592	public function execute() {
1592	1593	global $IP;
—	—	@@ -1594,15 +1595,16 @@
1595	1596	$this->addHTML(
1596	1597	$this->parent->getInfoBox(
1597	1598	wfMsgNoTrans( $msg,
1598		~~- $GLOBALS['wgServer'] .~~
1599		~~- $this->getVar( 'wgScriptPath' ) . '/index' .~~
	1599	+ $GLOBALS['wgServer'] .
	1600	+ $this->getVar( 'wgScriptPath' ) . '/index' .
1600	1601	$this->getVar( 'wgScriptExtension' )
1601		~~- ), 'tick-32.png'~~
	1602	+ ), 'tick-32.png'
1602	1603	)
1603	1604	);
1604	1605	$this->endForm( false );
1605	1606	}
1606	1607	}
	1608	+
1607	1609	class WebInstaller_Restart extends WebInstallerPage {
1608	1610	function execute() {
1609	1611	$r = $this->parent->request;
—	—	@@ -1632,7 +1634,7 @@
1633	1635	$this->startForm();
1634	1636	$this->endForm( false );
1635	1637	}
1636		-
	1638	+
1637	1639	function getFileContents() {
1638	1640	return file_get_contents( dirname( __FILE__ ) . '/../../' . $this->getFileName() );
1639	1641	}
—	—	@@ -1668,21 +1670,22 @@
1669	1671	}
1670	1672	}
1671	1673
1672		~~-class WebInstaller_Readme extends WebInstaller_Document {~~
1673		~~- function getFileName() { return 'README'; }~~
	1674	+class WebInstaller_Readme extends WebInstaller_Document {
	1675	+ function getFileName() { return 'README'; }
1674	1676
1675	1677	function getFileContents() {
1676	1678	return $this->formatTextFile( parent::getFileContents() );
1677	1679	}
1678	1680	}
1679	1681
1680		~~-class WebInstaller_ReleaseNotes extends WebInstaller_Document {~~
	1682	+class WebInstaller_ReleaseNotes extends WebInstaller_Document {
1681	1683	function getFileName() { return 'RELEASE-NOTES'; }
1682	1684
1683	1685	function getFileContents() {
1684	1686	return $this->formatTextFile( parent::getFileContents() );
1685	1687	}
1686	1688	}
	1689	+
1687	1690	class WebInstaller_UpgradeDoc extends WebInstaller_Document {
1688	1691	function getFileName() { return 'UPGRADE'; }
1689	1692
—	—	@@ -1691,7 +1694,7 @@
1692	1695	}
1693	1696	}
1694	1697
1695		~~-class WebInstaller_Copying extends WebInstaller_Document {~~
	1698	+class WebInstaller_Copying extends WebInstaller_Document {
1696	1699	function getFileName() { return 'COPYING'; }
1697	1700
1698	1701	function getFileContents() {

Follow-up revisions

Revision	Commit summary	Author	Date
r65135	Fix typo in r65132	maxsem	17:13, 16 April 2010

Comments

#Comment by MaxSem (talk | contribs) 17:19, 16 April 2010

Overescaping:

Creating LocalSettings.php... Done

#Comment by Siebrand (talk | contribs) 22:55, 17 April 2010

Don't understand quite what you mean here.

#Comment by Nikerabbit (talk | contribs) 06:48, 18 April 2010

He probably didn't use preview and referred to those <code> -tags

#Comment by MaxSem (talk | contribs) 06:59, 18 April 2010

Right. Just try following all steps of installtion process and you'll see the problem.

#Comment by Siebrand (talk | contribs) 12:20, 9 June 2010

Haven't been able to spend any time anymore on the installer. Any suggested fixes? I think the <code> tags should be properly rendered...

#Comment by Siebrand (talk | contribs) 11:15, 20 August 2010

Ping?

#Comment by MaxSem (talk | contribs) 07:52, 22 August 2010

Can't reproduce anymore as we don't have that message in that place now.

#Comment by Siebrand (talk | contribs) 10:31, 22 August 2010

Should this be set to OK then?

Status & tagging log

22:42, 18 October 2010 😂 (talk | contribs) changed the status of r65132 [removed: new added: resolved]
07:52, 22 August 2010 MaxSem (talk | contribs) changed the status of r65132 [removed: fixme added: new]
17:19, 16 April 2010 MaxSem (talk | contribs) changed the status of r65132 [removed: new added: fixme]