Paladox has uploaded a new change for review.

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

Change subject: Remove i18n shim
......................................................................

Remove i18n shim

Change-Id: Ic98f643d02c0e2a51fd07bf8a2d8a6cedba02135
---
D AbuseFilter.i18n.php
M AbuseFilter.php
M i18n/as.json
M i18n/de.json
4 files changed, 3 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/63/222563/1

diff --git a/AbuseFilter.i18n.php b/AbuseFilter.i18n.php
deleted file mode 100644
index ba953a4..0000000
--- a/AbuseFilter.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( 'wfJsonI18nShim63590d5a30bb7ce5' ) ) {
-       function wfJsonI18nShim63590d5a30bb7ce5( $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'][] = 
'wfJsonI18nShim63590d5a30bb7ce5';
-}
diff --git a/AbuseFilter.php b/AbuseFilter.php
index 38cbab8..7508ef5 100644
--- a/AbuseFilter.php
+++ b/AbuseFilter.php
@@ -26,7 +26,6 @@
 
 $dir = __DIR__;
 $wgMessagesDirs['AbuseFilter'] = "$dir/i18n";
-$wgExtensionMessagesFiles['AbuseFilter'] = "$dir/AbuseFilter.i18n.php";
 $wgExtensionMessagesFiles['AbuseFilterAliases'] = "$dir/AbuseFilter.alias.php";
 
 $wgAutoloadClasses['AbuseFilter'] = "$dir/AbuseFilter.class.php";
diff --git a/i18n/as.json b/i18n/as.json
index 41dca0d..9ec87ca 100644
--- a/i18n/as.json
+++ b/i18n/as.json
@@ -15,7 +15,7 @@
        "right-abusefilter-view": "অপব্যৱহাৰ চেকনী চাওক",
        "action-abusefilter-modify": "অপব্যৱহাৰ ফিল্টাৰ সালসলনি কৰক ।",
        "action-abusefilter-view": "অপব্যৱহাৰ ছেকনী চাওক ।",
-       "abusefilter-log": "অপব্যৱহা্ৰ পৰিশ্ৰাৱক অভিলেখ",
+       "abusefilter-log": "অপব্যৱহাৰ পৰিশ্ৰাৱক অভিলেখ",
        "abusefilter-log-search-user": "সদস্য:",
        "abusefilter-log-search-filter": "পৰিশ্ৰাৱক আইডি:",
        "abusefilter-log-search-title": "শিৰোনামা",
diff --git a/i18n/de.json b/i18n/de.json
index e5f928c..535c669 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -423,6 +423,8 @@
        "apihelp-abusefilterevalexpression-example-1": "Evaluiert einen 
einfachen Ausdruck",
        "apihelp-abusefilterunblockautopromote-param-user": "Benutzername des 
Benutzers, den du freigeben möchtest.",
        "apihelp-query+abusefilters-description": "Einzelheiten über die 
Missbrauchsfilter anzeigen.",
+       "apihelp-query+abusefilters-param-startid": "Die Filterkennung, bei der 
die Aufzählung beginnen soll.",
+       "apihelp-query+abusefilters-param-endid": "Die Filterkennung, bei der 
die Aufzählung enden soll.",
        "apihelp-query+abusefilters-param-show": "Nur Filter anzeigen, die 
diese Kriterien erfüllen.",
        "apihelp-query+abusefilters-param-limit": "Die maximale Anzahl 
aufzulistender Filter.",
        "apihelp-query+abusefilters-example-1": "Aktivierte öffentliche Filter 
auflisten",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic98f643d02c0e2a51fd07bf8a2d8a6cedba02135
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>

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

Reply via email to