[MediaWiki-commits] [Gerrit] Remove i18n shim and remove $dir - change (mediawiki...intersection)

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

Change subject: Remove i18n shim and remove $dir
..


Remove i18n shim and remove $dir

Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df
(cherry picked from commit c00d747d6517157c0b24ca857fe30597cc49c505)
---
D DynamicPageList.i18n.php
M DynamicPageList.php
2 files changed, 1 insertion(+), 38 deletions(-)

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



diff --git a/DynamicPageList.i18n.php b/DynamicPageList.i18n.php
deleted file mode 100644
index f044899..000
--- a/DynamicPageList.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( 'wfJsonI18nShim09f33f1e7d2b716f' ) ) {
-   function wfJsonI18nShim09f33f1e7d2b716f( $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'][] = 
'wfJsonI18nShim09f33f1e7d2b716f';
-}
diff --git a/DynamicPageList.php b/DynamicPageList.php
index 9750ee4..69428f1 100644
--- a/DynamicPageList.php
+++ b/DynamicPageList.php
@@ -48,15 +48,13 @@
 );
 
 // Internationalization file
-$dir = __DIR__ . '/';
 $wgMessagesDirs['DynamicPageList'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['DynamicPageList'] = $dir . 
'DynamicPageList.i18n.php';
 
 // Parser tests
 // Warning, these only work when run with parserTests.php. There will be
 // failures if run via phpunit! (you may want to comment the below line
 // out if you're regularly running phpunit tests)
-$wgParserTestFiles[] = $dir . 'DynamicPageList.tests.txt';
+$wgParserTestFiles[] = __DIR__ . '/DynamicPageList.tests.txt';
 
 # Configuration variables. Warning: These use DLP instead of DPL
 # for historical reasons (pretend Dynamic list of pages)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/intersection
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Legoktm 
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 and remove $dir - change (mediawiki...intersection)

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

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

Change subject: Remove i18n shim and remove $dir
..

Remove i18n shim and remove $dir

Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df
(cherry picked from commit c00d747d6517157c0b24ca857fe30597cc49c505)
---
D DynamicPageList.i18n.php
M DynamicPageList.php
2 files changed, 1 insertion(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/intersection 
refs/changes/80/214080/1

diff --git a/DynamicPageList.i18n.php b/DynamicPageList.i18n.php
deleted file mode 100644
index f044899..000
--- a/DynamicPageList.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( 'wfJsonI18nShim09f33f1e7d2b716f' ) ) {
-   function wfJsonI18nShim09f33f1e7d2b716f( $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'][] = 
'wfJsonI18nShim09f33f1e7d2b716f';
-}
diff --git a/DynamicPageList.php b/DynamicPageList.php
index 9750ee4..69428f1 100644
--- a/DynamicPageList.php
+++ b/DynamicPageList.php
@@ -48,15 +48,13 @@
 );
 
 // Internationalization file
-$dir = __DIR__ . '/';
 $wgMessagesDirs['DynamicPageList'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['DynamicPageList'] = $dir . 
'DynamicPageList.i18n.php';
 
 // Parser tests
 // Warning, these only work when run with parserTests.php. There will be
 // failures if run via phpunit! (you may want to comment the below line
 // out if you're regularly running phpunit tests)
-$wgParserTestFiles[] = $dir . 'DynamicPageList.tests.txt';
+$wgParserTestFiles[] = __DIR__ . '/DynamicPageList.tests.txt';
 
 # Configuration variables. Warning: These use DLP instead of DPL
 # for historical reasons (pretend Dynamic list of pages)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/intersection
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 and remove $dir - change (mediawiki...intersection)

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

Change subject: Remove i18n shim and remove $dir
..


Remove i18n shim and remove $dir

Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df
---
D DynamicPageList.i18n.php
M DynamicPageList.php
2 files changed, 1 insertion(+), 38 deletions(-)

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



diff --git a/DynamicPageList.i18n.php b/DynamicPageList.i18n.php
deleted file mode 100644
index f044899..000
--- a/DynamicPageList.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( 'wfJsonI18nShim09f33f1e7d2b716f' ) ) {
-   function wfJsonI18nShim09f33f1e7d2b716f( $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'][] = 
'wfJsonI18nShim09f33f1e7d2b716f';
-}
diff --git a/DynamicPageList.php b/DynamicPageList.php
index 9750ee4..69428f1 100644
--- a/DynamicPageList.php
+++ b/DynamicPageList.php
@@ -48,15 +48,13 @@
 );
 
 // Internationalization file
-$dir = __DIR__ . '/';
 $wgMessagesDirs['DynamicPageList'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['DynamicPageList'] = $dir . 
'DynamicPageList.i18n.php';
 
 // Parser tests
 // Warning, these only work when run with parserTests.php. There will be
 // failures if run via phpunit! (you may want to comment the below line
 // out if you're regularly running phpunit tests)
-$wgParserTestFiles[] = $dir . 'DynamicPageList.tests.txt';
+$wgParserTestFiles[] = __DIR__ . '/DynamicPageList.tests.txt';
 
 # Configuration variables. Warning: These use DLP instead of DPL
 # for historical reasons (pretend Dynamic list of pages)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/intersection
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
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 and remove $dir - change (mediawiki...intersection)

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

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

Change subject: Remove i18n shim and remove $dir
..

Remove i18n shim and remove $dir

Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df
---
D DynamicPageList.i18n.php
M DynamicPageList.php
A i18n/awa.json
3 files changed, 10 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/intersection 
refs/changes/98/211398/1

diff --git a/DynamicPageList.i18n.php b/DynamicPageList.i18n.php
deleted file mode 100644
index f044899..000
--- a/DynamicPageList.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( 'wfJsonI18nShim09f33f1e7d2b716f' ) ) {
-   function wfJsonI18nShim09f33f1e7d2b716f( $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'][] = 
'wfJsonI18nShim09f33f1e7d2b716f';
-}
diff --git a/DynamicPageList.php b/DynamicPageList.php
index 9750ee4..69428f1 100644
--- a/DynamicPageList.php
+++ b/DynamicPageList.php
@@ -48,15 +48,13 @@
 );
 
 // Internationalization file
-$dir = __DIR__ . '/';
 $wgMessagesDirs['DynamicPageList'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['DynamicPageList'] = $dir . 
'DynamicPageList.i18n.php';
 
 // Parser tests
 // Warning, these only work when run with parserTests.php. There will be
 // failures if run via phpunit! (you may want to comment the below line
 // out if you're regularly running phpunit tests)
-$wgParserTestFiles[] = $dir . 'DynamicPageList.tests.txt';
+$wgParserTestFiles[] = __DIR__ . '/DynamicPageList.tests.txt';
 
 # Configuration variables. Warning: These use DLP instead of DPL
 # for historical reasons (pretend Dynamic list of pages)
diff --git a/i18n/awa.json b/i18n/awa.json
new file mode 100644
index 000..fd5b4b1
--- /dev/null
+++ b/i18n/awa.json
@@ -0,0 +1,9 @@
+{
+   "@metadata": {
+   "authors": [
+   "1AnuraagPandey"
+   ]
+   },
+   "intersection-desc": "एक श्रेणी या श्रेणीसमूहमें उपलब्ध नवीनतम लेख 
दर्शायें।",
+   "intersection_toomanycats": "Error: बहुत ज्यादा श्रेणी!"
+}

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

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

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