http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69092
Revision: 69092 Author: siebrand Date: 2010-07-06 13:43:29 +0000 (Tue, 06 Jul 2010) Log Message: ----------- * revert r69087 * implement what we needed (translation tool entry page displaying stats for user language) directly into Special:LanguageStats * remove obsolete code * remove some double spaces Modified Paths: -------------- trunk/extensions/Translate/SpecialLanguageStats.php trunk/extensions/Translate/SpecialMyLanguage.php trunk/extensions/Translate/SpecialTranslationStats.php Modified: trunk/extensions/Translate/SpecialLanguageStats.php =================================================================== --- trunk/extensions/Translate/SpecialLanguageStats.php 2010-07-06 13:15:59 UTC (rev 69091) +++ trunk/extensions/Translate/SpecialLanguageStats.php 2010-07-06 13:43:29 UTC (rev 69092) @@ -31,16 +31,22 @@ $code = $wgRequest->getVal( 'code', $par ); $suppressComplete = $wgRequest->getVal( 'suppresscomplete', $par ); $wgOut->addHTML( $this->buildLanguageForm( $code, $suppressComplete ) ); -/* - $form = $this->buildLanguageForm( $code, $suppressComplete ); - $form->show(); -*/ } else { $paramArray = explode( '/', $par, 2 ); $code = $paramArray[0]; $suppressComplete = isset( $paramArray[1] ) && (bool)$paramArray[1]; } + if ( !$code ) { + global $wgUser; + + if ( $wgUser->isLoggedIn() ) { + global $wgLnng; + + $code = $wgLang->getCode(); + } + } + $out = ''; if ( array_key_exists( $code, Language::getLanguageNames() ) ) { @@ -60,28 +66,10 @@ */ function buildLanguageForm( $code = '', $suppressComplete = false ) { global $wgScript; + $t = $this->getTitle(); -/* - $formFields = array( - 'code' => array( - 'type' => 'text', - 'label-message' => 'translate-language-code-field-name', - 'size' => '30' - ), - 'suppresscomplete' => array( - 'type' => 'toggle', - 'label-message' => 'translate-suppress-complete', - ), - ); - - $form = new HTMLForm( $formFields ); - $form->setTitle( SpecialPage::getTitleFor( 'LanguageStats' ) ); - - return $form; -*/ - - $out = Xml::openElement( 'div', array( 'class' => 'languagecode' ) ); + $out = Xml::openElement( 'div', array( 'class' => 'languagecode' ) ); $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ); $out .= Xml::hidden( 'title', $t->getPrefixedText() ); $out .= Xml::openElement( 'fieldset' ); @@ -89,10 +77,10 @@ $out .= Xml::openElement( 'table', array( 'id' => 'langcodeselect', 'class' => 'allpages' ) ); $out .= Xml::openElement( 'tr' ); - $out .= Xml::openElement( 'td', array( 'class' => 'mw-label' ) ); + $out .= Xml::openElement( 'td', array( 'class' => 'mw-label' ) ); $out .= Xml::label( wfMsg( 'translate-language-code-field-name' ), 'code' ); $out .= Xml::closeElement( 'td' ); - $out .= Xml::openElement( 'td', array( 'class' => 'mw-input' ) ); + $out .= Xml::openElement( 'td', array( 'class' => 'mw-input' ) ); $out .= Xml::input( 'code', 30, str_replace( '_', ' ', $code ), array( 'id' => 'code' ) ); $out .= Xml::closeElement( 'td' ); $out .= Xml::closeElement( 'tr' ); Modified: trunk/extensions/Translate/SpecialMyLanguage.php =================================================================== --- trunk/extensions/Translate/SpecialMyLanguage.php 2010-07-06 13:15:59 UTC (rev 69091) +++ trunk/extensions/Translate/SpecialMyLanguage.php 2010-07-06 13:43:29 UTC (rev 69092) @@ -22,9 +22,9 @@ $title = null; if ( strval($par) !== '' ) { $title = Title::newFromText( $par ); - if ( $title && ( $title->exists() || $title->isAlwaysKnown() ) ) { + if ( $title && $title->exists() ) { $local = Title::newFromText( "$par/" . $wgLang->getCode() ); - if ( $local && ( $local->exists() || $local->isAlwaysKnown() ) ) { + if ( $local && $local->exists() ) { $title = $local; } } Modified: trunk/extensions/Translate/SpecialTranslationStats.php =================================================================== --- trunk/extensions/Translate/SpecialTranslationStats.php 2010-07-06 13:15:59 UTC (rev 69091) +++ trunk/extensions/Translate/SpecialTranslationStats.php 2010-07-06 13:43:29 UTC (rev 69092) @@ -50,7 +50,6 @@ if ( $this->including() ) { $wgOut->addHTML( $this->image( $opts ) ); } elseif ( $opts['graphit'] ) { - // Cache for two hours if ( !$opts['preview'] ) { $lastMod = $wgOut->checkLastModified( wfTimestamp( TS_MW, time() - 2 * 3600 ) ); @@ -193,7 +192,7 @@ ksort( $languages ); - $selector = new XmlSelect( 'mw-language-selector', 'mw-language-selector' ); + $selector = new XmlSelect( 'mw-language-selector', 'mw-language-selector' ); foreach ( $languages as $code => $name ) { $selector->addOption( "$code - $name", $code ); } @@ -232,7 +231,7 @@ ksort( $groups ); - $selector = new XmlSelect( 'mw-group-selector', 'mw-group-selector' ); + $selector = new XmlSelect( 'mw-group-selector', 'mw-group-selector' ); foreach ( $groups as $code => $name ) { $selector->addOption( $name->getLabel(), $code ); } _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs