Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54621
Change subject: Update indentation and spacing
......................................................................
Update indentation and spacing
Change-Id: Ie000e71857cd8e5d5c0df326c7c30ebebc795b7d
---
M TranslateHooks.php
M TranslateUtils.php
M api/ApiQueryMessageCollection.php
M composer.json
M resources/css/ext.translate.proofread.css
M resources/js/ext.translate.editor.js
M resources/js/ext.translate.messagetable.js
M resources/js/ext.translate.proofread.js
M resources/js/ext.translate.special.languagestats.js
M resources/js/ext.translate.special.translate.js
M specials/SpecialManageGroups.php
M specials/SpecialTranslate.php
M tag/PageTranslationLogFormatter.php
M tests/ffs/GettextFFSTest.php
M utils/MessageTable.php
M utils/TuxMessageTable.php
16 files changed, 87 insertions(+), 88 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/21/54621/1
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 04eb3c5..a5da522 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -266,7 +266,9 @@
/**
* Hook: SpecialSearchProfileForm
*/
- public static function searchProfileForm( SpecialSearch $search,
&$form, /*string*/ $profile, $term, array $opts ) {
+ public static function searchProfileForm( SpecialSearch $search, &$form,
+ /*string*/$profile, $term, array $opts
+ ) {
if ( $profile !== 'translation' ) {
return true;
}
@@ -314,7 +316,9 @@
}
/// Hook: SpecialSearchSetupEngine
- public static function searchProfileSetupEngine( SpecialSearch $search,
/*string*/ $profile, SearchEngine $engine ) {
+ public static function searchProfileSetupEngine( SpecialSearch $search,
+ /*string*/$profile, SearchEngine $engine
+ ) {
if ( $profile !== 'translation' ) {
return true;
}
diff --git a/TranslateUtils.php b/TranslateUtils.php
index ef5e28c..f655dc3 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -200,7 +200,7 @@
* @param string $code
* @return array ( language code => language name )
*/
- public static function getLanguageNames( /*string */ $code ) {
+ public static function getLanguageNames( /*string */$code ) {
if ( is_callable( array( 'Language', 'fetchLanguageNames' ) ) )
{
$languageNames = Language::fetchLanguageNames( $code,
'mw' ); // since 1.20
} elseif ( is_callable( array( 'LanguageNames', 'getNames' ) )
) {
diff --git a/api/ApiQueryMessageCollection.php
b/api/ApiQueryMessageCollection.php
index 0a20fdd..56ae8eb 100644
--- a/api/ApiQueryMessageCollection.php
+++ b/api/ApiQueryMessageCollection.php
@@ -53,7 +53,7 @@
$languages = $group->getTranslatableLanguages();
- if ( $languages !== null && !isset(
$languages[$params['language'] ] ) ) {
+ if ( $languages !== null && !isset(
$languages[$params['language']] ) ) {
$this->dieUsage( 'Translation to this language is
disabled', 'translate-language-disabled' );
}
diff --git a/composer.json b/composer.json
index 353a128..89fbc53 100644
--- a/composer.json
+++ b/composer.json
@@ -1,15 +1,15 @@
{
"name": "mediawiki/translate",
- "type": "mediawiki-extension",
- "description": "Let your user translate any kind of text",
- "homepage": "http://www.mediawiki.org/wiki/Extension:Translate";,
- "license" : "GPL-2.0+",
+ "type": "mediawiki-extension",
+ "description": "Let your user translate any kind of text",
+ "homepage": "http://www.mediawiki.org/wiki/Extension:Translate";,
+ "license": "GPL-2.0+",
- "require": {
- "composer/installers" : "*"
- },
+ "require": {
+ "composer/installers": "*"
+ },
- "suggest": {
- "mediawiki/translation-notifications": "Manage
communication with translators"
- }
+ "suggest": {
+ "mediawiki/translation-notifications": "Manage communication
with translators"
+ }
}
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index 35f445e..5e1c77e 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -66,7 +66,7 @@
margin-right: 5px;
margin-left: auto;
width: 18px;
- height: 18px;/* Icon height + 3px */
+ height: 18px; /* Icon height + 3px */
/* @embed */
background: url(../images/user-small.png) top right no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/user-small.svg);
@@ -95,7 +95,6 @@
background-image: linear-gradient(transparent, transparent),
url(../images/translate.svg);
height: 40px;
}
-
.tux-proofread-action {
/* @embed */
@@ -134,7 +133,6 @@
.proofread-by-others .tux-proofread-action.accepted:hover {
background-position: right -217px;
}
-
.tux-proofread-edit {
/* @embed */
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index 320b8a5..c1f585e 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -65,8 +65,8 @@
},
/**
- * Mark the message as no longer unsaved
- */
+ * Mark the message as no longer unsaved
+ */
markUnunsaved: function () {
this.$editTrigger.find( '.tux-list-status' )
.find( '.tux-status-unsaved' )
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index a16d960..9c08ddc 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -541,7 +541,7 @@
// Fix the filter if it is untranslated.
Untranslated does not make sense
// for proofread mode. Keep the filter if it is
not 'untranslated'
- if ( !filter || filter.indexOf( '!translated' )
>= 0 ) {
+ if ( !filter || filter.indexOf( '!translated' )
>= 0 ) {
messageTable.messages = [];
// default filter for proofread mode
mw.translate.changeFilter(
'translated|!reviewer:' + userId
@@ -560,7 +560,7 @@
$hideTranslatedButton.removeClass(
'hide' );
}
- if ( filter && filter.indexOf(
'!last-translator' ) >= 0 ) {
+ if ( filter && filter.indexOf(
'!last-translator' ) >= 0 ) {
messageTable.messages = [];
// default filter for translate mode
mw.translate.changeFilter(
'!translated' );
@@ -684,8 +684,6 @@
$.post( mw.util.wikiScript( 'api' ), params,
successFunction ).fail( failFunction );
} );
-
-
} );
diff --git a/resources/js/ext.translate.proofread.js
b/resources/js/ext.translate.proofread.js
index c64ccc4..8a97ad8 100644
--- a/resources/js/ext.translate.proofread.js
+++ b/resources/js/ext.translate.proofread.js
@@ -44,7 +44,7 @@
err( code, result );
}
};
- return new mw.Api().post( params, { ok : ok,
err : getTokenIfBad });
+ return new mw.Api().post( params, { ok: ok,
err: getTokenIfBad } );
}
},
@@ -92,7 +92,7 @@
function Proofread( element ) {
this.$message = $( element );
- this.$container = $( '.tux-messagelist' );
+ this.$container = $( '.tux-messagelist' );
this.message = this.$message.data( 'message' );
this.init();
this.listen();
diff --git a/resources/js/ext.translate.special.languagestats.js
b/resources/js/ext.translate.special.languagestats.js
index 8d90d5d..14d58f9 100644
--- a/resources/js/ext.translate.special.languagestats.js
+++ b/resources/js/ext.translate.special.languagestats.js
@@ -32,7 +32,7 @@
// Build toggle link
$toggler = $( '<span class="groupexpander collapsed">[</span>' )
.append( $( '<a href="#"></a>' )
- .text( mw.msg( 'translate-langstats-expand' ) ) )
+ .text( mw.msg( 'translate-langstats-expand' ) )
)
.append( ']' )
.click( function ( e ) {
var $el = $( this );
@@ -68,7 +68,7 @@
$allTogglesCache = null;
$toggleAllButton = $( '<span class="collapsed">[</span>' )
.append( $( '<a href="#"></a>' )
- .text( mw.msg( 'translate-langstats-expandall' ) ) )
+ .text( mw.msg( 'translate-langstats-expandall' ) ) )
.append( ']' )
.click( function ( e ) {
var $el = $( this ),
diff --git a/resources/js/ext.translate.special.translate.js
b/resources/js/ext.translate.special.translate.js
index 6aad5e5..87a920e 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -169,14 +169,14 @@
$workflowStateSelector.append( $(
'<li>' )
.data( 'state', workflowstate )
.text( workflowstate._name )
- .on( 'click', function() {
+ .on( 'click', function () {
var $this = $( this );
$workflowStateSelector.find( '.selected' ).removeClass( 'selected' );
$this.addClass(
'selected' )
.parent().addClass( 'hide' );
workflowSelectionHandler( $this.data( 'state' ) );
- })
+ } )
);
}
} );
@@ -226,7 +226,7 @@
.filter( '.translated, .proofread' );
}
- function workflowSelectionHandler ( state ) {
+ function workflowSelectionHandler( state ) {
var $status = $( '.tux-workflow-status' );
$status.text( mw.msg( 'translate-workflow-set-doing' ) );
diff --git a/specials/SpecialManageGroups.php b/specials/SpecialManageGroups.php
index 4ba1847..aff2709 100644
--- a/specials/SpecialManageGroups.php
+++ b/specials/SpecialManageGroups.php
@@ -89,7 +89,6 @@
$this->getLegend()
);
-
$counter = 0;
$changefile = TranslateUtils::cacheFile( self::CHANGEFILE );
$reader = CdbReader::open( $changefile );
diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index 2c03a44..aaae26e 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
@@ -337,31 +337,30 @@
$out = $this->getOutput();
switch ( $params['task'] ) {
- case 'reviewall':
- case 'acceptqueue':
- // @todo handle these two separately
- unset( $params['task'] );
- $params['action'] = 'proofread';
- $out->redirect( $this->getTitle()->getLocalUrl( $params
) );
- break;
+ case 'reviewall':
+ case 'acceptqueue':
+ // @todo handle these two separately
+ unset( $params['task'] );
+ $params['action'] = 'proofread';
+ $out->redirect( $this->getTitle()->getLocalUrl(
$params ) );
+ break;
- case 'view':
- unset( $params['task'] );
- $params['filter'] = '';
- $out->redirect( $this->getTitle()->getLocalUrl( $params
) );
- break;
+ case 'view':
+ unset( $params['task'] );
+ $params['filter'] = '';
+ $out->redirect( $this->getTitle()->getLocalUrl(
$params ) );
+ break;
- // Optional does not directly map to the new UI.
- // Handle it as untranslated with optional filter.
- case 'optional':
- $params['optional'] = 1;
- case 'untranslated':
- unset( $params['task'] );
- $params['filter'] = '!translated';
- $out->redirect( $this->getTitle()->getLocalUrl( $params
) );
- break;
+ // Optional does not directly map to the new UI.
+ // Handle it as untranslated with optional filter.
+ case 'optional':
+ $params['optional'] = 1;
+ case 'untranslated':
+ unset( $params['task'] );
+ $params['filter'] = '!translated';
+ $out->redirect( $this->getTitle()->getLocalUrl(
$params ) );
+ break;
}
-
}
protected function settingsForm( $errors ) {
@@ -713,6 +712,7 @@
</div>'
);
}
+
protected function tuxWorkflowSelector() {
$selector = Html::element( 'div', array(
'class' => 'tux-workflow-status hide',
diff --git a/tag/PageTranslationLogFormatter.php
b/tag/PageTranslationLogFormatter.php
index fd07ec5..24ca87b 100644
--- a/tag/PageTranslationLogFormatter.php
+++ b/tag/PageTranslationLogFormatter.php
@@ -19,47 +19,46 @@
$type = $this->entry->getFullType();
switch ( $type ) {
- case 'pagetranslation/mark':
- $revision = $legacy['revision'];
+ case 'pagetranslation/mark':
+ $revision = $legacy['revision'];
- $targetPage = $this->makePageLink(
- $this->entry->getTarget(),
- array( 'oldid' => $revision )
- );
+ $targetPage = $this->makePageLink(
+ $this->entry->getTarget(),
+ array( 'oldid' => $revision )
+ );
- $params[2] = Message::rawParam( $targetPage );
- break;
+ $params[2] = Message::rawParam( $targetPage );
+ break;
- case 'pagetranslation/moveok':
- case 'pagetranslation/movenok':
- case 'pagetranslation/deletefnok':
- case 'pagetranslation/deletelnok':
- $target = $legacy['target'];
+ case 'pagetranslation/moveok':
+ case 'pagetranslation/movenok':
+ case 'pagetranslation/deletefnok':
+ case 'pagetranslation/deletelnok':
+ $target = $legacy['target'];
- $moveTarget = $this->makePageLink( Title::newFromText(
$target ) );
- $params[3] = Message::rawParam( $moveTarget );
- break;
+ $moveTarget = $this->makePageLink(
Title::newFromText( $target ) );
+ $params[3] = Message::rawParam( $moveTarget );
+ break;
- case 'pagetranslation/prioritylanguages':
- $params[3] = $legacy['force'];
- $languages = $legacy['languages'];
- if ( $languages !== false ) {
- $lang = $this->context->getLanguage();
+ case 'pagetranslation/prioritylanguages':
+ $params[3] = $legacy['force'];
+ $languages = $legacy['languages'];
+ if ( $languages !== false ) {
+ $lang = $this->context->getLanguage();
- $languages = array_map( 'trim', preg_split(
'/,/', $languages, -1, PREG_SPLIT_NO_EMPTY ) );
- $languages = array_map( function( $code ) use(
$lang ) {
- return TranslateUtils::getLanguageName(
$code, false, $lang->getCode() );
- }, $languages );
+ $languages = array_map( 'trim',
preg_split( '/,/', $languages, -1, PREG_SPLIT_NO_EMPTY ) );
+ $languages = array_map( function (
$code ) use ( $lang ) {
+ return
TranslateUtils::getLanguageName( $code, false, $lang->getCode() );
+ }, $languages );
- $params[4] = $lang->listToText( $languages );
- }
- break;
+ $params[4] = $lang->listToText(
$languages );
+ }
+ break;
- case 'pagetranslation/associate':
- case 'pagetranslation/dissociate':
- $params[3] = $legacy['aggregategroup'];
- break;
-
+ case 'pagetranslation/associate':
+ case 'pagetranslation/dissociate':
+ $params[3] = $legacy['aggregategroup'];
+ break;
}
return $params;
diff --git a/tests/ffs/GettextFFSTest.php b/tests/ffs/GettextFFSTest.php
index fe23168..d389b31 100644
--- a/tests/ffs/GettextFFSTest.php
+++ b/tests/ffs/GettextFFSTest.php
@@ -151,7 +151,7 @@
$pot['ctxt'] = 'context';
$this->assertEquals(
$results[2],
- trim( $method->invoke( $ffs, $key, $m, $trans, $pot,
$pluralCount ) )
+ trim( $method->invoke( $ffs, $key, $m, $trans, $pot,
$pluralCount ) )
);
}
}
diff --git a/utils/MessageTable.php b/utils/MessageTable.php
index 23cea7d..e7347be 100644
--- a/utils/MessageTable.php
+++ b/utils/MessageTable.php
@@ -83,7 +83,7 @@
$this->editLinkParams = $array;
}
- public function appendEditLinkParams( /*string*/ $key, /*string*/
$value ) {
+ public function appendEditLinkParams( /*string*/$key, /*string*/$value
) {
$this->editLinkParams[$key] = $value;
}
diff --git a/utils/TuxMessageTable.php b/utils/TuxMessageTable.php
index 7192bba..5439ce4 100644
--- a/utils/TuxMessageTable.php
+++ b/utils/TuxMessageTable.php
@@ -9,6 +9,7 @@
$this->group = $group;
$this->language = $language;
}
+
public function fullTable() {
$modules = array( 'ext.translate.editor' );
wfRunHooks( 'TranslateBeforeAddModules', array( &$modules ) );
--
To view, visit https://gerrit.wikimedia.org/r/54621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie000e71857cd8e5d5c0df326c7c30ebebc795b7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
