| Index: branches/new-installer/phase3/maintenance/language/messages.inc |
| — | — | @@ -3139,7 +3139,8 @@ |
| 3140 | 3140 | 'ajax-error-dismiss', |
| 3141 | 3141 | 'ajax-remove-category-error', |
| 3142 | 3142 | ), |
| 3143 | | - 'config' => array( |
| | 3143 | + 'config' => array( |
| | 3144 | + 'config-information', |
| 3144 | 3145 | 'config-session-error', |
| 3145 | 3146 | 'config-session-expired', |
| 3146 | 3147 | 'config-no-session', |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -427,7 +427,8 @@ |
| 428 | 428 | "<div class=\"config-info-left\">\n" . |
| 429 | 429 | Xml::element( 'img', |
| 430 | 430 | array( |
| 431 | | - 'src' => '../skins/common/images/' . $icon |
| | 431 | + 'src' => '../skins/common/images/' . $icon, |
| | 432 | + 'alt' => wfMsg( 'config-information' ), |
| 432 | 433 | ) |
| 433 | 434 | ) . "\n" . |
| 434 | 435 | "</div>\n" . |
| — | — | @@ -450,12 +451,13 @@ |
| 451 | 452 | $text = wfMsgReal( $msg, $args, false, false, false ); |
| 452 | 453 | $html = $this->parse( $text, true ); |
| 453 | 454 | $id = $this->helpId++; |
| | 455 | + $alt = wfMsg( 'help' ); |
| 454 | 456 | |
| 455 | 457 | return |
| 456 | 458 | "<div class=\"config-help-wrapper\">\n" . |
| 457 | 459 | "<div class=\"config-show-help\" id=\"config-show-help-$id\">\n" . |
| 458 | 460 | Xml::openElement( 'a', array( 'href' => "javascript:showHelp($id,true)" ) ) . |
| 459 | | - "<img src=\"../skins/common/images/help-22.png\"/> " . |
| | 461 | + "<img src=\"../skins/common/images/help-22.png\" alt=\"$alt\" /> " . |
| 460 | 462 | wfMsgHtml( 'config-show-help' ) . |
| 461 | 463 | "</a></div>\n" . |
| 462 | 464 | "<div class=\"config-help-message\" id=\"config-help-message-$id\">\n" . |
| — | — | @@ -463,7 +465,7 @@ |
| 464 | 466 | "</div>\n" . |
| 465 | 467 | "<div class=\"config-hide-help\" id=\"config-hide-help-$id\">\n" . |
| 466 | 468 | Xml::openElement( 'a', array( 'href' => "javascript:showHelp($id,false)" ) ) . |
| 467 | | - "<img src=\"../skins/common/images/help-22.png\"/> " . |
| | 469 | + "<img src=\"../skins/common/images/help-22.png\" alt=\"$alt\" /> " . |
| 468 | 470 | wfMsgHtml( 'config-hide-help' ) . |
| 469 | 471 | "</a></div>\n</div>\n"; |
| 470 | 472 | } |
| — | — | @@ -500,10 +502,14 @@ |
| 501 | 503 | } else { |
| 502 | 504 | $labelText = wfMsgHtml( $msg ); |
| 503 | 505 | } |
| | 506 | + $attributes = array( 'class' => 'config-label' ); |
| | 507 | + if ( $forId ) { |
| | 508 | + $attributes['for'] = $forId; |
| | 509 | + } |
| 504 | 510 | return |
| 505 | 511 | "<div class=\"config-input\">\n" . |
| 506 | 512 | Xml::tags( 'label', |
| 507 | | - array( 'for' => $forId, 'class' => 'config-label' ), |
| | 513 | + $attributes, |
| 508 | 514 | $labelText ) . "\n" . |
| 509 | 515 | $contents . |
| 510 | 516 | "</div>\n"; |
| — | — | @@ -883,9 +889,9 @@ |
| 884 | 890 | $languages = Language::getLanguageNames(); |
| 885 | 891 | ksort( $languages ); |
| 886 | 892 | $dummies = array_flip( $wgDummyLanguageCodes ); |
| 887 | | - foreach ( $languages as $code => $name ) { |
| | 893 | + foreach ( $languages as $code => $lang ) { |
| 888 | 894 | if ( isset( $dummies[$code] ) ) continue; |
| 889 | | - $s .= "\n" . Xml::option( "$code - $name", $code, $code == $selectedCode ); |
| | 895 | + $s .= "\n" . Xml::option( "$code - $lang", $code, $code == $selectedCode ); |
| 890 | 896 | } |
| 891 | 897 | $s .= "\n</select>\n"; |
| 892 | 898 | return $this->parent->label( $label, $name, $s ); |
| Index: branches/new-installer/phase3/includes/installer/WebInstallerOutput.php |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | |
| 101 | 101 | <body class="<?php print $this->getDir(); ?>"> |
| 102 | 102 | <noscript> |
| 103 | | -<style> |
| | 103 | +<style type="text/css"> |
| 104 | 104 | .config-help-message { display: block; } |
| 105 | 105 | .config-show-help { display: none; } |
| 106 | 106 | </style> |
| Index: branches/new-installer/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4121,6 +4121,7 @@ |
| 4122 | 4122 | 'duplicate-defaultsort' => '\'\'\'Warning:\'\'\' Default sort key "$2" overrides earlier default sort key "$1".', |
| 4123 | 4123 | |
| 4124 | 4124 | # Installer |
| | 4125 | +'config-information' => 'Information', |
| 4125 | 4126 | 'config-session-error' => 'Error starting session: $1', |
| 4126 | 4127 | 'config-session-expired' => 'Your session data seems to have expired. |
| 4127 | 4128 | Sessions are configured for a lifetime of $1, you can increase this by setting session.gc_maxlifetime in php.ini. |