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
Removed word left because of rtl languages
Change-Id: I4e8da5e13a4ccdf1262ecbb7b8100a7c43c76406
---
M UserSidebar/UserSidebar.class.php
D UserSidebar/UserSidebar.i18n.php
M UserSidebar/UserSidebar.setup.php
A UserSidebar/i18n/de-formal.json
A UserSidebar/i18n/de.json
A UserSidebar/i18n/en.json
A UserSidebar/i18n/qqq.json
A UserSidebar/languages/UserSidebar.i18n.php
8 files changed, 78 insertions(+), 54 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
diff --git a/UserSidebar/UserSidebar.class.php
b/UserSidebar/UserSidebar.class.php
index a050186..e0a6100 100644
--- a/UserSidebar/UserSidebar.class.php
+++ b/UserSidebar/UserSidebar.class.php
@@ -50,9 +50,6 @@
*/
public function __construct() {
wfProfileIn( 'BS::'.__METHOD__ );
- //global $wgExtensionMessagesFiles;
- //$wgExtensionMessagesFiles['UserSidebar'] = __DIR__ .
'/UserSidebar.i18n.php';
-
// Base settings
$this->mExtensionFile = __FILE__;
$this->mExtensionType = EXTTYPE::OTHER;
@@ -85,8 +82,6 @@
$this->setHook( 'GetPreferences' );
$this->setHook( 'EditFormPreloadText' );
$this->setHook( 'BeforePageDisplay' );
-
- BsConfig::registerVar( 'MW::UserSidebar::LinkToEdit',
array('href' => '', 'content' => ''), BsConfig::LEVEL_USER,
'bs-usersidebar-userpagesettings-link-title', 'link' );
$wgAPIModules['sidebar'] = 'ApiSidebar';
@@ -165,7 +160,7 @@
'URL' => htmlspecialchars(
$oUserSidebarArticleTitle->getEditURL() ),
'TITLE' => wfMessage(
'bs-usersidebar-userpagesettings-link-title' )->plain(),
'TEXT' => wfMessage(
'bs-usersidebar-userpagesettings-link-text' )->text(),
- 'IMGALT' => wfMessage(
'bs-usersidebar-userpagesettings-headline' )->plain(),
+ 'IMGALT' => wfMessage( 'bs-tab_focus'
)->plain(),
'IMGSRC' =>
$this->getImagePath().'bs-userpage-sidebar.png',
)
);
diff --git a/UserSidebar/UserSidebar.i18n.php b/UserSidebar/UserSidebar.i18n.php
deleted file mode 100644
index 713ae41..0000000
--- a/UserSidebar/UserSidebar.i18n.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Internationalisation file for UserSidebar
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli <[email protected]>
- * @package BlueSpice_Extensions
- * @subpackage UserSidebar
- * @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['en'] = array(
- 'bs-usersidebar-desc' => 'Adds the focus tab to sidebar.',
- 'prefs-usersidebar' => 'User sidebar',
- 'bs-usersidebar-pref-userpagesubpagetitle' => 'Subpage that hosts the
user sidebar:',
- 'bs-usersidebar-userpagesettings-headline' => 'Focus',
- 'bs-usersidebar-userpagesettings-link-title' => 'Edit the content of
your focus',
- 'bs-usersidebar-userpagesettings-link-text' => '{{GENDER:|Edit}} focus',
-);
-
-$messages['de'] = array(
- 'bs-usersidebar-desc' => 'Fügt Fokus in der linken Navigation hinzu.',
- 'prefs-usersidebar' => 'Benutzer Navigation',
- 'bs-usersidebar-pref-userpagesubpagetitle' => 'Unterseite, in dem die
Benutzer Navigation verwaltet wird:',
- 'bs-usersidebar-userpagesettings-headline' => 'Fokus',
- 'bs-usersidebar-userpagesettings-link-title' => 'Inhalt von deinem
Fokus bearbeiten',
- 'bs-usersidebar-userpagesettings-link-text' => 'Fokus
{{GENDER:|bearbeiten}}',
-);
-
-$messages['de-formal'] = array(
- 'bs-usersidebar-userpagesettings-link-title' => 'Inhalt von Ihrem Fokus
bearbeiten',
-);
-
-$messages['qqq'] = array(
- 'bs-usersidebar-desc' => 'Used in
[[Special:Wiki_Admin&mode=ExtensionInfo]], description of user sidebar
extension.',
- 'prefs-usersidebar'=> 'Used in [[Special:Wiki_Admin&mode=Preferences]],
headline for user sidebar section in preferences.\n{{Identical|User sidebar}}',
- 'bs-usersidebar-pref-userpagesubpagetitle' => 'Option in
[[Special:Wiki_Admin&mode=Preferences]], subpage that hosts the user sidebar:',
- 'bs-usersidebar-userpagesettings-headline' => 'Headline for focus',
- 'bs-usersidebar-userpagesettings-link-title' => 'Image title for edit
the content of your focus',
- 'bs-usersidebar-userpagesettings-link-text' => 'Text for edit focus',
-);
\ No newline at end of file
diff --git a/UserSidebar/UserSidebar.setup.php
b/UserSidebar/UserSidebar.setup.php
index 8b812ea..09e7b28 100644
--- a/UserSidebar/UserSidebar.setup.php
+++ b/UserSidebar/UserSidebar.setup.php
@@ -1,8 +1,10 @@
<?php
-BsExtensionManager::registerExtension('UserSidebar',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'UserSidebar',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
-$wgExtensionMessagesFiles['UserSidebar'] = __DIR__ . '/UserSidebar.i18n.php';
+$wgMessagesDirs['UserSidebar'] = __DIR__ . '/i18n';
+
+$wgExtensionMessagesFiles['UserSidebar'] = __DIR__ .
'/languages/UserSidebar.i18n.php';
$wgAutoloadClasses['ApiSidebar'] = __DIR__ . '/api/ApiSidebar.php';
diff --git a/UserSidebar/i18n/de-formal.json b/UserSidebar/i18n/de-formal.json
new file mode 100644
index 0000000..31145f3
--- /dev/null
+++ b/UserSidebar/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-usersidebar-userpagesettings-link-title": "Inhalt von Ihrem Fokus
bearbeiten"
+}
diff --git a/UserSidebar/i18n/de.json b/UserSidebar/i18n/de.json
new file mode 100644
index 0000000..cb1e96c
--- /dev/null
+++ b/UserSidebar/i18n/de.json
@@ -0,0 +1,10 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-usersidebar-desc": "Fügt den Fokus Tab in der Navigation hinzu",
+ "bs-usersidebar-userpagesettings-link-title": "Inhalt von deinem Fokus
bearbeiten",
+ "bs-usersidebar-userpagesettings-link-text": "Fokus
{{GENDER:|bearbeiten}}"
+}
diff --git a/UserSidebar/i18n/en.json b/UserSidebar/i18n/en.json
new file mode 100644
index 0000000..4122dd2
--- /dev/null
+++ b/UserSidebar/i18n/en.json
@@ -0,0 +1,10 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-usersidebar-desc": "Adds the focus tab to sidebar",
+ "bs-usersidebar-userpagesettings-link-title": "Edit the content of your
focus",
+ "bs-usersidebar-userpagesettings-link-text": "{{GENDER:|Edit}} focus"
+}
diff --git a/UserSidebar/i18n/qqq.json b/UserSidebar/i18n/qqq.json
new file mode 100644
index 0000000..4a3252a
--- /dev/null
+++ b/UserSidebar/i18n/qqq.json
@@ -0,0 +1,10 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-usersidebar-desc": "Used in
[[Special:Wiki_Admin&mode=ExtensionInfo]], description of user sidebar
extension",
+ "bs-usersidebar-userpagesettings-link-title": "Image title for edit the
content of your focus",
+ "bs-usersidebar-userpagesettings-link-text": "Anchor text for
{{GENDER:|edit}} focus"
+}
diff --git a/UserSidebar/languages/UserSidebar.i18n.php
b/UserSidebar/languages/UserSidebar.i18n.php
new file mode 100644
index 0000000..fda8e20
--- /dev/null
+++ b/UserSidebar/languages/UserSidebar.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( 'wfJsonI18nShimd8a2d0eed3e8d9de' ) ) {
+ function wfJsonI18nShimd8a2d0eed3e8d9de( $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'][] =
'wfJsonI18nShimd8a2d0eed3e8d9de';
+}
--
To view, visit https://gerrit.wikimedia.org/r/144972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e8da5e13a4ccdf1262ecbb7b8100a7c43c76406
Gerrit-PatchSet: 2
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
