jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/365558 )

Change subject: Do some maintenance
......................................................................


Do some maintenance

* Remove I18n shim
* Bump version
* Extend CHANGELOG
* Tweak author's array

Note: Breaks compatibility with MediaWiki 1.22.x and lower

Bug:T168353
Change-Id: Ia2c2b4e3a3a94c3d67b0c859eebe4584703cd0f6
---
D BreadCrumbs.i18n.php
M BreadCrumbs.php
M CHANGELOG
3 files changed, 23 insertions(+), 44 deletions(-)

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



diff --git a/BreadCrumbs.i18n.php b/BreadCrumbs.i18n.php
deleted file mode 100644
index 2abcfe8..0000000
--- a/BreadCrumbs.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * 
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( 'wfJsonI18nShime1251831460ede75' ) ) {
-       function wfJsonI18nShime1251831460ede75( $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'][] = 
'wfJsonI18nShime1251831460ede75';
-}
diff --git a/BreadCrumbs.php b/BreadCrumbs.php
index 804b8c7..25d153e 100644
--- a/BreadCrumbs.php
+++ b/BreadCrumbs.php
@@ -10,7 +10,7 @@
  * @package MediaWiki
  * @author Manuel Schneider <[email protected]>, Tony Boyles 
<[email protected]>
  * @copyright © 2007 by Manuel Schneider, 2012 by Tony Boyles, Milcord llc
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
+ * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
@@ -23,10 +23,11 @@
        'path' => __FILE__,
        'name' => 'BreadCrumbs',
        'descriptionmsg' => 'breadcrumbs-desc',
-       'version' => '0.4.1',
+       'version' => '0.5.0',
        'author' => array(
                'Manuel Schneider',
-               '[http://milcord.com Tony Boyles, Milcord llc]'
+               'Tony Boyles',
+               '...'
        ),
        'url' => 'https://www.mediawiki.org/wiki/Extension:BreadCrumbs',
        'license-name' => 'GPL-2.0+'
@@ -83,7 +84,6 @@
 
 # Register the internationalization file
 $wgMessagesDirs['Breadcrumbs'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Breadcrumbs'] = __DIR__ . '/BreadCrumbs.i18n.php';
 
 # Load the file containing the hook functions:
 require_once( 'BreadCrumbsFunctions.php' );
diff --git a/CHANGELOG b/CHANGELOG
index fd38e27..e605d2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,17 +1,31 @@
-* v0.3 - 2012-06-26
+This file contains the CHANGELOG (version history) of the BreadCrumbs 
extension.
+
+* v0.5.0 - 2017-07-17
+  - Remove I18n shim
+
+* v0.4.1 - 2016-03-18
+  - Add license lable to show on "Special:Version"
+  - Fix "typos" in the LICENSE file
+  - Fix style position warnings
+  - Switch to consitently use DIR
+
+* v0.4.0 - 2014-03-30
+  - Migrate to JSON i18n
+
+* v0.3.0 - 2012-06-26
   - Began to restrict options for better administration
   - Provided loading for CSS, instructions for overriding CSS
 
-* v0.2b - 2012-06-14
-  - Exposed a variety of options to the user in [[Special:Preferences]]
+* v0.2.1 - 2012-06-14
+  - Exposed a variety of options to the user in "Special:Preferences"
   - Provided advanced logic for breadcrumb creation/handling
 
-* v0.2 - 2012-06-12
+* v0.2.0 - 2012-06-12
   - fixed breadcrumb uniqueness checker
   - removed CSS file, replaced with in-wiki formatting
   - Checked for use of deprecated wiki functions
 
-* v0.1 - 2007-03-21
+* v0.1.0 - 2007-03-21
   - first working version
   - added CSS file
   - restructured

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2c2b4e3a3a94c3d67b0c859eebe4584703cd0f6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BreadCrumbs
Gerrit-Branch: master
Gerrit-Owner: Kghbln <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to