https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110411
Revision: 110411
Author: siebrand
Date: 2012-01-31 17:24:03 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Stylize and whitespace updates.
Modified Paths:
--------------
trunk/extensions/Translate/Groups.php
trunk/extensions/Translate/Translate.i18n.php
trunk/extensions/Translate/TranslateUtils.php
trunk/extensions/Translate/api/ApiTTMServer.php
trunk/extensions/Translate/resources/ext.translate.quickedit.js
trunk/extensions/Translate/scripts/export.php
trunk/extensions/Translate/scripts/sync-group.php
trunk/extensions/Translate/scripts/ttmserver-export.php
trunk/extensions/Translate/specials/SpecialLanguageStats.php
trunk/extensions/Translate/utils/StatsTable.php
trunk/extensions/Translate/utils/TranslationHelpers.php
Modified: trunk/extensions/Translate/Groups.php
===================================================================
--- trunk/extensions/Translate/Groups.php 2012-01-31 17:14:16 UTC (rev
110410)
+++ trunk/extensions/Translate/Groups.php 2012-01-31 17:24:03 UTC (rev
110411)
@@ -686,8 +686,8 @@
}
return $messages;
}
-
+
public function initCollection( $code ) {
$messages = $this->loadMessagesFromCache( $this->getGroups() );
$namespace = $this->getNamespace();
Modified: trunk/extensions/Translate/Translate.i18n.php
===================================================================
--- trunk/extensions/Translate/Translate.i18n.php 2012-01-31 17:14:16 UTC
(rev 110410)
+++ trunk/extensions/Translate/Translate.i18n.php 2012-01-31 17:24:03 UTC
(rev 110411)
@@ -13335,7 +13335,7 @@
'translate-edit-definition' => 'ಸಂದೇಶ ವ್ಯಾಖ್ಯೆ',
'translate-edit-translation' => 'ಅನುವಾದ',
'translate-edit-contribute' => 'ನೆರವಾಗು',
- 'translate-edit-no-information' => '"ಈ ಸಂದೇಶಕ್ಕೆ ಯಾವುದೇ ದಾಖಲೆಗಳಿಲ್ಲ."
+ 'translate-edit-no-information' => '"ಈ ಸಂದೇಶಕ್ಕೆ ಯಾವುದೇ ದಾಖಲೆಗಳಿಲ್ಲ."
"ನಿಮಗೆ ಈ ಸಂದೇಶ ಎಲ್ಲಿಯಾದರೂ ಅಥವಾ ಹೇಗಾದರೂ ಉಪಯೋಗದಲ್ಲಿರುವುದು ತಿಳಿದಿದ್ದರೆ,ನೀವು
ಇದಕ್ಕೆ ತಕ್ಕ ದಾಖಲೆಗಳನ್ನು ಸೇರಿಸಿ ಬೇರಿ ಭಾಷಾಂತರಕಾರರಿಗೆ ಸಹಾಯ ಮಾಡಬಹುದು."',
'translate-edit-information' => 'ಸಂದೇಶದ ಬಗ್ಗೆ ಮಾಹಿತಿ ($1)',
'translate-edit-in-other-languages' => 'ಬೇರೆ ಭಾಷೆಗಳಲ್ಲಿ ಸಂದೇಶ',
Modified: trunk/extensions/Translate/TranslateUtils.php
===================================================================
--- trunk/extensions/Translate/TranslateUtils.php 2012-01-31 17:14:16 UTC
(rev 110410)
+++ trunk/extensions/Translate/TranslateUtils.php 2012-01-31 17:24:03 UTC
(rev 110411)
@@ -319,7 +319,7 @@
$out->addModules( 'ext.translate.helplink' );
$text = wfMessage( 'translate-gethelp' )->escaped();
- if( $overrideBaseUrl ) {
+ if ( $overrideBaseUrl ) {
$helpUrl = $to;
} else {
$helpUrl =
"//www.mediawiki.org/wiki/Special:MyLanguage/$to";
Modified: trunk/extensions/Translate/api/ApiTTMServer.php
===================================================================
--- trunk/extensions/Translate/api/ApiTTMServer.php 2012-01-31 17:14:16 UTC
(rev 110410)
+++ trunk/extensions/Translate/api/ApiTTMServer.php 2012-01-31 17:24:03 UTC
(rev 110411)
@@ -39,7 +39,7 @@
protected function getAvailableTranslationServices() {
global $wgTranslateTranslationServices;
-
+
$good = array();
foreach ( $wgTranslateTranslationServices as $id => $config ) {
if ( $config['type'] === 'ttmserver' &&
$config['public'] === true ) {
Modified: trunk/extensions/Translate/resources/ext.translate.quickedit.js
===================================================================
--- trunk/extensions/Translate/resources/ext.translate.quickedit.js
2012-01-31 17:14:16 UTC (rev 110410)
+++ trunk/extensions/Translate/resources/ext.translate.quickedit.js
2012-01-31 17:24:03 UTC (rev 110411)
@@ -129,7 +129,7 @@
var height = $( window ).height() * 0.7;
dialogwidth = $( window ).width() * 0.8;
mw.util.addCSS( "/* Inserted by ext.translate.quickedit
*/\n" +
- ".mw-sp-translate-edit-fields {\n" +
+ ".mw-sp-translate-edit-fields {\n" +
"\tmax-height: " + height + "px;\n" +
"\toverflow: auto\n}\n"
);
Modified: trunk/extensions/Translate/scripts/export.php
===================================================================
--- trunk/extensions/Translate/scripts/export.php 2012-01-31 17:14:16 UTC
(rev 110410)
+++ trunk/extensions/Translate/scripts/export.php 2012-01-31 17:24:03 UTC
(rev 110411)
@@ -99,7 +99,7 @@
foreach ( $groupIds as $groupId ) {
$group = MessageGroups::getGroup( $groupId );
- if( $group !== null ) {
+ if ( $group !== null ) {
$groups[$groupId] = $group;
} else {
STDERR( "Invalid group $groupId" );
Modified: trunk/extensions/Translate/scripts/sync-group.php
===================================================================
--- trunk/extensions/Translate/scripts/sync-group.php 2012-01-31 17:14:16 UTC
(rev 110410)
+++ trunk/extensions/Translate/scripts/sync-group.php 2012-01-31 17:24:03 UTC
(rev 110411)
@@ -56,7 +56,7 @@
foreach ( $groupIds as $groupId ) {
$group = MessageGroups::getGroup( $groupId );
- if( $group !== null ) {
+ if ( $group !== null ) {
$groups[$groupId] = $group;
} else {
STDERR( "Invalid group $groupId" );
@@ -74,7 +74,7 @@
}
}
-if( !count( $groups ) ) {
+if ( !count( $groups ) ) {
STDERR( "ESG2: No valid message groups identified." );
exit( 1 );
}
Modified: trunk/extensions/Translate/scripts/ttmserver-export.php
===================================================================
--- trunk/extensions/Translate/scripts/ttmserver-export.php 2012-01-31
17:14:16 UTC (rev 110410)
+++ trunk/extensions/Translate/scripts/ttmserver-export.php 2012-01-31
17:24:03 UTC (rev 110411)
@@ -33,7 +33,7 @@
protected function statusLine( $text, $channel = null ) {
$pid = sprintf( "%5s", getmypid() );
$prefix = sprintf( "%6.2f", microtime( true ) - $this->start );
- $mem = sprintf( "%5.1fM", ( memory_get_usage( true ) /
(1024*1024) ) );
+ $mem = sprintf( "%5.1fM", ( memory_get_usage( true ) / ( 1024 *
1024 ) ) );
$this->output( "$pid $prefix $mem $text", $channel );
}
@@ -53,7 +53,7 @@
$this->output( 'fulltext.. ', 1 );
$dbw->delete( 'translate_tmf', '*', __METHOD__ );
$table = $dbw->tableName( 'translate_tmf' );
- #$dbw->query( "DROP INDEX tmf_text ON $table" );
+ # $dbw->query( "DROP INDEX tmf_text ON $table" );
$this->output( 'done!', 1 );
$this->statusLine( 'Loading groups... ', 2 );
@@ -187,7 +187,7 @@
$this->output( '.', $targetLanguage );
}
wfWaitForSlaves( 10 );
- } while( count( $inserts ) );
+ } while ( count( $inserts ) );
}
if ( $multi ) {
Modified: trunk/extensions/Translate/specials/SpecialLanguageStats.php
===================================================================
--- trunk/extensions/Translate/specials/SpecialLanguageStats.php
2012-01-31 17:14:16 UTC (rev 110410)
+++ trunk/extensions/Translate/specials/SpecialLanguageStats.php
2012-01-31 17:24:03 UTC (rev 110411)
@@ -21,7 +21,6 @@
* @ingroup SpecialPage TranslateSpecialPage Stats
*/
class SpecialLanguageStats extends IncludableSpecialPage {
-
/**
* @var StatsTable
*/
@@ -80,7 +79,9 @@
public function __construct() {
parent::__construct( 'LanguageStats' );
+
global $wgLang;
+
$this->target = $wgLang->getCode();
}
@@ -99,12 +100,15 @@
$wgOut->addModules( 'ext.translate.messagetable' );
$params = explode( '/', $par );
+
if ( isset( $params[0] ) && trim( $params[0] ) ) {
$this->target = $params[0];
}
+
if ( isset( $params[1] ) ) {
$this->noComplete = (bool)$params[1];
}
+
if ( isset( $params[2] ) ) {
$this->noEmpty = (bool)$params[2];
}
@@ -146,12 +150,14 @@
*/
protected function isValidValue( $value ) {
$langs = Language::getLanguageNames( false );
+
return isset( $langs[$value] );
}
/// Called when the target is unknown.
protected function invalidTarget() {
global $wgOut;
+
$wgOut->wrapWikiMsg( "<div class='error'>$1</div>",
'translate-page-no-such-language' );
}
@@ -233,6 +239,7 @@
*/
function addWorkflowStatesColumn() {
global $wgTranslateWorkflowStates;
+
if ( $wgTranslateWorkflowStates ) {
$this->states = self::getWorkflowStates();
$this->statemap = array_flip( array_keys(
$wgTranslateWorkflowStates ) );
@@ -249,11 +256,13 @@
*/
function getWorkflowStateCell( $target ) {
global $wgTranslateWorkflowStates;
+
if ( $wgTranslateWorkflowStates ) {
$state = isset( $this->states[$target] ) ?
$this->states[$target] : '';
$sort = isset( $this->statemap[$state] ) ?
$this->statemap[$state] + 1 : -1;
$stateMessage = wfMessage(
"translate-workflow-state-$state" );
$stateText = $stateMessage->isBlank() ? $state :
$stateMessage->text();
+
return "\n\t\t" . $this->table->element(
$stateText,
isset( $wgTranslateWorkflowStates[$state] ) ?
$wgTranslateWorkflowStates[$state] : '',
@@ -296,14 +305,16 @@
$out .= Html::closeElement( 'tfoot' );
$out .= Html::closeElement( 'table' );
+
return $out;
} else {
$this->nothing = true;
+
return '';
}
- /// @todo: Allow extra message here, once total translated
volume goes
- /// over a certain percentage? (former live hack at
translatewiki)
+ /// @todo Allow extra message here, once total translated
volume goes
+ /// over a certain percentage? (former live hack at
translatewiki)
/// if ( $this->totals['2'] && ( $this->totals['1'] /
$this->totals['2'] ) > 0.95 ) {
/// $out .= wfMessage( 'translate-somekey' );
/// }
@@ -323,10 +334,12 @@
$out = '';
$top = array_shift( $item );
$out .= $this->makeGroupRow( $top, $cache, $parent === '' ?
true : $parent );
+
foreach ( $item as $subgroup ) {
$parents = trim( $parent . ' ' . $top->getId() );
$out .= $this->makeGroupGroup( $subgroup, $cache,
$parents );
}
+
return $out;
}
@@ -377,6 +390,7 @@
$rowParams = array();
$rowParams['data-groupid'] = $groupId;
+
if ( is_string( $parent ) ) {
$rowParams['data-parentgroups'] = $parent;
} elseif ( $parent === true ) {
@@ -390,6 +404,7 @@
$out .= $this->getWorkflowStateCell( $groupId );
$out .= "\n\t" . Html::closeElement( 'tr' ) . "\n";
+
return $out;
}
@@ -413,10 +428,13 @@
array( $targetCol => $this->target ),
__METHOD__
);
+
$states = array();
+
foreach ( $res as $row ) {
$states[$row->$selectKey] = $row->tgr_state;
}
+
return $states;
}
}
Modified: trunk/extensions/Translate/utils/StatsTable.php
===================================================================
--- trunk/extensions/Translate/utils/StatsTable.php 2012-01-31 17:14:16 UTC
(rev 110410)
+++ trunk/extensions/Translate/utils/StatsTable.php 2012-01-31 17:24:03 UTC
(rev 110411)
@@ -32,6 +32,7 @@
public function __construct() {
global $wgLang;
+
$this->lang = $wgLang;
$this->translate = SpecialPage::getTitleFor( 'Translate' );
}
@@ -46,13 +47,18 @@
*/
public function element( $in, $bgcolor = '', $sort = '' ) {
$attributes = array();
- if ( $sort ) $attributes['data-sort-value'] = $sort;
+
+ if ( $sort ) {
+ $attributes['data-sort-value'] = $sort;
+ }
+
if ( $bgcolor ) {
$attributes['style'] = "background-color: #" . $bgcolor;
$attributes['class'] = 'hover-color';
}
$element = Html::element( 'td', $attributes, $in );
+
return $element;
}
@@ -62,7 +68,11 @@
if ( $fuzzy ) {
// Weigh fuzzy with factor 20.
$v = $v * 20;
- if ( $v > 255 ) $v = 255;
+
+ if ( $v > 255 ) {
+ $v = 255;
+ }
+
$v = 255 - $v;
}
@@ -134,10 +144,12 @@
*/
public function makeTotalRow( Message $message, $numbers ) {
list( $total, $translated, $fuzzy ) = $numbers;
+
$out = "\t" . Html::openElement( 'tr' );
$out .= "\n\t\t" . Html::element( 'td', array(),
$message->text() );
$out .= $this->makeNumberColumns( $fuzzy, $translated, $total );
$out .= "\n\t" . Xml::closeElement( 'tr' ) . "\n";
+
return $out;
}
@@ -153,6 +165,7 @@
$na = "\n\t\t" . Html::element( 'td', array(
'data-sort-value' => -1 ), '...' );
$nap = "\n\t\t" . $this->element( '...', 'AFAFAF', -1
);
$out = $na . $na . $nap . $nap;
+
return $out;
}
@@ -181,6 +194,7 @@
*/
public function formatPercentage( $num ) {
$fmt = $this->lang->formatNum( number_format( round( 100 *
$num, 2 ), 2 ) );
+
return wfMessage( 'percent', $fmt )->text();
}
@@ -208,7 +222,6 @@
* @return string Html
*/
public function makeGroupLink( MessageGroup $group, $code, $params ) {
-
$queryParameters = $params + array(
'group' => $group->getId(),
'language' => $code
@@ -238,19 +251,24 @@
$cache = wfGetCache( CACHE_ANYTHING );
$key = wfMemckey( "translate-groupdesc-$code-" .
$group->getId() );
$desc = $cache->get( $key );
+
if ( is_string( $desc ) ) {
return $desc;
}
$realFunction = array( 'MessageCache', 'singleton' );
+
if ( is_callable( $realFunction ) ) {
$mc = MessageCache::singleton();
} else {
global $wgMessageCache;
+
$mc = $wgMessageCache;
}
+
$desc = $mc->transform( $group->getDescription(), true,
$this->lang );
$cache->set( $key, $desc );
+
return $desc;
}
Modified: trunk/extensions/Translate/utils/TranslationHelpers.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationHelpers.php 2012-01-31
17:14:16 UTC (rev 110410)
+++ trunk/extensions/Translate/utils/TranslationHelpers.php 2012-01-31
17:24:03 UTC (rev 110411)
@@ -1083,7 +1083,7 @@
$text = wfMessage( 'translate-dynagroup-last',
$user )->escaped();
}
}
-
+
return TranslateUtils::fieldset( $text, $diffText, array(
'class' => 'mw-sp-translate-latestchange' ) );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
