Jarry1250 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153061
Change subject: Rename some badly named properties
......................................................................
Rename some badly named properties
Change-Id: Ic817b8915000c64da76b42a2ed842a4ef7011365
---
M SVGFormatReader.php
1 file changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslateSvg
refs/changes/61/153061/1
diff --git a/SVGFormatReader.php b/SVGFormatReader.php
index 5c0e1fb..3e177a1 100644
--- a/SVGFormatReader.php
+++ b/SVGFormatReader.php
@@ -41,7 +41,8 @@
* Initialise a new SVGFormatReader from an SVGMessageGroup and an
optional array of translation overrides
*
* @param SVGMessageGroup $group
- * @param array $overrides Optional array of translation overrides to
be folded in later
+ * @param array $inProgressTranslations Optional array of translation
overrides to be folded in later
+ * @throws MWException if file not found
*/
public function __construct( SVGMessageGroup $group, $overrides =
array() ) {
$this->group = $group;
@@ -49,7 +50,7 @@
$title = Title::makeTitleSafe( NS_FILE, $this->group->getId() );
$file = wfFindFile( $title );
- if ( !$title->exists() || !$file || !$file->exists() ) {
+ if ( !$file || !$file->exists() ) {
return null;
}
@@ -63,7 +64,7 @@
$this->xpath->registerNamespace( 'svg',
'http://www.w3.org/2000/svg' );
if ( !$this->makeTranslationReady() ) {
- return null;
+ throw new MWException( 'file not found' );
}
}
@@ -71,10 +72,11 @@
* Makes $this->svg ready for translation by inserting <switch> tags
where they need to be, etc.
* Also works as a check on the compatibility of the file since it will
return false if it fails.
*
+ * @todo: Find a way of making isTranslationReady a proper check
+ * @todo: add interlanguage consistency check=
* @return bool False on failure, true on success
*/
protected function makeTranslationReady() {
- // TODO: add interlanguage consistency check
if ( $this->isTranslationReady ) {
return true;
}
@@ -259,16 +261,16 @@
$translations = $this->getInFileTranslations();
$newTranslations = $this->getOnWikiTranslations();
- // Collapse overrides into new translations
- foreach ( $this->overrides as $key => $languages ) {
+ // Collapse in-progress translations into on-wiki translations
+ foreach ( $inProgressTranslations as $key => $languages ) {
foreach ( $languages as $language => $translation ) {
$language = ( $this->group->getSourceLanguage()
=== $language ) ? 'fallback' : $language;
$newTranslations[$key][$language] =
TranslateSvgUtils::translationToArray( $translation );
}
}
- // Collapse new translations into old translations
- foreach ( $newTranslations as $key => $languages ) {
+ // Collapse on-wiki translations translations into in-progress
translations
+ foreach ( $onWikiTranslations as $key => $languages ) {
foreach ( $languages as $language => $translation ) {
$oldItem = isset(
$translations[$key][$language] ) ? $translations[$key][$language] : array();
$translations[$key][$language] =
$newTranslations[$key][$language] + $oldItem;
--
To view, visit https://gerrit.wikimedia.org/r/153061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic817b8915000c64da76b42a2ed842a4ef7011365
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TranslateSvg
Gerrit-Branch: master
Gerrit-Owner: Jarry1250 <jarry1...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
