Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/218125
Change subject: Use canonical class name for FormatJson ...................................................................... Use canonical class name for FormatJson Change-Id: I52ac65fddc70be9cc4888ffc68c28b40a85f9f7d --- M ffs/AmdFFS.php M ffs/JsonFFS.php 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/25/218125/1 diff --git a/ffs/AmdFFS.php b/ffs/AmdFFS.php index d6caa9f..d057971 100644 --- a/ffs/AmdFFS.php +++ b/ffs/AmdFFS.php @@ -52,7 +52,7 @@ */ public static function isValid( $data ) { $data = AmdFFS::extractMessagePart( $data ); - return is_array( FormatJSON::decode( $data, /*as array*/true ) ); + return is_array( FormatJson::decode( $data, /*as array*/true ) ); } public function getFileExtensions() { @@ -66,7 +66,7 @@ public function readFromVariable( $data ) { $authors = AmdFFS::extractAuthors( $data ); $data = AmdFFS::extractMessagePart( $data ); - $messages = (array) FormatJSON::decode( $data, /*as array*/true ); + $messages = (array) FormatJson::decode( $data, /*as array*/true ); $metadata = array(); // Take care of regular language bundles, as well as the root bundle. @@ -113,7 +113,7 @@ return ''; } $header = $this->header( $collection->code, $collection->getAuthors() ); - return $header . FormatJSON::encode( $messages, "\t", FormatJson::UTF8_OK ) . ");\n"; + return $header . FormatJson::encode( $messages, "\t", FormatJson::UTF8_OK ) . ");\n"; } /** diff --git a/ffs/JsonFFS.php b/ffs/JsonFFS.php index 7534582..e9758a5 100644 --- a/ffs/JsonFFS.php +++ b/ffs/JsonFFS.php @@ -22,7 +22,7 @@ * @return bool */ public static function isValid( $data ) { - return is_array( FormatJSON::decode( $data, /*as array*/true ) ); + return is_array( FormatJson::decode( $data, /*as array*/true ) ); } public function getFileExtensions() { @@ -34,7 +34,7 @@ * @return array Parsed data. */ public function readFromVariable( $data ) { - $messages = (array) FormatJSON::decode( $data, /*as array*/true ); + $messages = (array) FormatJson::decode( $data, /*as array*/true ); $authors = array(); $metadata = array(); @@ -105,6 +105,6 @@ return ''; } - return FormatJSON::encode( $messages, "\t", FormatJson::ALL_OK ) . "\n"; + return FormatJson::encode( $messages, "\t", FormatJson::ALL_OK ) . "\n"; } } -- To view, visit https://gerrit.wikimedia.org/r/218125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52ac65fddc70be9cc4888ffc68c28b40a85f9f7d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits