Smuggli has submitted this change and it was merged.

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


Implemented changes for translatewiki

* Removed trailing dot
* Improved description of two keys
* Changed message for better consistency
* Fixed typo
Removed superfulous word from description

Change-Id: Ib54ff8d59befe9c72fc256aa31bcc0d5d6d94e6c
---
A Dashboards/i18n/de.json
A Dashboards/i18n/en.json
A Dashboards/i18n/qqq.json
M Dashboards/languages/Dashboards.i18n.php
4 files changed, 82 insertions(+), 38 deletions(-)

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



diff --git a/Dashboards/i18n/de.json b/Dashboards/i18n/de.json
new file mode 100644
index 0000000..35691fb
--- /dev/null
+++ b/Dashboards/i18n/de.json
@@ -0,0 +1,17 @@
+{
+       "@metadata": {
+               "authors": [
+                       "Stephan Muggli <[email protected]>"
+               ]
+       },
+       "bs-dashboards-desc": "Stellt Dashboards für Benutzer und 
Administratoren zur Verfügung",
+       "bs-specialadmindashboard-label": "Dashboard",
+       "bs-dashboards-addportlet": "Portlet hinzufügen",
+       "bs-dashboards-portlets": "Portlets",
+       "prefs-dashboards": "Dashboards",
+       "bs-dashboards-pref-userdashboardonlogo": "Logo der Website verlinkt 
auf das Benutzerdashboard",
+       "admindashboard": "Admin-Dashboard",
+       "userdashboard": "Benutzer-Dashboard",
+       "bs-dashboard-userportlet-calendar-title": "Kalender",
+       "bs-dashboard-userportlet-calendar-description": "Kalender"
+}
diff --git a/Dashboards/i18n/en.json b/Dashboards/i18n/en.json
new file mode 100644
index 0000000..36657d9
--- /dev/null
+++ b/Dashboards/i18n/en.json
@@ -0,0 +1,17 @@
+{
+       "@metadata": {
+               "authors": [
+                       "Stephan Muggli <[email protected]>"
+               ]
+       },
+       "bs-dashboards-desc": "Provides dashboards for users and 
administrators",
+       "bs-specialadmindashboard-label": "Dashboard",
+       "bs-dashboards-addportlet": "Add portlet",
+       "bs-dashboards-portlets": "Portlets",
+       "prefs-dashboards": "Dashboards",
+       "bs-dashboards-pref-userdashboardonlogo": "Site logo links to user 
dashboard",
+       "admindashboard": "Admin dashboard",
+       "userdashboard": "User dashboard",
+       "bs-dashboard-userportlet-calendar-title": "Calendar",
+       "bs-dashboard-userportlet-calendar-description": "Calendar"
+}
diff --git a/Dashboards/i18n/qqq.json b/Dashboards/i18n/qqq.json
new file mode 100644
index 0000000..2881476
--- /dev/null
+++ b/Dashboards/i18n/qqq.json
@@ -0,0 +1,17 @@
+{
+       "@metadata": {
+               "authors": [
+                       "Stephan Muggli <[email protected]>"
+               ]
+       },
+       "bs-dashboards-desc": "Used in 
[[Special:Wiki_Admin&mode=ExtensionInfo]], description of dashboards extension",
+       "bs-specialadmindashboard-label": "Anchor text in admin tab for 
dashboard\\n {{Identical|Dashboard}}",
+       "bs-dashboards-addportlet": "Winodw title for add portlet",
+       "bs-dashboards-portlets": "Window title for portlets",
+       "prefs-dashboards": "Used in [[Special:Wiki_Admin&mode=Preferences]], 
headline of dashboards section.\\n {{Identical|Dashboard}}",
+       "bs-dashboards-pref-userdashboardonlogo": "Option in 
[[Special:Wiki_Admin&mode=Preferences]], checkbox label for site logo links to 
user dashboard",
+       "admindashboard": "Special page name for admin dashboard\\n 
{{Identical|Admin dashboard}}",
+       "userdashboard": "Special page name for user dashboard\\n 
{{Identical|User dashboard}}",
+       "bs-dashboard-userportlet-calendar-title": "Portlet title for calendar",
+       "bs-dashboard-userportlet-calendar-description": "portlet description 
for calendar"
+}
diff --git a/Dashboards/languages/Dashboards.i18n.php 
b/Dashboards/languages/Dashboards.i18n.php
index 3560930..87bf724 100644
--- a/Dashboards/languages/Dashboards.i18n.php
+++ b/Dashboards/languages/Dashboards.i18n.php
@@ -1,42 +1,35 @@
 <?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( 'wfJsonI18nShimb08be1a5a7cfdc8d' ) ) {
+       function wfJsonI18nShimb08be1a5a7cfdc8d( $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-dashboards-desc' => 'Provides dashboards for normal users and 
admins.',
-       'bs-specialadmindashboard-label' => 'Dashboard',
-       'bs-dashboards-addportlet' => 'Add portlet',
-       'bs-dashboards-portlets' => 'Portlets',
-       'prefs-dashboards' => 'Dashboards',
-       'bs-dashboards-pref-userdashboardonlogo' => 'Site logo links to user 
dashboard',
-       'admindashboard' => 'Admin dashboard',
-       'userdashboard'  => 'User dashboard',
-       'bs-dashboard-userportlet-calendar-title' => 'Calendar',
-       'bs-dashboard-userportlet-calendar-description' => 'Calendar',
-);
+                       $cachedData['deps'][] = new FileDependency( $fileName );
+               }
+               return true;
+       }
 
-$messages['de'] = array(
-       'bs-dashboards-desc' => 'Stellt Dashboards für Benutzer und 
Administratoren zur Verfügung.',
-       'bs-specialadmindashboard-label' => 'Dashboard',
-       'bs-dashboards-addportlet' => 'Portlet hinzufügen',
-       'bs-dashboards-portlets' => 'Portlets',
-       'prefs-dashboards' => 'Dashboards',
-       'bs-dashboards-pref-userdashboardonlogo' => 'Logo der Website verlinkt 
auf das Benutzerdashboard',
-       'admindashboard' => 'Admin-Dashboard',
-       'userdashboard'  => 'Benutzer-Dashboard',
-       'bs-dashboard-userportlet-calendar-title' => 'Kalender',
-       'bs-dashboard-userportlet-calendar-description' => 'Kalender',
-);
-
-$messages['qqq'] = array(
-       'bs-dashboards-desc' => 'Used in 
[[Special:Wiki_Admin&mode=ExtensionInfo]], description of dashboards 
extension.',
-       'bs-specialadmindashboard-label' => 'Anchor text in admin tab for 
dashboard\n {{Identical|Dashboard}}',
-       'bs-dashboards-addportlet' => 'Winodw title for add portlet',
-       'bs-dashboards-portlets' => 'Window title for portlets',
-       'prefs-dashboards' => 'Used in [[Special:Wiki_Admin&mode=Preferences]], 
headline of dashboards section.\n {{Identical|Dashboard}}',
-       'bs-dashboards-pref-userdashboardonlogo' => 'Option in 
[[Special:Wiki_Admin&mode=Preferences]], checkbox label for site logo links to 
user dashboard',
-       'admindashboard' => 'Specialpage title for admin dashboard\n 
{{Identical|aAdmin dashboard}}',
-       'userdashboard'  => 'Specialpage title for user dashboard\n 
{{Identical|User dashboard}}',
-       'bs-dashboard-userportlet-calendar-title' => 'Portlet title for 
calendar',
-       'bs-dashboard-userportlet-calendar-description' => 'portlet description 
for calendar',
-);
\ No newline at end of file
+       $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimb08be1a5a7cfdc8d';
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib54ff8d59befe9c72fc256aa31bcc0d5d6d94e6c
Gerrit-PatchSet: 4
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