[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...CharInsert)

2015-05-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove i18n shim
..


Remove i18n shim

Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
(cherry picked from commit 8cc075ea1e43f39249141c93137b3792901cc88a)
---
D CharInsert.i18n.php
M extension.json
2 files changed, 0 insertions(+), 38 deletions(-)

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



diff --git a/CharInsert.i18n.php b/CharInsert.i18n.php
deleted file mode 100644
index 8fd8dc0..000
--- a/CharInsert.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( 'wfJsonI18nShime4fc00e265fc0f96' ) ) {
-   function wfJsonI18nShime4fc00e265fc0f96( $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'][] = 
'wfJsonI18nShime4fc00e265fc0f96';
-}
diff --git a/extension.json b/extension.json
index 6ef8475..8933dc0 100644
--- a/extension.json
+++ b/extension.json
@@ -4,9 +4,6 @@
"url": "https://www.mediawiki.org/wiki/Extension:CharInsert";,
"descriptionmsg": "charinsert-desc",
"type": "parserhook",
-   "ExtensionMessagesFiles": {
-   "CharInsert": "CharInsert.i18n.php"
-   },
"Hooks": {
"ParserFirstCallInit": [
"CharInsert::onParserFirstCallInit"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...CharInsert)

2015-05-08 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Remove i18n shim
..

Remove i18n shim

Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
(cherry picked from commit 8cc075ea1e43f39249141c93137b3792901cc88a)
---
D CharInsert.i18n.php
M extension.json
2 files changed, 0 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CharInsert 
refs/changes/93/209793/1

diff --git a/CharInsert.i18n.php b/CharInsert.i18n.php
deleted file mode 100644
index 8fd8dc0..000
--- a/CharInsert.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( 'wfJsonI18nShime4fc00e265fc0f96' ) ) {
-   function wfJsonI18nShime4fc00e265fc0f96( $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'][] = 
'wfJsonI18nShime4fc00e265fc0f96';
-}
diff --git a/extension.json b/extension.json
index 6ef8475..8933dc0 100644
--- a/extension.json
+++ b/extension.json
@@ -4,9 +4,6 @@
"url": "https://www.mediawiki.org/wiki/Extension:CharInsert";,
"descriptionmsg": "charinsert-desc",
"type": "parserhook",
-   "ExtensionMessagesFiles": {
-   "CharInsert": "CharInsert.i18n.php"
-   },
"Hooks": {
"ParserFirstCallInit": [
"CharInsert::onParserFirstCallInit"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...CharInsert)

2015-05-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove i18n shim
..


Remove i18n shim

Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
---
D CharInsert.i18n.php
M extension.json
2 files changed, 0 insertions(+), 38 deletions(-)

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



diff --git a/CharInsert.i18n.php b/CharInsert.i18n.php
deleted file mode 100644
index 8fd8dc0..000
--- a/CharInsert.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( 'wfJsonI18nShime4fc00e265fc0f96' ) ) {
-   function wfJsonI18nShime4fc00e265fc0f96( $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'][] = 
'wfJsonI18nShime4fc00e265fc0f96';
-}
diff --git a/extension.json b/extension.json
index 7caa095..dc80d1e 100644
--- a/extension.json
+++ b/extension.json
@@ -5,9 +5,6 @@
"descriptionmsg": "charinsert-desc",
"license-name": "GPL-2.0+",
"type": "parserhook",
-   "ExtensionMessagesFiles": {
-   "CharInsert": "CharInsert.i18n.php"
-   },
"Hooks": {
"ParserFirstCallInit": [
"CharInsert::onParserFirstCallInit"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Raimond Spekking 
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] Remove i18n shim - change (mediawiki...CharInsert)

2015-05-08 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Remove i18n shim
..

Remove i18n shim

Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
---
D CharInsert.i18n.php
M CharInsert.php
M extension.json
3 files changed, 2 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CharInsert 
refs/changes/74/209774/1

diff --git a/CharInsert.i18n.php b/CharInsert.i18n.php
deleted file mode 100644
index 8fd8dc0..000
--- a/CharInsert.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( 'wfJsonI18nShime4fc00e265fc0f96' ) ) {
-   function wfJsonI18nShime4fc00e265fc0f96( $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'][] = 
'wfJsonI18nShime4fc00e265fc0f96';
-}
diff --git a/CharInsert.php b/CharInsert.php
index a6de739..e77cf9b 100644
--- a/CharInsert.php
+++ b/CharInsert.php
@@ -43,6 +43,7 @@
'author' => 'Brion Vibber',
'url' => 'https://www.mediawiki.org/wiki/Extension:CharInsert',
'descriptionmsg' => 'charinsert-desc',
+   'license-name' => 'GPL-2.0+',
 );
 
 $wgAutoloadClasses['CharInsert'] = __DIR__ . '/CharInsert.body.php';
diff --git a/extension.json b/extension.json
index 6ef8475..dc80d1e 100644
--- a/extension.json
+++ b/extension.json
@@ -3,10 +3,8 @@
"author": "Brion Vibber",
"url": "https://www.mediawiki.org/wiki/Extension:CharInsert";,
"descriptionmsg": "charinsert-desc",
+   "license-name": "GPL-2.0+",
"type": "parserhook",
-   "ExtensionMessagesFiles": {
-   "CharInsert": "CharInsert.i18n.php"
-   },
"Hooks": {
"ParserFirstCallInit": [
"CharInsert::onParserFirstCallInit"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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