jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45115) Only export languages that can be translated
......................................................................
(bug 45115) Only export languages that can be translated
Also break a few long lines.
Change-Id: I118911ca62708b32ce3576fd8f3ba7746008a9a0
---
M scripts/export.php
1 file changed, 26 insertions(+), 3 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/export.php b/scripts/export.php
index 4c901cb..fcfbf41 100644
--- a/scripts/export.php
+++ b/scripts/export.php
@@ -9,7 +9,17 @@
* @file
*/
-$optionsWithArgs = array( 'target', 'lang', 'skip', 'group', 'skipgroup',
'threshold', 'ppgettext', 'hours' );
+$optionsWithArgs = array(
+ 'group',
+ 'hours',
+ 'lang',
+ 'ppgettext',
+ 'skip',
+ 'skipgroup',
+ 'target',
+ 'threshold',
+);
+
require( dirname( __FILE__ ) . '/cli.inc' );
function showUsage() {
@@ -223,8 +233,19 @@
$definitionFile = str_replace( $wgTranslateGroupRoot,
$options['ppgettext'], $path );
}
+ $translatebleLanguages = $group->getTranslatableLanguages();
+
foreach ( $langs as $lang ) {
if ( !$group->isValidLanguage( $lang ) ) {
+ continue;
+ }
+
+ // Do not export languges that are blacklisted (or not
whitelisted). As
+ // $translatebleLanguages can be null, only test if
$translatebleLanguages
+ // is an array.
+ if ( is_array( $translatebleLanguages ) &&
+ !in_array( $lang, $translatebleLanguages )
+ ) {
continue;
}
@@ -248,8 +269,10 @@
// Do post processing if requested.
if ( $definitionFile ) {
if ( is_file( $definitionFile ) ) {
- $targetFileName = $ffs->getWritePath()
. "/" . $group->getTargetFilename( $collection->code );
- $cmd = "msgmerge --quiet " .
$noLocation . "--output-file=" . $targetFileName . ' ' . $targetFileName . ' '
. $definitionFile;
+ $targetFileName = $ffs->getWritePath() .
+ "/" .
$group->getTargetFilename( $collection->code );
+ $cmd = "msgmerge --quiet " .
$noLocation . "--output-file=" .
+ $targetFileName . ' ' .
$targetFileName . ' ' . $definitionFile;
wfShellExec( $cmd, $ret );
// Report on errors.
--
To view, visit https://gerrit.wikimedia.org/r/49620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I118911ca62708b32ce3576fd8f3ba7746008a9a0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
