[MediaWiki-commits] [Gerrit] Drop b/c for i18n - change (mediawiki...UpdateMediaWiki)

2016-06-25 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Drop b/c for i18n
..


Drop b/c for i18n

Change-Id: Ie036201e33738b13690c473b1b2ea36292d07bb7
---
M extension.json
D updatemediawiki.i18n.php
2 files changed, 0 insertions(+), 36 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 002764c..c698bd5 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,6 @@
]
},
"ExtensionMessagesFiles": {
-   "updatemediawiki": "updatemediawiki.i18n.php",
"updatemediawikiAlias": "updatemediawiki.alias.php"
},
"AutoloadClasses": {
diff --git a/updatemediawiki.i18n.php b/updatemediawiki.i18n.php
deleted file mode 100644
index 1802b2b..000
--- a/updatemediawiki.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim9648fbddfca06a8b' ) ) {
-   function wfJsonI18nShim9648fbddfca06a8b( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim9648fbddfca06a8b';
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/291496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie036201e33738b13690c473b1b2ea36292d07bb7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UpdateMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Miguel2706 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Drop b/c for i18n - change (mediawiki...UpdateMediaWiki)

2016-05-28 Thread Code Review 
Matěj Suchánek has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291496

Change subject: Drop b/c for i18n
..

Drop b/c for i18n

Change-Id: Ie036201e33738b13690c473b1b2ea36292d07bb7
---
M extension.json
D updatemediawiki.i18n.php
2 files changed, 0 insertions(+), 36 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UpdateMediaWiki 
refs/changes/96/291496/1

diff --git a/extension.json b/extension.json
index 002764c..c698bd5 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,6 @@
]
},
"ExtensionMessagesFiles": {
-   "updatemediawiki": "updatemediawiki.i18n.php",
"updatemediawikiAlias": "updatemediawiki.alias.php"
},
"AutoloadClasses": {
diff --git a/updatemediawiki.i18n.php b/updatemediawiki.i18n.php
deleted file mode 100644
index 1802b2b..000
--- a/updatemediawiki.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim9648fbddfca06a8b' ) ) {
-   function wfJsonI18nShim9648fbddfca06a8b( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim9648fbddfca06a8b';
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/291496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie036201e33738b13690c473b1b2ea36292d07bb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UpdateMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits