| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -40,6 +40,7 @@ |
| 41 | 41 | when the function exists but is disabled. Introduced Maintenance::posix_isatty() |
| 42 | 42 | * (bug 30264) Changed installer-generated LocalSettings.php to use require_once() |
| 43 | 43 | instead require() for included extensions. |
| | 44 | +* Do not convert text in the user interface language to another script. |
| 44 | 45 | |
| 45 | 46 | === API changes in 1.19 === |
| 46 | 47 | * (bug 19838) siprop=interwikimap can now use the interwiki cache. |
| Index: trunk/phase3/includes/CategoryPage.php |
| — | — | @@ -172,16 +172,16 @@ |
| 173 | 173 | // Give a proper message if category is empty |
| 174 | 174 | if ( $r == '' ) { |
| 175 | 175 | $r = wfMsgExt( 'category-empty', array( 'parse' ) ); |
| | 176 | + } else { |
| | 177 | + $pageLang = $this->title->getPageLanguage(); |
| | 178 | + $langAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir() ); |
| | 179 | + # close the previous div, show the headings in user language, |
| | 180 | + # then open a new div with the page content language again |
| | 181 | + $r = '</div>' . $r . Html::openElement( 'div', $langAttribs ); |
| 176 | 182 | } |
| 177 | 183 | |
| 178 | | - $pageLang = $this->title->getPageLanguage(); |
| 179 | | - $langAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir() ); |
| 180 | | - # close the previous div, show the headings in user language, |
| 181 | | - # then open a new div with the page content language again |
| 182 | | - $r = '</div>' . $r . Html::openElement( 'div', $langAttribs ); |
| 183 | | - |
| 184 | 184 | wfProfileOut( __METHOD__ ); |
| 185 | | - return $wgContLang->convert( $r ); |
| | 185 | + return $r; |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | function clearCategoryState() { |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -362,14 +362,16 @@ |
| 363 | 363 | $this->replaceLinkHolders( $text ); |
| 364 | 364 | |
| 365 | 365 | /** |
| 366 | | - * The page doesn't get language converted if |
| | 366 | + * The input doesn't get language converted if |
| 367 | 367 | * a) It's disabled |
| 368 | 368 | * b) Content isn't converted |
| 369 | 369 | * c) It's a conversion table |
| | 370 | + * d) it is an interface message (which is in the user language) |
| 370 | 371 | */ |
| 371 | 372 | if ( !( $wgDisableLangConversion |
| 372 | 373 | || isset( $this->mDoubleUnderscores['nocontentconvert'] ) |
| 373 | | - || $this->mTitle->isConversionTable() ) ) { |
| | 374 | + || $this->mTitle->isConversionTable() |
| | 375 | + || $this->mOptions->getInterfaceMessage() ) ) { |
| 374 | 376 | |
| 375 | 377 | # The position of the convert() call should not be changed. it |
| 376 | 378 | # assumes that the links are all replaced and the only thing left |
| — | — | @@ -1996,6 +1998,15 @@ |
| 1997 | 1999 | } |
| 1998 | 2000 | wfProfileOut( __METHOD__."-interwiki" ); |
| 1999 | 2001 | |
| | 2002 | + # Interprojects |
| | 2003 | + wfProfileIn( __METHOD__."-interproject" ); |
| | 2004 | + global $wgInterProjectLinks; |
| | 2005 | + if ( is_array( $wgInterProjectLinks ) && isset( $wgInterProjectLinks[$iw] ) && $nottalk ) { |
| | 2006 | + $this->mOutput->addInterProjectLink( $iw, $nt, ( $wasblank ? '' : $text ) ); |
| | 2007 | + wfProfileOut( __METHOD__."-interproject" ); |
| | 2008 | + } |
| | 2009 | + wfProfileOut( __METHOD__."-interproject" ); |
| | 2010 | + |
| 2000 | 2011 | if ( $ns == NS_FILE ) { |
| 2001 | 2012 | wfProfileIn( __METHOD__."-image" ); |
| 2002 | 2013 | if ( !wfIsBadImage( $nt->getDBkey(), $this->mTitle ) ) { |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -314,7 +314,7 @@ |
| 315 | 315 | |
| 316 | 316 | // show a preview of the old signature first |
| 317 | 317 | $oldsigWikiText = $wgParser->preSaveTransform( "~~~", new Title, $user, new ParserOptions ); |
| 318 | | - $oldsigHTML = $wgOut->parseInline( $oldsigWikiText ); |
| | 318 | + $oldsigHTML = $wgOut->parseInline( $oldsigWikiText, true, true ); |
| 319 | 319 | $defaultPreferences['oldsig'] = array( |
| 320 | 320 | 'type' => 'info', |
| 321 | 321 | 'raw' => true, |