Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
......................................................................


Implemented changes for translatewiki

Moved to Json i18n files
Fixed escaped linebreaks
Put parameter inside a message into code tags

Change-Id: Ia6614ef48911a05c771a8e41657c91e451f61d15
---
A WhoIsOnline/i18n/de.json
A WhoIsOnline/i18n/en.json
A WhoIsOnline/i18n/qqq.json
M WhoIsOnline/languages/WhoIsOnline.i18n.php
4 files changed, 84 insertions(+), 61 deletions(-)

Approvals:
  Smuggli: Verified; Looks good to me, approved
  Siebrand: Looks good to me, but someone else must approve



diff --git a/WhoIsOnline/i18n/de.json b/WhoIsOnline/i18n/de.json
new file mode 100644
index 0000000..0978cbf
--- /dev/null
+++ b/WhoIsOnline/i18n/de.json
@@ -0,0 +1,19 @@
+{
+       "@metadata": {
+               "authors": [
+                       "Stephan Muggli <[email protected]>"
+               ]
+       },
+       "bs-whoisonline-desc": "Zeigt eine Liste der User an, die momentan 
online sind",
+       "bs-whoisonline-nousers": "Es ist niemand angemeldet.",
+       "bs-whoisonline-widget-title": "Wer ist online?",
+       "prefs-WhoIsOnline": "Wer ist online?",
+       "bs-whoisonline-pref-limitcount": "Maximale Zahl der angezeigten 
Nutzer:",
+       "bs-whoisonline-pref-orderby": "Sortieren nach:",
+       "bs-whoisonline-pref-maxidletime": "Zeit, nach der ein inaktiver 
Benutzer nicht mehr als Online angezeigt wird (Sekunden)",
+       "bs-whoisonline-pref-orderby-time": "Onlinezeit",
+       "bs-whoisonline-pref-orderby-name": "Name",
+       "bs-whoisonline-pref-interval": "Aktualisierungsintervall in Sekunden:",
+       "bs-whoisonline-tag-whoisonlinecount-desc": "Gibt die Anzahl der 
Benutzer aus, die gerade angemeldet sind.",
+       "bs-whoisonline-tag-whoisonlinepopup-desc": "Stellt eine aufklappbare 
Liste der gerade angemeldeten Benutzer da.\n\nVerfügbare 
Parameter:\n;<code>anchortext</code>: Der Text, an dem die Liste ausklappt."
+}
diff --git a/WhoIsOnline/i18n/en.json b/WhoIsOnline/i18n/en.json
new file mode 100644
index 0000000..41b6c37
--- /dev/null
+++ b/WhoIsOnline/i18n/en.json
@@ -0,0 +1,19 @@
+{
+       "@metadata": {
+               "authors": [
+                       "Stephan Muggli <[email protected]>"
+               ]
+       },
+       "bs-whoisonline-desc": "Displays a list of users who are currently 
online",
+       "bs-whoisonline-nousers": "Nobody is logged in.",
+       "bs-whoisonline-widget-title": "Who is online?",
+       "prefs-whoisonline": "Who is online?",
+       "bs-whoisonline-pref-limitcount": "Maximum number of users shown:",
+       "bs-whoisonline-pref-orderby": "Sort by:",
+       "bs-whoisonline-pref-maxidletime": "Time in seconds until a user is 
marked as offline:",
+       "bs-whoisonline-pref-orderby-time": "Uptime",
+       "bs-whoisonline-pref-orderby-name": "Name",
+       "bs-whoisonline-pref-interval": "Update interval in seconds:",
+       "bs-whoisonline-tag-whoisonlinecount-desc": "Renders the number of 
currently logged in users.",
+       "bs-whoisonline-tag-whoisonlinepopup-desc": "Renders a little fly-out 
list of currently logged in users.\n\nValid 
attributes:\n;<code>anchortext</code>: The text you want the fly-out to be 
attached to."
+}
diff --git a/WhoIsOnline/i18n/qqq.json b/WhoIsOnline/i18n/qqq.json
new file mode 100644
index 0000000..1566663
--- /dev/null
+++ b/WhoIsOnline/i18n/qqq.json
@@ -0,0 +1,19 @@
+{
+       "@metadata": {
+               "authors": [
+                       "Stephan Muggli <[email protected]>"
+               ]
+       },
+       "bs-whoisonline-desc": "Used in 
[[Special:Wiki_Admin&mode=ExtensionInfo]], description of who is online 
extension",
+       "bs-whoisonline-nousers": "Text for nobody is logged in.",
+       "bs-whoisonline-widget-title": "Widget headline for who is online?\n 
{{Identical|Who is online?}}",
+       "prefs-whoisonline": "Used in [[Special:Wiki_Admin&mode=Preferences]], 
headline for who is online section.\n{{Identical|Who is online?}}",
+       "bs-whoisonline-pref-limitcount": "Option in 
[[Special:Wiki_Admin&mode=Preferences]], label for maximum number of users 
shown:",
+       "bs-whoisonline-pref-orderby": "Option in 
[[Special:Wiki_Admin&mode=Preferences]], label for sort by:",
+       "bs-whoisonline-pref-maxidletime": "Option in 
[[Special:Wiki_Admin&mode=Preferences]], label for time in seconds until a user 
is marked as offline:",
+       "bs-whoisonline-pref-orderby-time": "Option in 
[[Special:Wiki_Admin&mode=Preferences]], option label for uptime",
+       "bs-whoisonline-pref-orderby-name": "Option in 
[[Special:Wiki_Admin&mode=Preferences]], option label for name",
+       "bs-whoisonline-pref-interval": "Option in 
[[Special:Wiki_Admin&mode=Preferences]], label for update interval in seconds:",
+       "bs-whoisonline-tag-whoisonlinecount-desc": "Used in InsertMagic 
extension, tag description for renders the number of currently logged in 
users.",
+       "bs-whoisonline-tag-whoisonlinepopup-desc": "Used in InsertMagic 
extension, tag description for renders a little fly-out list of currently 
logged in users.\n\nValid attributes:\n;<code>anchortext</code>: Explanation 
text for the text you want the fly-out to be attached to."
+}
diff --git a/WhoIsOnline/languages/WhoIsOnline.i18n.php 
b/WhoIsOnline/languages/WhoIsOnline.i18n.php
index bbd594e..8a753a7 100644
--- a/WhoIsOnline/languages/WhoIsOnline.i18n.php
+++ b/WhoIsOnline/languages/WhoIsOnline.i18n.php
@@ -1,69 +1,35 @@
 <?php
 /**
- * Internationalisation file for WhoIsOnline
+ * This is a backwards-compatibility shim, generated by:
+ * 
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
  *
- * Part of BlueSpice for MediaWiki
+ * 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
  *
- * @author     Stephan Muggli <[email protected]>
- * @package    BlueSpice_Extensions
- * @subpackage WhoIsOnline
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @license    http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
+ * This shim maintains compatibility back to MediaWiki 1.17.
  */
-
 $messages = array();
+if ( !function_exists( 'wfJsonI18nShim00eec42f69d41163' ) ) {
+       function wfJsonI18nShim00eec42f69d41163( $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'] );
+                       }
 
-$messages['en'] = array(
-       'bs-whoisonline-desc' => 'Displays a list of users who are currently 
online.',
-       'bs-whoisonline-nousers' => 'Nobody is logged in.',
-       'bs-whoisonline-widget-title' => 'Who is online?',
-       'prefs-whoisonline' => 'Who is online?',
-       'bs-whoisonline-pref-limitcount' => 'Maximum number of users shown:',
-       'bs-whoisonline-pref-orderby' => 'Sort by:',
-       'bs-whoisonline-pref-maxidletime' => 'Time in seconds until a user is 
marked as offline:',
-       'bs-whoisonline-pref-orderby-time' => 'Uptime',
-       'bs-whoisonline-pref-orderby-name' => 'Name',
-       'bs-whoisonline-pref-interval' => 'Update interval in seconds:',
-       'bs-whoisonline-tag-whoisonlinecount-desc' => 'Renders the number of 
currently logged in users.',
-       'bs-whoisonline-tag-whoisonlinepopup-desc' => 'Renders a little fly-out 
list of currently logged in users.
+                       $cachedData['deps'][] = new FileDependency( $fileName );
+               }
+               return true;
+       }
 
-Valid attributes:
-;anchortext: The text you want the fly-out to be attached to.'
-);
-
-$messages['de'] = array(
-       'bs-whoisonline-desc' => 'Zeigt eine Liste der User an, die momentan 
online sind.',
-       'bs-whoisonline-nousers' => 'Es ist niemand angemeldet.',
-       'bs-whoisonline-widget-title' => 'Wer ist online?',
-       'prefs-WhoIsOnline' => 'Wer ist online?',
-       'bs-whoisonline-pref-limitcount' => 'Maximale Zahl der angezeigten 
Nutzer:',
-       'bs-whoisonline-pref-orderby' => 'Sortieren nach:',
-       'bs-whoisonline-pref-maxidletime' => 'Zeit, nach der ein inaktiver 
Benutzer nicht mehr als Online angezeigt wird (Sekunden)',
-       'bs-whoisonline-pref-orderby-time' => 'Onlinezeit',
-       'bs-whoisonline-pref-orderby-name' => 'Name',
-       'bs-whoisonline-pref-interval' => 'Aktualisierungsintervall in 
Sekunden:',
-       'bs-whoisonline-tag-whoisonlinecount-desc' => 'Gibt die Anzahl der 
Benutzer aus, die gerade angemeldet sind.',
-       'bs-whoisonline-tag-whoisonlinepopup-desc' => 'Stellt eine aufklappbare 
Liste der gerade angemeldeten Benutzer da.
-
-Verfügbare Parameter:
-;anchortext: Der Text, an dem die Liste ausklappt.'
-);
-
-$messages['qqq'] = array(
-       'bs-whoisonline-desc' => 'Used in 
[[Special:Wiki_Admin&mode=ExtensionInfo]], description of who is online 
extension.',
-       'bs-whoisonline-nousers' => 'Text for nobody is logged in.',
-       'bs-whoisonline-widget-title' => 'Widget headline for who is online?\n 
{{Identical|Who is online?}}',
-       'prefs-whoisonline' => 'Used in 
[[Special:Wiki_Admin&mode=Preferences]], headline for who is online 
section.\n{{Identical|Who is online?}}',
-       'bs-whoisonline-pref-limitcount' => 'Option in 
[[Special:Wiki_Admin&mode=Preferences]], label for maximum number of users 
shown:',
-       'bs-whoisonline-pref-orderby' => 'Option in 
[[Special:Wiki_Admin&mode=Preferences]], label for sort by:',
-       'bs-whoisonline-pref-maxidletime' => 'Option in 
[[Special:Wiki_Admin&mode=Preferences]], label for time in seconds until a user 
is marked as offline:',
-       'bs-whoisonline-pref-orderby-time' => 'Option in 
[[Special:Wiki_Admin&mode=Preferences]], option label for uptime',
-       'bs-whoisonline-pref-orderby-name' => 'Option in 
[[Special:Wiki_Admin&mode=Preferences]], option label for name',
-       'bs-whoisonline-pref-interval' => 'Option in 
[[Special:Wiki_Admin&mode=Preferences]], label for update interval in seconds:',
-       'bs-whoisonline-tag-whoisonlinecount-desc' => 'Used in InsertMagic 
extension, tag description for renders the number of currently logged in 
users.',
-       'bs-whoisonline-tag-whoisonlinepopup-desc' => 'Used in InsertMagic 
extension, tag description for renders a little fly-out list of currently 
logged in users.
-
-Valid attributes:
-;anchortext: Explanation text for the text you want the fly-out to be attached 
to.'
-);
\ No newline at end of file
+       $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim00eec42f69d41163';
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6614ef48911a05c771a8e41657c91e451f61d15
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Smuggli <[email protected]>

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

Reply via email to