Smuggli has submitted this change and it was merged. Change subject: Implemented changes for translatewiki ......................................................................
Implemented changes for translatewiki Moved php language file into languages folder Moved to Json i18n files Change-Id: Ice7eae5e2c9cdeda4e194f80b494608e2ddee6e7 --- D Preferences/Preferences.i18n.php M Preferences/Preferences.setup.php A Preferences/i18n/de.json A Preferences/i18n/en.json A Preferences/i18n/qqq.json A Preferences/languages/Preferences.i18n.php 6 files changed, 65 insertions(+), 174 deletions(-) Approvals: Smuggli: Verified; Looks good to me, approved Siebrand: Looks good to me, but someone else must approve diff --git a/Preferences/Preferences.i18n.php b/Preferences/Preferences.i18n.php deleted file mode 100644 index a998fda..0000000 --- a/Preferences/Preferences.i18n.php +++ /dev/null @@ -1,173 +0,0 @@ -<?php -/** - * Internationalisation file for Preferences - * - * Part of BlueSpice for MediaWiki - * - * @author Stephan Muggli <[email protected]> - - * @package BlueSpice_Extensions - * @subpackage Preferences - * @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 - */ - -$messages = array(); - -$messages['de'] = array( - 'prefs-BASE' => 'BlueSpice', - 'prefs-CORE' => 'BlueSpice - Basis-Einstellungen', - 'prefs-bluespice' => 'BlueSpice', - 'prefs-MW' => 'BlueSpice - MediaWiki-Einstellungen', - 'prefs-Statistics' => 'Erweiterte Statistik', - 'prefs-InfoBox' => 'InfoBox', - 'prefs-PagesVisited' => 'Besuchte Seiten', - 'prefs-Review' => 'Qualitätssicherung', - 'prefs-MailChanges' => 'E-Mail bei Änderungen', - 'bs-pref-LanguageCode' => 'Sprache', - 'bs-pref-Count' => 'Anzahl Einträge', - 'bs-pref-Namespaces' => 'Namensräume (Whitelist)', - 'bs-pref-ExcludeNamespaces' => 'Namensräume (Blacklist)', - 'bs-pref-Categories' => 'Kategorien (Whitelist)', - 'bs-pref-ShowMinorChanges' => 'Geringfügige Änderungen anzeigen', - 'bs-pref-Period' => 'Zeitraum (day|week|month)', - 'bs-pref-Mode' => 'Modus (<strong>recentchanges</strong>|changesofweek|ratings)', - 'bs-pref-ShowOnlyNewArticles' => 'Nur neue Artikel anzeigen', - 'bs-pref-UserSidebarLimit' => 'Anzahl der Einträge im Fokus', - 'bs-pref-UserSidebarNamespaces' => 'Anzuzeigende Namensräume', - 'bs-pref-NotifyNew' => 'Benachrichtigung bei Bearbeitung von Seiten:', - 'bs-pref-NotifyAll' => 'Benachrichtigung bei neuen Seiten:', - 'bs-pref-EmailNotifyOwner' => 'Den Besitzer eines Workflows per E-Mail über Änderungen benachrichtigen:', - 'bs-pref-DiagramWidth' => 'Breite des Diagramms:', - 'bs-pref-DiagramHeight' => 'Höhe des Diagramms:', - 'bs-pref-DiagramType' => 'Diagrammtyp (Linien|Balken):', - 'bs-pref-DefaultFrom' => 'Standard Startdatum (mm/dd/jjjj):', - 'bs-pref-FileExtensions' => 'Erlaubte Dokumentdateitypen', - 'bs-pref-FileExtensions-title' => 'Dateiendung hinzufügen', //deprecated!? - 'bs-pref-FileExtensions-message' => 'Welche Dateiendung möchten du hinzufügen?', //deprecated!? - 'toc-FileExtensions-title' => 'Dateiendung hinzufügen', - 'toc-FileExtensions-message' => 'Welche Dateiendung möchtest du hinzufügen?', - 'bs-pref-UseMinify' => 'Minifier verwenden', - 'bs-pref-ImageExtensions' => 'Erlaubte Bilddateitypen', - 'bs-pref-ImageExtensions-title' => 'Bilddateiendung hinzufügen', //deprecated!? - 'bs-pref-ImageExtensions-message' => 'Welche Bilddateiendung möchten du hinzufügen?', //deprecated!? - 'toc-ImageExtensions-title' => 'Bilddateiendung hinzufügen', - 'toc-ImageExtensions-message' => 'Welche Bilddateiendung möchtest du hinzufügen?', - 'bs-pref-LogoPath' => 'Logopfad', - 'bs-pref-FaviconPath' => 'Faviconpfad', - 'bs-pref-MiniProfileEnforceHeight' => 'Benutzerprofilbildhöhe erzwingen', - 'bs-pref-DefaultUserImage' => 'Standardbenutzerbild', - 'bs-pref-AnonUserImage' => 'Bild für anonyme Benutzer', - 'bs-pref-DeletedUserImage' => 'Bild für einen gelöschten Benutzer', - 'bs-pref-TestMode' => 'Testmodus aktivieren', - 'bs-pref-BSPingInterval' => 'Bluespice Ping-Interval', - 'bs-preferences-extension-description' => 'Gibt dem Admin die Möglichkeit bestimmte Wikieinstellungen, z. B. welche Dateien ins Wiki eingebunden werden können, über eine Spezialseite zu konfigurieren.', - 'CORE' => 'BlueSpice', - 'MW' => 'MediaWiki', - 'BASE' => 'Grundeinstellungen', - 'MW__FileExtensions' => 'Erlaubte Dateitypen', - 'MW__ImageExtensions' => 'Dateitypen, die als Bilder verarbeitet werden', - 'MW__LogoPath' => 'Logo', - 'MW__UserImage' => 'Benutzerprofilbild', - 'MW__DefaultUserImage' => 'Standardprofilbild', - 'MW__AnonUserImage' => 'Profilbild für anonyme und gelöschte Benutzer', - 'Core__MinifyPath' => 'Relative URL zum "Minifier"', - 'Core__UseMinify' => 'Verwende "Minifier"', - 'Core__LanguageCode' => 'Sprache der Benutzeroberfläche', - 'allow_all' => 'alle', - 'allow_loggedin' => 'angemeldete', - 'allow_register' => 'Benutzer können sich selbst anmelden.', - 'bs-preferences-button_save' => 'Speichern', - 'file-too-big' => 'Die Datei ist größer als $1 MB', - 'bs-preferences-label' => 'Einstellungen', - 'mainpage_visible' => 'Die Hauptseite soll für alle sichtbar sein.', - 'max-upload-size' => 'Maximale Größe hochladbarer Dateien:', - 'megabyte' => 'MB', - 'prefs_saved' => 'Die Änderungen wurden gespeichert.', - 'server-limit' => 'Die Uploadgrenze des Servers ist $1 MB', - 'whos_allowed' => 'Wer kann dieses Wiki lesen?' -); - -$messages['de-formal'] = array( - 'bs-pref-ImageExtensions-message' => 'Welche Bilddateiendung möchten Sie hinzufügen?', - 'toc-ImageExtensions-message' => 'Welche Bilddateiendung möchten Sie hinzufügen?', - 'bs-pref-FileExtensions-message' => 'Welche Dateiendung möchten Sie hinzufügen?', - 'toc-FileExtensions-message' => 'Welche Dateiendung möchten Sie hinzufügen?', -); - -$messages['en'] = array( - 'prefs-BASE' => 'BlueSpice', - 'prefs-CORE' => 'BlueSpice - Core settings', - 'prefs-bluespice' => 'BlueSpice', - 'prefs-MW' => 'BlueSpice - MediaWiki settings', - 'prefs-InfoBox' => 'InfoBox', - 'prefs-PagesVisited' => 'Visited pages', - 'prefs-MailChanges' => 'Send email on changes', - 'prefs-Statistics' => 'Extended Statistics', - 'prefs-Review' => 'Quality assurance', - 'bs-pref-LanguageCode' => 'Language', - 'bs-pref-Count' => 'Number of entries', - 'bs-pref-Namespaces' => 'Namespaces (Whitelist)', - 'bs-pref-ExcludeNamespaces' => 'Namespaces (Blacklist)', - 'bs-pref-Categories' => 'Categories (Whitelist)', - 'bs-pref-ShowMinorChanges' => 'Show minor changes', - 'bs-pref-Period' => 'Period (day|week|month)', - 'bs-pref-Mode' => 'Mode (<strong>recentchanges</strong>|changesofweek|ratings)', - 'bs-pref-ShowOnlyNewArticles' => 'Show only new articles', - 'bs-pref-UserSidebarLimit' => 'Limit of entries in Focus', - 'bs-pref-UserSidebarNamespaces' => 'Namespaces', - 'bs-pref-NotifyNew' => 'Notification for new pages:', - 'bs-pref-NotifyAll' => 'Notification for edits:', - 'bs-pref-EmailNotifyOwner' => 'Notify the owner of a workfow about changes:', - 'bs-pref-DiagramWidth' => 'Diagram width:', - 'bs-pref-DiagramHeight' => 'Diagram height:', - 'bs-pref-DiagramType' => 'Diagram type (line|bar):', - 'bs-pref-DefaultFrom' => 'Default startdate (mm/dd/yyyy):', - 'bs-pref-FileExtensions' => 'Allowed file extensions', - 'bs-pref-FileExtensions-title' => 'Add file extension', //deprecated!? - 'bs-pref-FileExtensions-message' => 'Which file extension do you want to add to the list?', //deprecated!? - 'toc-FileExtensions-title' => 'Add file extension', - 'toc-FileExtensions-message' => 'Which file extension do you want to add to the list?', - 'bs-pref-UseMinify' => 'Use minifier', - 'bs-pref-ImageExtensions' => 'Allowed image file extensions', - 'bs-pref-ImageExtensions-title' => 'Add image file extension', //deprecated!? - 'bs-pref-ImageExtensions-message' => 'Which image file extension do you want to add to the list?', //deprecated!? - 'toc-ImageExtensions-title' => 'Add image file extension', - 'toc-ImageExtensions-message' => 'Which image file extension do you want to add to the list?', - 'bs-pref-LogoPath' => 'Logo path', - 'bs-pref-FaviconPath' => 'Favicon path', - 'bs-pref-MiniProfileEnforceHeight' => 'Force height of Userprofilepicture', - 'bs-pref-DefaultUserImage' => 'Default user image', - 'bs-pref-AnonUserImage' => 'Image for anonymous user', - 'bs-pref-DeletedUserImage' => 'Image for a deleted user', - 'bs-pref-TestMode' => 'Activate Testmode', - 'bs-pref-BSPingInterval' => 'Bluespice ping interval', - 'bs-preferences-extension-description' => 'Offers the possibility to admins, to configurate the whole wiki from a single SpecialPage.', - 'CORE' => 'BlueSpice', - 'MW' => 'MediaWiki', - 'BASE' => 'Base Settings', - 'MW__FileExtensions' => 'Permitted filetypes', - 'MW__ImageExtensions' => 'Filetypes handled as images', - 'MW__LogoPath' => 'Logo file', - 'MW__UserImage' => 'Profile image', - 'MW__DefaultUserImage' => 'Default profile image', - 'MW__AnonUserImage' => 'Profile image for anonymous and deleted users', - 'Core__MinifyPath' => 'Relative URL to "Minifier"', - 'Core__UseMinify' => 'Use "Minifier"', - 'Core__LanguageCode' => 'Userinterface language', - 'allow_all' => 'everyone', - 'allow_loggedin' => 'logged in users', - 'allow_register' => 'Users may register themselves.', - 'bs-preferences-button_save' => 'Save', - 'file-too-big' => 'The file size is above $1 MB', - 'bs-preferences-label' => 'Preferences', - 'mainpage_visible' => 'Main page is visible to everyone.', - 'max-upload-size' => 'Maximum size for file uploads:', - 'megabyte' => 'MB', - 'prefs_saved' => 'Your preferences have been saved.', - 'server-limit' => 'The upload limit of the server is $1 MB', - 'whos_allowed' => 'Who\'s allowed to read this Wiki?' -); - -$messages['qqq'] = array(); \ No newline at end of file diff --git a/Preferences/Preferences.setup.php b/Preferences/Preferences.setup.php index afb01f8..a70d8e5 100644 --- a/Preferences/Preferences.setup.php +++ b/Preferences/Preferences.setup.php @@ -2,7 +2,9 @@ BsExtensionManager::registerExtension('Preferences', BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE); -$wgExtensionMessagesFiles['Preferences'] = __DIR__ . '/Preferences.i18n.php'; +$wgMessagesDirs['Preferences'] = __DIR__ . '/i18n'; + +$wgExtensionMessagesFiles['Preferences'] = __DIR__ . '/languages/Preferences.i18n.php'; $aResourceModuleTemplate = array( 'localBasePath' => 'extensions/BlueSpiceExtensions/Preferences/resources/', diff --git a/Preferences/i18n/de.json b/Preferences/i18n/de.json new file mode 100644 index 0000000..f656772 --- /dev/null +++ b/Preferences/i18n/de.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Stephan Muggli <[email protected]>" + ] + }, + "bs-preferences-desc": "Administrationsoberfläche für das Konfigurieren von BlueSpice", + "prefs-bluespice": "BlueSpice" +} diff --git a/Preferences/i18n/en.json b/Preferences/i18n/en.json new file mode 100644 index 0000000..eda7cea --- /dev/null +++ b/Preferences/i18n/en.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Stephan Muggli <[email protected]>" + ] + }, + "bs-preferences-desc": "Administration interface to configure BlueSpice", + "prefs-bluespice": "BlueSpice" +} diff --git a/Preferences/i18n/qqq.json b/Preferences/i18n/qqq.json new file mode 100644 index 0000000..36cc6da --- /dev/null +++ b/Preferences/i18n/qqq.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Stephan Muggli <[email protected]>" + ] + }, + "bs-preferences-desc": "Used in [[Special:Wiki_Admin&mode=ExtensionInfo]], description of preferences extension", + "prefs-bluespice": "Used in [[Special:Wiki_Admin&mode=Preferences]], headline for bluespice section in preferences.\n{{Identical|BlueSpice}}" +} diff --git a/Preferences/languages/Preferences.i18n.php b/Preferences/languages/Preferences.i18n.php new file mode 100644 index 0000000..1d1718d --- /dev/null +++ b/Preferences/languages/Preferences.i18n.php @@ -0,0 +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( 'wfJsonI18nShimd9d4cbcd45042f42' ) ) { + function wfJsonI18nShimd9d4cbcd45042f42( $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'][] = 'wfJsonI18nShimd9d4cbcd45042f42'; +} -- To view, visit https://gerrit.wikimedia.org/r/144986 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice7eae5e2c9cdeda4e194f80b494608e2ddee6e7 Gerrit-PatchSet: 1 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: 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
