subject:"\[MediaWiki\-commits\] \[Gerrit\] Implemented changes for translatewiki \- change \(mediawiki...BlueSpiceExtensions\)"

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-08-26 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I78725f006b57ccab601ac14d832630c8a372f13e
---
M FormattingHelp/FormattingHelp.class.php
M FormattingHelp/FormattingHelp.setup.php
A FormattingHelp/i18n/de.json
A FormattingHelp/i18n/en.json
A FormattingHelp/i18n/qqq.json
M FormattingHelp/languages/FormattingHelp.i18n.php
M FormattingHelp/resources/BS.FormattingHelp/Window.js
M FormattingHelp/resources/bluespice.formattinghelp.js
8 files changed, 206 insertions(+), 264 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/75/156275/1

diff --git a/FormattingHelp/FormattingHelp.class.php 
b/FormattingHelp/FormattingHelp.class.php
index df4c5e3..b8cab62 100644
--- a/FormattingHelp/FormattingHelp.class.php
+++ b/FormattingHelp/FormattingHelp.class.php
@@ -3,7 +3,7 @@
  * FormattingHelp extension for BlueSpice
  *
  * Displays a help screen in the wiki edit view.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * 
+ *
  * This file is part of BlueSpice for MediaWiki
  * For further information visit http://www.blue-spice.org
  *
@@ -57,7 +57,7 @@
$this-mExtensionType = EXTTYPE::VARIABLE;
$this-mInfo = array(
EXTINFO::NAME= 'FormattingHelp',
-   EXTINFO::DESCRIPTION = 'Displays a help screen in the 
wiki edit view.',
+   EXTINFO::DESCRIPTION = wfMessage( 
'bs-formattinghelp-extension-description' )-plain(),
EXTINFO::AUTHOR  = 'Markus Glaser',
EXTINFO::VERSION = 'default',
EXTINFO::STATUS  = 'default',
@@ -78,7 +78,7 @@
$this-setHook('BSExtendedEditBarBeforeEditToolbar');
wfProfileOut( 'BS::'.__METHOD__ );
}
-   
+
public function onBSExtendedEditBarBeforeEditToolbar( $aRows, 
$aButtonCfgs ) {

$this-getOutput()-addModuleStyles('ext.bluespice.formattinghelp.styles');
$this-getOutput()-addModules('ext.bluespice.formattinghelp');
@@ -94,31 +94,87 @@
/**
 * Retrieves the text for display in FormattingHelp. Called via AJAX.
 * @param string $sOutput rendered HTML output that is to be displayed.
-* @return bool allow other hooked methods to be executed. Always true. 
+* @return bool allow other hooked methods to be executed. Always true.
 */
public static function getFormattingHelp() {
if ( BsCore::checkAccessAdmission( 'edit' ) === false ) return 
true;
 
-   global $wgUser;
-   $lang = $wgUser-getOption( 'language' );
-   if ( empty( $lang ) ) {
-   global $wgContLang;
-   $lang = $wgContLang;
-   }
-
-   $oTitle = Title::makeTitle( NS_MEDIAWIKI, 
'FormattingHelp/'.$lang );
-   if ( !$oTitle-exists() ) {
-   $oTitle = Title::makeTitle( NS_MEDIAWIKI, 
'FormattingHelp' );
-   }
-
-   $oFormattinghelpArticle = new Article( $oTitle );
-   $sOutput = $oFormattinghelpArticle-getContent();
-
-   if ( $sOutput ) {
-   $sOutput = $this-mCore-parseWikiText( $sOutput, 
RequestContext::getMain()-getTitle() );
-   } else {
-   $sOutput = wfMessage( 'bs-formattinghelp-help-text' 
)-plain();
-   }
+   $sOutput = table border='1'
+   thead
+   tr
+   th/th
+   th.wfMessage( 
'bs-formattinghelp-help-syntax' )-escaped()./th
+   /tr
+   /thead
+   tbody
+   tr
+   td width='20%'strong.wfMessage( 
'bs-formattinghelp-help-bold' )-escaped()./strong/td
+   tdnowiki'''.wfMessage( 
'bs-formattinghelp-help-example-text' )-escaped().'''/nowiki/td
+   /tr
+   tr
+   td width='20%'strong.wfMessage( 
'bs-formattinghelp-help-italic' )-escaped()./strong/td
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-08-26 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

- Removed trailing period from description message
- Changed hold to press
- Added hint that options are not for mobile

Change-Id: Ic430c00f1905273f53fe3fd73538070cc15ec449
---
M ContextMenu/i18n/de.json
M ContextMenu/i18n/en.json
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/78/156278/1

diff --git a/ContextMenu/i18n/de.json b/ContextMenu/i18n/de.json
index 4976d9e..9b7bacb 100644
--- a/ContextMenu/i18n/de.json
+++ b/ContextMenu/i18n/de.json
@@ -5,9 +5,9 @@
Robert Vogel vo...@hallowelt.biz
]
},
-   bs-contextmenu-desc: Zeigt für bestimmte Links ein Kontextmenü an.,
+   bs-contextmenu-desc: Zeigt für bestimmte Links ein Kontextmenü an,
prefs-contextmenu: Kontextmenü,
-   bs-contextmenu-pref-modus: Kontextmenü öffnen:,
+   bs-contextmenu-pref-modus: Kontextmenü öffnen (nicht für Mobile):,
bs-contextmenu-pref-modus-just-right-mouse: Durch Klicken der 
rechten Maustaste (Bei gedrückter Strg-Taste, öffnet das originale 
Browser-Menü),
bs-contextmenu-pref-modus-ctrl-and-right-mouse: Durch Klicken der 
rechten Maustaste bei gedrückter Strg-Taste (Normaler rechter Mausklick, öffnet 
das originale Browser-Menü),
bs-contextmenu-page-edit: Seite bearbeiten,
diff --git a/ContextMenu/i18n/en.json b/ContextMenu/i18n/en.json
index ffa40d7..0abf162 100644
--- a/ContextMenu/i18n/en.json
+++ b/ContextMenu/i18n/en.json
@@ -4,11 +4,11 @@
Robert Vogel vo...@hallowelt.biz
]
},
-   bs-contextmenu-desc: Provides context menus for various links.,
+   bs-contextmenu-desc: Provides context menus for various links,
prefs-contextmenu: Context menu,
-   bs-contextmenu-pref-modus: Open context menu by:,
-   bs-contextmenu-pref-modus-just-right-mouse: Just click on right 
mouse button (Holding down CTRL will show default browser context menu),
-   bs-contextmenu-pref-modus-ctrl-and-right-mouse: Hold down CTRL and 
click right mouse button (Normal right mouse button will show default browser 
menu),
+   bs-contextmenu-pref-modus: Open context menu by (not for mobile):,
+   bs-contextmenu-pref-modus-just-right-mouse: Click on right mouse 
button (Pressing CTRL will show default browser context menu),
+   bs-contextmenu-pref-modus-ctrl-and-right-mouse: Click on right mouse 
button and pressing CTRL (Normal right mouse button will show default browser 
menu),
bs-contextmenu-page-edit: Edit page,
bs-contextmenu-page-delete: Delete page,
bs-contextmenu-page-move: Move page,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic430c00f1905273f53fe3fd73538070cc15ec449
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-08-26 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

- Removed trailing period from description message
- Changed hold to press
- Added hint that options are not for mobile

Change-Id: Ic430c00f1905273f53fe3fd73538070cc15ec449
---
M ContextMenu/i18n/de.json
M ContextMenu/i18n/en.json
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/ContextMenu/i18n/de.json b/ContextMenu/i18n/de.json
index 4976d9e..9b7bacb 100644
--- a/ContextMenu/i18n/de.json
+++ b/ContextMenu/i18n/de.json
@@ -5,9 +5,9 @@
Robert Vogel vo...@hallowelt.biz
]
},
-   bs-contextmenu-desc: Zeigt für bestimmte Links ein Kontextmenü an.,
+   bs-contextmenu-desc: Zeigt für bestimmte Links ein Kontextmenü an,
prefs-contextmenu: Kontextmenü,
-   bs-contextmenu-pref-modus: Kontextmenü öffnen:,
+   bs-contextmenu-pref-modus: Kontextmenü öffnen (nicht für Mobile):,
bs-contextmenu-pref-modus-just-right-mouse: Durch Klicken der 
rechten Maustaste (Bei gedrückter Strg-Taste, öffnet das originale 
Browser-Menü),
bs-contextmenu-pref-modus-ctrl-and-right-mouse: Durch Klicken der 
rechten Maustaste bei gedrückter Strg-Taste (Normaler rechter Mausklick, öffnet 
das originale Browser-Menü),
bs-contextmenu-page-edit: Seite bearbeiten,
diff --git a/ContextMenu/i18n/en.json b/ContextMenu/i18n/en.json
index ffa40d7..0abf162 100644
--- a/ContextMenu/i18n/en.json
+++ b/ContextMenu/i18n/en.json
@@ -4,11 +4,11 @@
Robert Vogel vo...@hallowelt.biz
]
},
-   bs-contextmenu-desc: Provides context menus for various links.,
+   bs-contextmenu-desc: Provides context menus for various links,
prefs-contextmenu: Context menu,
-   bs-contextmenu-pref-modus: Open context menu by:,
-   bs-contextmenu-pref-modus-just-right-mouse: Just click on right 
mouse button (Holding down CTRL will show default browser context menu),
-   bs-contextmenu-pref-modus-ctrl-and-right-mouse: Hold down CTRL and 
click right mouse button (Normal right mouse button will show default browser 
menu),
+   bs-contextmenu-pref-modus: Open context menu by (not for mobile):,
+   bs-contextmenu-pref-modus-just-right-mouse: Click on right mouse 
button (Pressing CTRL will show default browser context menu),
+   bs-contextmenu-pref-modus-ctrl-and-right-mouse: Click on right mouse 
button and pressing CTRL (Normal right mouse button will show default browser 
menu),
bs-contextmenu-page-edit: Edit page,
bs-contextmenu-page-delete: Delete page,
bs-contextmenu-page-move: Move page,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic430c00f1905273f53fe3fd73538070cc15ec449
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-08-26 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

- Moved to Json i18n files
- Improved description language

Change-Id: I78725f006b57ccab601ac14d832630c8a372f13e
---
M FormattingHelp/FormattingHelp.class.php
M FormattingHelp/FormattingHelp.setup.php
A FormattingHelp/i18n/de.json
A FormattingHelp/i18n/en.json
A FormattingHelp/i18n/qqq.json
M FormattingHelp/languages/FormattingHelp.i18n.php
M FormattingHelp/resources/BS.FormattingHelp/Window.js
M FormattingHelp/resources/bluespice.formattinghelp.js
8 files changed, 206 insertions(+), 264 deletions(-)

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



diff --git a/FormattingHelp/FormattingHelp.class.php 
b/FormattingHelp/FormattingHelp.class.php
index df4c5e3..b8cab62 100644
--- a/FormattingHelp/FormattingHelp.class.php
+++ b/FormattingHelp/FormattingHelp.class.php
@@ -3,7 +3,7 @@
  * FormattingHelp extension for BlueSpice
  *
  * Displays a help screen in the wiki edit view.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * 
+ *
  * This file is part of BlueSpice for MediaWiki
  * For further information visit http://www.blue-spice.org
  *
@@ -57,7 +57,7 @@
$this-mExtensionType = EXTTYPE::VARIABLE;
$this-mInfo = array(
EXTINFO::NAME= 'FormattingHelp',
-   EXTINFO::DESCRIPTION = 'Displays a help screen in the 
wiki edit view.',
+   EXTINFO::DESCRIPTION = wfMessage( 
'bs-formattinghelp-extension-description' )-plain(),
EXTINFO::AUTHOR  = 'Markus Glaser',
EXTINFO::VERSION = 'default',
EXTINFO::STATUS  = 'default',
@@ -78,7 +78,7 @@
$this-setHook('BSExtendedEditBarBeforeEditToolbar');
wfProfileOut( 'BS::'.__METHOD__ );
}
-   
+
public function onBSExtendedEditBarBeforeEditToolbar( $aRows, 
$aButtonCfgs ) {

$this-getOutput()-addModuleStyles('ext.bluespice.formattinghelp.styles');
$this-getOutput()-addModules('ext.bluespice.formattinghelp');
@@ -94,31 +94,87 @@
/**
 * Retrieves the text for display in FormattingHelp. Called via AJAX.
 * @param string $sOutput rendered HTML output that is to be displayed.
-* @return bool allow other hooked methods to be executed. Always true. 
+* @return bool allow other hooked methods to be executed. Always true.
 */
public static function getFormattingHelp() {
if ( BsCore::checkAccessAdmission( 'edit' ) === false ) return 
true;
 
-   global $wgUser;
-   $lang = $wgUser-getOption( 'language' );
-   if ( empty( $lang ) ) {
-   global $wgContLang;
-   $lang = $wgContLang;
-   }
-
-   $oTitle = Title::makeTitle( NS_MEDIAWIKI, 
'FormattingHelp/'.$lang );
-   if ( !$oTitle-exists() ) {
-   $oTitle = Title::makeTitle( NS_MEDIAWIKI, 
'FormattingHelp' );
-   }
-
-   $oFormattinghelpArticle = new Article( $oTitle );
-   $sOutput = $oFormattinghelpArticle-getContent();
-
-   if ( $sOutput ) {
-   $sOutput = $this-mCore-parseWikiText( $sOutput, 
RequestContext::getMain()-getTitle() );
-   } else {
-   $sOutput = wfMessage( 'bs-formattinghelp-help-text' 
)-plain();
-   }
+   $sOutput = table border='1'
+   thead
+   tr
+   th/th
+   th.wfMessage( 
'bs-formattinghelp-help-syntax' )-escaped()./th
+   /tr
+   /thead
+   tbody
+   tr
+   td width='20%'strong.wfMessage( 
'bs-formattinghelp-help-bold' )-escaped()./strong/td
+   tdnowiki'''.wfMessage( 
'bs-formattinghelp-help-example-text' )-escaped().'''/nowiki/td
+   /tr
+   tr
+   td width='20%'strong.wfMessage( 
'bs-formattinghelp-help-italic' )-escaped()./strong/td
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-28 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I7c8319ca7ebf8add3b717a347f0f134dea1adf19
---
M RSSFeeder/RSSFeeder.class.php
M RSSFeeder/RSSFeeder.setup.php
M RSSFeeder/i18n/de-formal.json
M RSSFeeder/i18n/de.json
M RSSFeeder/i18n/en.json
M RSSFeeder/i18n/qqq.json
M RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
M RSSFeeder/languages/RSSFeeder.i18n.php
8 files changed, 35 insertions(+), 35 deletions(-)

Approvals:
  Smuggli: Verified; Looks good to me, approved

Objections:
  Siebrand: There's a problem with this change, please improve



diff --git a/RSSFeeder/RSSFeeder.class.php b/RSSFeeder/RSSFeeder.class.php
index 5803e0f..cf5b19f 100644
--- a/RSSFeeder/RSSFeeder.class.php
+++ b/RSSFeeder/RSSFeeder.class.php
@@ -90,14 +90,14 @@
 */
public function onBSDashboardsAdminDashboardPortalPortlets( $aPortlets 
) {
$aPortlets[] = array(
-   'type' = 
'BS.RSSFeeder.RSSPortlet',
-   'config' = array(
-   'title' = wfMessage( 
'bs-rssfeeder-rss' )-plain(),
-   'height' = 660,
-   'rssurl' = 
'http://blog.blue-spice.org/feed/'
-   ),
-   'title' = wfMessage( 
'bs-rssfeeder-rss' )-plain(),
-   'description' = wfMessage( 
'bs-dashboards-rss-desc' )-plain()
+   'type' = 'BS.RSSFeeder.RSSPortlet',
+   'config' = array(
+   'title' = wfMessage( 'bs-rssfeeder-rss' 
)-plain(),
+   'height' = 660,
+   'rssurl' = 'http://blog.blue-spice.org/feed/'
+   ),
+   'title' = wfMessage( 'bs-rssfeeder-rss' )-plain(),
+   'description' = wfMessage( 'bs-rssfeeder-rss-desc' 
)-plain()
);
 
return true;
@@ -132,14 +132,14 @@
 */
public function onBSDashboardsUserDashboardPortalPortlets( $aPortlets 
) {
$aPortlets[] = array(
-   'type' = 
'BS.RSSFeeder.RSSPortlet',
-   'config' = array(
-   'title' = wfMessage( 
'bs-rssfeeder-rss' )-plain(),
-   'height' = 610,
-   'rssurl' = 
'http://blog.blue-spice.org/feed/'
-   ),
-   'title' = wfMessage( 
'bs-rssfeeder-rss' )-plain(),
-   'description' = wfMessage( 
'bs-dashboards-rss-desc' )-plain()
+   'type' = 'BS.RSSFeeder.RSSPortlet',
+   'config' = array(
+   'title' = wfMessage( 'bs-rssfeeder-rss' 
)-plain(),
+   'height' = 610,
+   'rssurl' = 'http://blog.blue-spice.org/feed/'
+   ),
+   'title' = wfMessage( 'bs-rssfeeder-rss' )-plain(),
+   'description' = wfMessage( 'bs-rssfeeder-rss-desc' 
)-plain()
);
 
return true;
diff --git a/RSSFeeder/RSSFeeder.setup.php b/RSSFeeder/RSSFeeder.setup.php
index eac09a5..25c4bdc 100644
--- a/RSSFeeder/RSSFeeder.setup.php
+++ b/RSSFeeder/RSSFeeder.setup.php
@@ -4,11 +4,11 @@
 
 $wgMessagesDirs['RSSFeeder'] = __DIR__ . '/i18n';
 
-$wgExtensionMessagesFiles['RSSFeeder']  = __DIR__ . 
'/languages/RSSFeeder.i18n.php';
+$wgExtensionMessagesFiles['RSSFeeder'] = __DIR__ . 
'/languages/RSSFeeder.i18n.php';
 $wgExtensionMessagesFiles['RSSFeederAlias'] = __DIR__ . 
'/languages/SpecialRSSFeeder.alias.php';
 
 $wgAutoloadClasses['SpecialRSSFeeder'] = __DIR__ . 
'/includes/specials/SpecialRSSFeeder.class.php';
-$wgAutoloadClasses['RSSCreator']   = __DIR__ . 
'/includes/RSSCreator.class.php';
+$wgAutoloadClasses['RSSCreator'] = __DIR__ . '/includes/RSSCreator.class.php';
 
 $wgSpecialPageGroups['RSSFeeder'] = 'bluespice';
 $wgSpecialPages['RSSFeeder'] = 'SpecialRSSFeeder';
diff --git a/RSSFeeder/i18n/de-formal.json b/RSSFeeder/i18n/de-formal.json
index 81b033f..efe675e 100644
--- a/RSSFeeder/i18n/de-formal.json
+++ b/RSSFeeder/i18n/de-formal.json
@@ -4,5 +4,5 @@
Stephan Muggli mug...@hallowelt.biz
]
},
-   bs-dashboards-rss-desc: Erstellen Sie Ihren eigenen RSS-Feed
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-28 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: Id4831bf2d5fe3e71f5a28644317ac07eb1c386bd
---
M RSSFeeder/RSSFeeder.setup.php
A RSSFeeder/i18n/de-formal.json
A RSSFeeder/i18n/de.json
A RSSFeeder/i18n/en.json
A RSSFeeder/i18n/qqq.json
M RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
M RSSFeeder/languages/RSSFeeder.i18n.php
7 files changed, 87 insertions(+), 68 deletions(-)

Approvals:
  Smuggli: Verified; Looks good to me, approved



diff --git a/RSSFeeder/RSSFeeder.setup.php b/RSSFeeder/RSSFeeder.setup.php
index 1216fd8..eac09a5 100644
--- a/RSSFeeder/RSSFeeder.setup.php
+++ b/RSSFeeder/RSSFeeder.setup.php
@@ -1,6 +1,8 @@
 ?php
 
-BsExtensionManager::registerExtension('RSSFeeder', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'RSSFeeder', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
+
+$wgMessagesDirs['RSSFeeder'] = __DIR__ . '/i18n';
 
 $wgExtensionMessagesFiles['RSSFeeder']  = __DIR__ . 
'/languages/RSSFeeder.i18n.php';
 $wgExtensionMessagesFiles['RSSFeederAlias'] = __DIR__ . 
'/languages/SpecialRSSFeeder.alias.php';
diff --git a/RSSFeeder/i18n/de-formal.json b/RSSFeeder/i18n/de-formal.json
new file mode 100644
index 000..81b033f
--- /dev/null
+++ b/RSSFeeder/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-dashboards-rss-desc: Erstellen Sie Ihren eigenen RSS-Feed
+}
diff --git a/RSSFeeder/i18n/de.json b/RSSFeeder/i18n/de.json
new file mode 100644
index 000..f907bd6
--- /dev/null
+++ b/RSSFeeder/i18n/de.json
@@ -0,0 +1,16 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-rssfeeder-desc: Fügt RSS Funktionalität hinzu,
+   rssfeeder: RSS Feeder,
+   bs-rssfeeder-pagetext: Folgende RSS-Feeds stehen zur Verfügung,
+   bs-rssfeeder-recent-changes: Letzte Änderungen,
+   bs-rssfeeder-pages: Seite,
+   bs-rssfeeder-submit: Anzeigen,
+   bs-rssfeeder-rss: RSS-Feed,
+   bs-dashboards-rss-desc: Erstelle deinen eigenen RSS-Feed,
+   bs-extjs-rssfeeder-rss-title: RSS-URL
+}
diff --git a/RSSFeeder/i18n/en.json b/RSSFeeder/i18n/en.json
new file mode 100644
index 000..0ad5368
--- /dev/null
+++ b/RSSFeeder/i18n/en.json
@@ -0,0 +1,16 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-rssfeeder-desc: Adds RSS functionality,
+   rssfeeder: RSS feeder,
+   bs-rssfeeder-pagetext: You can subscribe to the following RSS feeds,
+   bs-rssfeeder-recent-changes: Recent changes,
+   bs-rssfeeder-pages: Page,
+   bs-rssfeeder-submit: Show,
+   bs-rssfeeder-rss: RSS feed,
+   bs-dashboards-rss-desc: Create your own RSS feed,
+   bs-extjs-rssfeeder-rss-title: RSS URL
+}
diff --git a/RSSFeeder/i18n/qqq.json b/RSSFeeder/i18n/qqq.json
new file mode 100644
index 000..fe46181
--- /dev/null
+++ b/RSSFeeder/i18n/qqq.json
@@ -0,0 +1,16 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-rssfeeder-desc: Used in 
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}} 
Special:WikiAdmin?mode=ExtensionInfo], description of rss feeder extension,
+   rssfeeder: {{doc-special|RSS feeder}},
+   bs-rssfeeder-pagetext: Headline on special page for all available 
RSS feeds,
+   bs-rssfeeder-recent-changes: Headline for recent 
changes\\n{{Identical|Recent changes}},
+   bs-rssfeeder-pages: Headline for page\\n{{Identical|Page}},
+   bs-rssfeeder-submit: Button label for show\\n{{Identical|Show}},
+   bs-rssfeeder-rss: Used in [[Special:AdminDashboard]] and 
[[Special:UserDashboard]], headline for rss feed portlet\\n{{Identical|RSS 
feed}}},
+   bs-dashboards-rss-desc: Used in [[Special:AdminDashboard]] and 
[[Special:UserDashboard]], description of rss feed portlet,
+   bs-extjs-rssfeeder-rss-title: Used in [[Special:AdminDashboard]] and 
[[Special:UserDashboard]], label for rss url\\n{{Identical|RSS URL}}}
+}
diff --git a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php 
b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
index 7d009e5..2d1b4e6 100644
--- a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
+++ b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
@@ -35,7 +35,6 @@
return;
}
 
-   $this-getOutput()-setPageTitle('RSS');
$this-getOutput()-addModuleStyles( 'ext.bluespice.rssFeeder' 
);
 
$form = new ViewBaseForm();
@@ -44,7 +43,7 @@

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-28 Thread Smuggli (Code Review)

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 typo dispalys
Changed error message into correct meaning

Change-Id: Id6bbf0788f23bf017159d5f7be4e93a392860dc6
---
M Statistics/Statistics.class.php
M Statistics/Statistics.setup.php
A Statistics/i18n/de-formal.json
A Statistics/i18n/de.json
A Statistics/i18n/en.json
A Statistics/i18n/qqq.json
M Statistics/includes/DiagramEditsPerUser.class.php
M Statistics/includes/DiagramNumberOfArticles.class.php
M Statistics/includes/DiagramNumberOfEdits.class.php
M Statistics/includes/DiagramNumberOfPages.class.php
M Statistics/includes/DiagramNumberOfUsers.class.php
M Statistics/includes/DiagramSearches.class.php
M Statistics/includes/FilterCategory.class.php
M Statistics/includes/FilterNamespace.class.php
M Statistics/includes/FilterSearchScope.class.php
M Statistics/includes/FilterUsers.class.php
M Statistics/includes/MultiSelectFilter.class.php
M Statistics/languages/Statistics.i18n.php
M Statistics/resources/BS.Statistics/Filter.js
M Statistics/resources/BS.Statistics/Panel.js
M Statistics/resources/BS.Statistics/StatisticsPortletConfig.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfArticles.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfEdits.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfPages.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfUsers.js
25 files changed, 308 insertions(+), 314 deletions(-)

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



diff --git a/Statistics/Statistics.class.php b/Statistics/Statistics.class.php
index 1152a61..1862a19 100644
--- a/Statistics/Statistics.class.php
+++ b/Statistics/Statistics.class.php
@@ -101,21 +101,14 @@
$this-setHook( 'BSDashboardsUserDashboardPortalConfig' );
$this-setHook( 'BSDashboardsUserDashboardPortalPortlets' );
 
-   //BsConfig::registerVar( 'MW::Statistics::DiagramDir',  
 'images/statistics',   BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING,   
'bs-statistics-pref-DiagramDir' );
-   //BsConfig::registerVar( 'MW::Statistics::DiagramWidth',
 700,   BsConfig::LEVEL_USER|BsConfig::TYPE_INT,
'bs-statistics-pref-DiagramWidth', 'int' );
-   //BsConfig::registerVar( 'MW::Statistics::DiagramHeight',   
 500,   BsConfig::LEVEL_USER|BsConfig::TYPE_INT,
'bs-statistics-pref-DiagramHeight', 'int' );
-   //BsConfig::registerVar( 'MW::Statistics::DiagramType', 
 'line',BsConfig::LEVEL_USER|BsConfig::TYPE_STRING, 
$this-mI18N );
-   //BsConfig::registerVar( 'MW::Statistics::DiagramType', 
 'line',
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-statistics-pref-DiagramType', 'select' );
-   //BsConfig::registerVar( 'MW::Statistics::DefaultFrom', 
 '01 January 2010', BsConfig::LEVEL_USER|BsConfig::TYPE_STRING, 
'bs-statistics-pref-DefaultFrom' );
-   //BsConfig::registerVar( 'MW::Statistics::DisableCache',
 true,  BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-statistics-pref-DisableCache', 'toggle' );
+   BsConfig::registerVar( 'MW::Statistics::ExcludeUsers', array( 
'WikiSysop' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-statistics-pref-excludeusers', 'multiselectplusadd' );
+   BsConfig::registerVar( 'MW::Statistics::MaxNumberOfIntervals', 
36, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-statistics-pref-maxnumberofintervals', 'int' );
 
-   BsConfig::registerVar( 'MW::Statistics::ExcludeUsers', 
array( 'WikiSysop' ),  BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-statistics-pref-ExcludeUsers', 'multiselectplusadd' );
-   BsConfig::registerVar( 'MW::Statistics::MaxNumberOfIntervals', 
36,BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT,  
'bs-statistics-pref-MaxNumberOfIntervals', 'int' );
$aAvailableGrains = array(
-   'Y' = 'bs-statistics-Y',
-   'm' = 'bs-statistics-m',
-   'W' = 'bs-statistics-W',
-   'd' = 'bs-statistics-d',
+   'Y' = 'bs-statistics-year',
+   'm' = 'bs-statistics-month',
+   'W' = 'bs-statistics-week',
+   'd' = 'bs-statistics-day',
);
BsConfig::registerVar( 'MW::Statistics::AvailableGrains', 
$aAvailableGrains, BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED, 
'bs-statistics-pref-AvailableGrains');
 
@@ -232,9

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-28 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files
Imporved qqq message
Fixed typo Not - No

Change-Id: Ia6b25b16e5b0c2df5b8682ed7a5380aa7a1ff095
---
M CountThings/CountThings.class.php
M CountThings/CountThings.setup.php
A CountThings/i18n/de-formal.json
A CountThings/i18n/de.json
A CountThings/i18n/en.json
A CountThings/i18n/qqq.json
M CountThings/languages/CountThings.i18n.php
M CountThings/views/view.CountCharacters.php
8 files changed, 98 insertions(+), 53 deletions(-)

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



diff --git a/CountThings/CountThings.class.php 
b/CountThings/CountThings.class.php
index fff97cd..c9d2214 100644
--- a/CountThings/CountThings.class.php
+++ b/CountThings/CountThings.class.php
@@ -162,7 +162,7 @@
public function onMagicWordBsCountCharacters( $input, $args, $parser ) {
$parser-disableCache();
if ( empty( $input ) ) {
-   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-countchars-no-input' )-plain() );
+   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-no-input' )-plain() );
return $oErrorView-execute();
}
 
@@ -174,7 +174,7 @@
$bValidModeProvided = false;
foreach( $aModes as $sMode ) {
if( !in_array( $sMode, $aAvailableModes ) ){
-   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-countchars-invalid-mode', $sMode )-plain() );
+   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-invalid-mode', $sMode )-plain() );
$sOut .= $oErrorView-execute();
continue;
}
@@ -186,7 +186,7 @@
foreach( $aTitleTexts as $sTitleText ) {
$oTitle = Title::newFromText( trim( $sTitleText ) );
if( $oTitle == null || $oTitle-exists() == false ) {
-   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-countchars-title-does-not-exist', $sTitleText )-plain() 
);
+   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-not-exist', $sTitleText )-plain() );
$sOut .= $oErrorView-execute();
continue;
}
diff --git a/CountThings/CountThings.setup.php 
b/CountThings/CountThings.setup.php
index c689b97..f303fda 100644
--- a/CountThings/CountThings.setup.php
+++ b/CountThings/CountThings.setup.php
@@ -1,6 +1,8 @@
 ?php
 
-BsExtensionManager::registerExtension('CountThings', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension('CountThings', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+
+$wgMessagesDirs['CountThings'] = __DIR__ . '/i18n';
 
 $wgExtensionMessagesFiles['CountThings'] = __DIR__ . 
'/languages/CountThings.i18n.php';
 
diff --git a/CountThings/i18n/de-formal.json b/CountThings/i18n/de-formal.json
new file mode 100644
index 000..c5a7b02
--- /dev/null
+++ b/CountThings/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-countthings-error-invalid-mode: Der Konfigurationsparameter 
\$1\ ist nicht zulässig. Bitte verwenden Sie \chars\, \words\, oder 
\pages\.
+}
diff --git a/CountThings/i18n/de.json b/CountThings/i18n/de.json
new file mode 100644
index 000..f2e4212
--- /dev/null
+++ b/CountThings/i18n/de.json
@@ -0,0 +1,18 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-countthings-desc: Stellt Inhaltsbasierte Statistiken bereit,
+   bs-countthings-chars-label: Zeichen,
+   bs-countthings-words-label: Wörter,
+   bs-countthings-pages-label: Seiten,
+   bs-countthings-error-no-input: Es wurden keine Seite angegeben.,
+   bs-countthings-error-invalid-mode: Der Konfigurationsparameter 
\$1\ ist nicht zulässig. Bitte verwende \chars\, \words\, oder 
\pages\.,
+   bs-countthings-error-not-exist: Der Seite \$1\ existiert nicht.,
+   bs-countthings-tag-countarticles-desc: Gibt die Anzahl der Seiten 
aus.,
+   bs-countthings-tag-countusers-desc: Gibt die Anzahl der Benutzer 
aus.,
+   bs-countthings-tag-countcharacters-desc: Stellt eine Statistik des 
Inhalts der angegeben Seiten dar. Verfügbarer Konfigurationsparameter ist:,
+   bs-countthings-tag-countcharacters-desc-param-mode: 
codemode/code: Was soll

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-26 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved php i18n file to languages folder
Moved to Json i18n files
Added two missing messages in german
Fixed typo
Removed debugger statement
Fixed typo
Improved some messages
Added quotes in german
Removed de-formal json file because no message had polite form
Added key for suffix
Fixed Typo
Suffix msg is completely referenced now

Change-Id: Ia3d4fa898721eac7b9d8752019884fdf30748aa7
---
M NamespaceManager/NamespaceManager.class.php
M NamespaceManager/NamespaceManager.setup.php
A NamespaceManager/i18n/de.json
A NamespaceManager/i18n/en.json
A NamespaceManager/i18n/qqq.json
A NamespaceManager/includes/NamespaceNuker.php
A NamespaceManager/languages/NamespaceManager.i18n.php
M NamespaceManager/resources/BS.NamespaceManager/NamespaceDialog.js
M NamespaceManager/resources/BS.NamespaceManager/NamespaceRemoveDialog.js
M NamespaceManager/resources/BS.NamespaceManager/Panel.js
10 files changed, 405 insertions(+), 53 deletions(-)

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



diff --git a/NamespaceManager/NamespaceManager.class.php 
b/NamespaceManager/NamespaceManager.class.php
index c2261c8..d20a0ab 100644
--- a/NamespaceManager/NamespaceManager.class.php
+++ b/NamespaceManager/NamespaceManager.class.php
@@ -401,13 +401,13 @@
if ( strlen( $sNamespace )  2 ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-namespace_name_length' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-ns-length' )-plain()
) );
// TODO MRG (06.11.13 11:17): Unicodefähigkeit?
} else if ( !preg_match( 
'%^[a-zA-Z_\\x80-\\xFF][a-zA-Z0-9_\\x80-\\xFF]{1,99}$%i', $sNamespace ) ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-wrong_namespace_name_format' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-wrong-name' )-plain()
) );
} else {
$aUserNamespaces[$iNS] = array( 'name' = 
$sNamespace );
@@ -432,7 +432,7 @@
// Zweig hier weglassen.
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-namespace_already_exists' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-ns-exists' )-plain()
) );
}
}
@@ -460,19 +460,19 @@
if ( $iNS !== NS_MAIN  !$iNS ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-no_valid_namespace_id' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-invalid-id' )-plain()
) );
}
if ( strlen( $sNamespace )  2 ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-namespace_name_length' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-ns-length' )-plain()
) );
}
if ( $iNS !== NS_MAIN  $iNS !== NS_PROJECT  $iNS !== 
NS_PROJECT_TALK  !preg_match( 
'%^[a-zA-Z_\\x80-\\xFF][a-zA-Z0-9_\\x80-\\xFF]{1,99}$%', $sNamespace ) ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-wrong_namespace_name_format' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-wrong-name' )-plain()
) );
}
 
@@ -518,7 +518,7 @@
if ( !$iNS ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-no_valid_namespace_id' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-invalid-id' )-plain()
) );

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-25 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: Ia6b25b16e5b0c2df5b8682ed7a5380aa7a1ff095
---
M CountThings/CountThings.class.php
M CountThings/CountThings.setup.php
A CountThings/i18n/de-formal.json
A CountThings/i18n/de.json
A CountThings/i18n/en.json
A CountThings/i18n/qqq.json
M CountThings/languages/CountThings.i18n.php
M CountThings/views/view.CountCharacters.php
8 files changed, 98 insertions(+), 53 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/72/149272/1

diff --git a/CountThings/CountThings.class.php 
b/CountThings/CountThings.class.php
index fff97cd..c9d2214 100644
--- a/CountThings/CountThings.class.php
+++ b/CountThings/CountThings.class.php
@@ -162,7 +162,7 @@
public function onMagicWordBsCountCharacters( $input, $args, $parser ) {
$parser-disableCache();
if ( empty( $input ) ) {
-   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-countchars-no-input' )-plain() );
+   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-no-input' )-plain() );
return $oErrorView-execute();
}
 
@@ -174,7 +174,7 @@
$bValidModeProvided = false;
foreach( $aModes as $sMode ) {
if( !in_array( $sMode, $aAvailableModes ) ){
-   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-countchars-invalid-mode', $sMode )-plain() );
+   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-invalid-mode', $sMode )-plain() );
$sOut .= $oErrorView-execute();
continue;
}
@@ -186,7 +186,7 @@
foreach( $aTitleTexts as $sTitleText ) {
$oTitle = Title::newFromText( trim( $sTitleText ) );
if( $oTitle == null || $oTitle-exists() == false ) {
-   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-countchars-title-does-not-exist', $sTitleText )-plain() 
);
+   $oErrorView = new ViewTagError( wfMessage( 
'bs-countthings-error-not-exist', $sTitleText )-plain() );
$sOut .= $oErrorView-execute();
continue;
}
diff --git a/CountThings/CountThings.setup.php 
b/CountThings/CountThings.setup.php
index c689b97..f303fda 100644
--- a/CountThings/CountThings.setup.php
+++ b/CountThings/CountThings.setup.php
@@ -1,6 +1,8 @@
 ?php
 
-BsExtensionManager::registerExtension('CountThings', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension('CountThings', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+
+$wgMessagesDirs['CountThings'] = __DIR__ . '/i18n';
 
 $wgExtensionMessagesFiles['CountThings'] = __DIR__ . 
'/languages/CountThings.i18n.php';
 
diff --git a/CountThings/i18n/de-formal.json b/CountThings/i18n/de-formal.json
new file mode 100644
index 000..c5a7b02
--- /dev/null
+++ b/CountThings/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-countthings-error-invalid-mode: Der Konfigurationsparameter 
\$1\ ist nicht zulässig. Bitte verwenden Sie \chars\, \words\, oder 
\pages\.
+}
diff --git a/CountThings/i18n/de.json b/CountThings/i18n/de.json
new file mode 100644
index 000..f2e4212
--- /dev/null
+++ b/CountThings/i18n/de.json
@@ -0,0 +1,18 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-countthings-desc: Stellt Inhaltsbasierte Statistiken bereit,
+   bs-countthings-chars-label: Zeichen,
+   bs-countthings-words-label: Wörter,
+   bs-countthings-pages-label: Seiten,
+   bs-countthings-error-no-input: Es wurden keine Seite angegeben.,
+   bs-countthings-error-invalid-mode: Der Konfigurationsparameter 
\$1\ ist nicht zulässig. Bitte verwende \chars\, \words\, oder 
\pages\.,
+   bs-countthings-error-not-exist: Der Seite \$1\ existiert nicht.,
+   bs-countthings-tag-countarticles-desc: Gibt die Anzahl der Seiten 
aus.,
+   bs-countthings-tag-countusers-desc: Gibt die Anzahl der Benutzer 
aus.,
+   bs-countthings-tag-countcharacters-desc: Stellt eine Statistik des 
Inhalts der angegeben Seiten dar. Verfügbarer Konfigurationsparameter ist:,
+   bs-countthings-tag-countcharacters-desc-param-mode: 
codemode/code: Was soll gezählt werden

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-24 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I7c8319ca7ebf8add3b717a347f0f134dea1adf19
---
M RSSFeeder/RSSFeeder.class.php
M RSSFeeder/RSSFeeder.setup.php
M RSSFeeder/i18n/de-formal.json
M RSSFeeder/i18n/de.json
M RSSFeeder/i18n/en.json
M RSSFeeder/i18n/qqq.json
M RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
M RSSFeeder/languages/RSSFeeder.i18n.php
8 files changed, 35 insertions(+), 35 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/76/148976/1

diff --git a/RSSFeeder/RSSFeeder.class.php b/RSSFeeder/RSSFeeder.class.php
index 5803e0f..cf5b19f 100644
--- a/RSSFeeder/RSSFeeder.class.php
+++ b/RSSFeeder/RSSFeeder.class.php
@@ -90,14 +90,14 @@
 */
public function onBSDashboardsAdminDashboardPortalPortlets( $aPortlets 
) {
$aPortlets[] = array(
-   'type' = 
'BS.RSSFeeder.RSSPortlet',
-   'config' = array(
-   'title' = wfMessage( 
'bs-rssfeeder-rss' )-plain(),
-   'height' = 660,
-   'rssurl' = 
'http://blog.blue-spice.org/feed/'
-   ),
-   'title' = wfMessage( 
'bs-rssfeeder-rss' )-plain(),
-   'description' = wfMessage( 
'bs-dashboards-rss-desc' )-plain()
+   'type' = 'BS.RSSFeeder.RSSPortlet',
+   'config' = array(
+   'title' = wfMessage( 'bs-rssfeeder-rss' 
)-plain(),
+   'height' = 660,
+   'rssurl' = 'http://blog.blue-spice.org/feed/'
+   ),
+   'title' = wfMessage( 'bs-rssfeeder-rss' )-plain(),
+   'description' = wfMessage( 'bs-rssfeeder-rss-desc' 
)-plain()
);
 
return true;
@@ -132,14 +132,14 @@
 */
public function onBSDashboardsUserDashboardPortalPortlets( $aPortlets 
) {
$aPortlets[] = array(
-   'type' = 
'BS.RSSFeeder.RSSPortlet',
-   'config' = array(
-   'title' = wfMessage( 
'bs-rssfeeder-rss' )-plain(),
-   'height' = 610,
-   'rssurl' = 
'http://blog.blue-spice.org/feed/'
-   ),
-   'title' = wfMessage( 
'bs-rssfeeder-rss' )-plain(),
-   'description' = wfMessage( 
'bs-dashboards-rss-desc' )-plain()
+   'type' = 'BS.RSSFeeder.RSSPortlet',
+   'config' = array(
+   'title' = wfMessage( 'bs-rssfeeder-rss' 
)-plain(),
+   'height' = 610,
+   'rssurl' = 'http://blog.blue-spice.org/feed/'
+   ),
+   'title' = wfMessage( 'bs-rssfeeder-rss' )-plain(),
+   'description' = wfMessage( 'bs-rssfeeder-rss-desc' 
)-plain()
);
 
return true;
diff --git a/RSSFeeder/RSSFeeder.setup.php b/RSSFeeder/RSSFeeder.setup.php
index eac09a5..25c4bdc 100644
--- a/RSSFeeder/RSSFeeder.setup.php
+++ b/RSSFeeder/RSSFeeder.setup.php
@@ -4,11 +4,11 @@
 
 $wgMessagesDirs['RSSFeeder'] = __DIR__ . '/i18n';
 
-$wgExtensionMessagesFiles['RSSFeeder']  = __DIR__ . 
'/languages/RSSFeeder.i18n.php';
+$wgExtensionMessagesFiles['RSSFeeder'] = __DIR__ . 
'/languages/RSSFeeder.i18n.php';
 $wgExtensionMessagesFiles['RSSFeederAlias'] = __DIR__ . 
'/languages/SpecialRSSFeeder.alias.php';
 
 $wgAutoloadClasses['SpecialRSSFeeder'] = __DIR__ . 
'/includes/specials/SpecialRSSFeeder.class.php';
-$wgAutoloadClasses['RSSCreator']   = __DIR__ . 
'/includes/RSSCreator.class.php';
+$wgAutoloadClasses['RSSCreator'] = __DIR__ . '/includes/RSSCreator.class.php';
 
 $wgSpecialPageGroups['RSSFeeder'] = 'bluespice';
 $wgSpecialPages['RSSFeeder'] = 'SpecialRSSFeeder';
diff --git a/RSSFeeder/i18n/de-formal.json b/RSSFeeder/i18n/de-formal.json
index 81b033f..efe675e 100644
--- a/RSSFeeder/i18n/de-formal.json
+++ b/RSSFeeder/i18n/de-formal.json
@@ -4,5 +4,5 @@
Stephan Muggli mug...@hallowelt.biz
]
},
-   bs-dashboards-rss-desc: Erstellen Sie Ihren eigenen

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-24 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: Id4831bf2d5fe3e71f5a28644317ac07eb1c386bd
---
M RSSFeeder/RSSFeeder.setup.php
A RSSFeeder/i18n/de-formal.json
A RSSFeeder/i18n/de.json
A RSSFeeder/i18n/en.json
A RSSFeeder/i18n/qqq.json
M RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
M RSSFeeder/languages/RSSFeeder.i18n.php
7 files changed, 87 insertions(+), 68 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/75/148975/1

diff --git a/RSSFeeder/RSSFeeder.setup.php b/RSSFeeder/RSSFeeder.setup.php
index 1216fd8..eac09a5 100644
--- a/RSSFeeder/RSSFeeder.setup.php
+++ b/RSSFeeder/RSSFeeder.setup.php
@@ -1,6 +1,8 @@
 ?php
 
-BsExtensionManager::registerExtension('RSSFeeder', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'RSSFeeder', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
+
+$wgMessagesDirs['RSSFeeder'] = __DIR__ . '/i18n';
 
 $wgExtensionMessagesFiles['RSSFeeder']  = __DIR__ . 
'/languages/RSSFeeder.i18n.php';
 $wgExtensionMessagesFiles['RSSFeederAlias'] = __DIR__ . 
'/languages/SpecialRSSFeeder.alias.php';
diff --git a/RSSFeeder/i18n/de-formal.json b/RSSFeeder/i18n/de-formal.json
new file mode 100644
index 000..81b033f
--- /dev/null
+++ b/RSSFeeder/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-dashboards-rss-desc: Erstellen Sie Ihren eigenen RSS-Feed
+}
diff --git a/RSSFeeder/i18n/de.json b/RSSFeeder/i18n/de.json
new file mode 100644
index 000..f907bd6
--- /dev/null
+++ b/RSSFeeder/i18n/de.json
@@ -0,0 +1,16 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-rssfeeder-desc: Fügt RSS Funktionalität hinzu,
+   rssfeeder: RSS Feeder,
+   bs-rssfeeder-pagetext: Folgende RSS-Feeds stehen zur Verfügung,
+   bs-rssfeeder-recent-changes: Letzte Änderungen,
+   bs-rssfeeder-pages: Seite,
+   bs-rssfeeder-submit: Anzeigen,
+   bs-rssfeeder-rss: RSS-Feed,
+   bs-dashboards-rss-desc: Erstelle deinen eigenen RSS-Feed,
+   bs-extjs-rssfeeder-rss-title: RSS-URL
+}
diff --git a/RSSFeeder/i18n/en.json b/RSSFeeder/i18n/en.json
new file mode 100644
index 000..0ad5368
--- /dev/null
+++ b/RSSFeeder/i18n/en.json
@@ -0,0 +1,16 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-rssfeeder-desc: Adds RSS functionality,
+   rssfeeder: RSS feeder,
+   bs-rssfeeder-pagetext: You can subscribe to the following RSS feeds,
+   bs-rssfeeder-recent-changes: Recent changes,
+   bs-rssfeeder-pages: Page,
+   bs-rssfeeder-submit: Show,
+   bs-rssfeeder-rss: RSS feed,
+   bs-dashboards-rss-desc: Create your own RSS feed,
+   bs-extjs-rssfeeder-rss-title: RSS URL
+}
diff --git a/RSSFeeder/i18n/qqq.json b/RSSFeeder/i18n/qqq.json
new file mode 100644
index 000..fe46181
--- /dev/null
+++ b/RSSFeeder/i18n/qqq.json
@@ -0,0 +1,16 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-rssfeeder-desc: Used in 
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}} 
Special:WikiAdmin?mode=ExtensionInfo], description of rss feeder extension,
+   rssfeeder: {{doc-special|RSS feeder}},
+   bs-rssfeeder-pagetext: Headline on special page for all available 
RSS feeds,
+   bs-rssfeeder-recent-changes: Headline for recent 
changes\\n{{Identical|Recent changes}},
+   bs-rssfeeder-pages: Headline for page\\n{{Identical|Page}},
+   bs-rssfeeder-submit: Button label for show\\n{{Identical|Show}},
+   bs-rssfeeder-rss: Used in [[Special:AdminDashboard]] and 
[[Special:UserDashboard]], headline for rss feed portlet\\n{{Identical|RSS 
feed}}},
+   bs-dashboards-rss-desc: Used in [[Special:AdminDashboard]] and 
[[Special:UserDashboard]], description of rss feed portlet,
+   bs-extjs-rssfeeder-rss-title: Used in [[Special:AdminDashboard]] and 
[[Special:UserDashboard]], label for rss url\\n{{Identical|RSS URL}}}
+}
diff --git a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php 
b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
index 7d009e5..2d1b4e6 100644
--- a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
+++ b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
@@ -35,7 +35,6 @@
return;
}
 
-   $this-getOutput()-setPageTitle('RSS');
$this-getOutput()-addModuleStyles(

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-24 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: Id6bbf0788f23bf017159d5f7be4e93a392860dc6
---
M Statistics/Statistics.class.php
M Statistics/Statistics.setup.php
A Statistics/i18n/de-formal.json
A Statistics/i18n/de.json
A Statistics/i18n/en.json
A Statistics/i18n/qqq.json
M Statistics/includes/DiagramEditsPerUser.class.php
M Statistics/includes/DiagramNumberOfArticles.class.php
M Statistics/includes/DiagramNumberOfEdits.class.php
M Statistics/includes/DiagramNumberOfPages.class.php
M Statistics/includes/DiagramNumberOfUsers.class.php
M Statistics/includes/DiagramSearches.class.php
M Statistics/includes/FilterCategory.class.php
M Statistics/includes/FilterNamespace.class.php
M Statistics/includes/FilterSearchScope.class.php
M Statistics/includes/FilterUsers.class.php
M Statistics/includes/MultiSelectFilter.class.php
M Statistics/languages/Statistics.i18n.php
M Statistics/resources/BS.Statistics/Filter.js
M Statistics/resources/BS.Statistics/Panel.js
M Statistics/resources/BS.Statistics/StatisticsPortletConfig.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfArticles.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfEdits.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfPages.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfUsers.js
25 files changed, 308 insertions(+), 314 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/87/148987/1

diff --git a/Statistics/Statistics.class.php b/Statistics/Statistics.class.php
index 1152a61..1862a19 100644
--- a/Statistics/Statistics.class.php
+++ b/Statistics/Statistics.class.php
@@ -101,21 +101,14 @@
$this-setHook( 'BSDashboardsUserDashboardPortalConfig' );
$this-setHook( 'BSDashboardsUserDashboardPortalPortlets' );
 
-   //BsConfig::registerVar( 'MW::Statistics::DiagramDir',  
 'images/statistics',   BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING,   
'bs-statistics-pref-DiagramDir' );
-   //BsConfig::registerVar( 'MW::Statistics::DiagramWidth',
 700,   BsConfig::LEVEL_USER|BsConfig::TYPE_INT,
'bs-statistics-pref-DiagramWidth', 'int' );
-   //BsConfig::registerVar( 'MW::Statistics::DiagramHeight',   
 500,   BsConfig::LEVEL_USER|BsConfig::TYPE_INT,
'bs-statistics-pref-DiagramHeight', 'int' );
-   //BsConfig::registerVar( 'MW::Statistics::DiagramType', 
 'line',BsConfig::LEVEL_USER|BsConfig::TYPE_STRING, 
$this-mI18N );
-   //BsConfig::registerVar( 'MW::Statistics::DiagramType', 
 'line',
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-statistics-pref-DiagramType', 'select' );
-   //BsConfig::registerVar( 'MW::Statistics::DefaultFrom', 
 '01 January 2010', BsConfig::LEVEL_USER|BsConfig::TYPE_STRING, 
'bs-statistics-pref-DefaultFrom' );
-   //BsConfig::registerVar( 'MW::Statistics::DisableCache',
 true,  BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-statistics-pref-DisableCache', 'toggle' );
+   BsConfig::registerVar( 'MW::Statistics::ExcludeUsers', array( 
'WikiSysop' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-statistics-pref-excludeusers', 'multiselectplusadd' );
+   BsConfig::registerVar( 'MW::Statistics::MaxNumberOfIntervals', 
36, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-statistics-pref-maxnumberofintervals', 'int' );
 
-   BsConfig::registerVar( 'MW::Statistics::ExcludeUsers', 
array( 'WikiSysop' ),  BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-statistics-pref-ExcludeUsers', 'multiselectplusadd' );
-   BsConfig::registerVar( 'MW::Statistics::MaxNumberOfIntervals', 
36,BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT,  
'bs-statistics-pref-MaxNumberOfIntervals', 'int' );
$aAvailableGrains = array(
-   'Y' = 'bs-statistics-Y',
-   'm' = 'bs-statistics-m',
-   'W' = 'bs-statistics-W',
-   'd' = 'bs-statistics-d',
+   'Y' = 'bs-statistics-year',
+   'm' = 'bs-statistics-month',
+   'W' = 'bs-statistics-week',
+   'd' = 'bs-statistics-day',
);
BsConfig::registerVar( 'MW::Statistics::AvailableGrains', 
$aAvailableGrains, BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED, 
'bs-statistics-pref-AvailableGrains');
 
@@ -232,9 +225,9 @@
 * @param Skin $oSkin

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-18 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I45fc49af74009094d7dac7f14c42f8212278a612
---
M Flexiskin/Flexiskin.class.php
M Flexiskin/Flexiskin.setup.php
A Flexiskin/i18n/de-formal.json
A Flexiskin/i18n/de.json
A Flexiskin/i18n/en.json
A Flexiskin/i18n/qqq.json
M Flexiskin/languages/Flexiskin.i18n.php
M Flexiskin/resources/BS.Flexiskin/AddSkin.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js
M Flexiskin/resources/BS.Flexiskin/Panel.js
M Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
13 files changed, 268 insertions(+), 200 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/03/147403/1

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index c052713..2cef8d9 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -99,7 +99,7 @@
public function runPreferencePlugin($sAdapterName, $oVariable) {
$aData = self::getFlexiskins(false);
$aResult = array('options' = array(
-   wfMessage('bs-flexiskin-defaultName')-plain() 
= 'default',
+   wfMessage('bs-flexiskin-defaultname')-plain() 
= 'default',
));
if (isset($aData['flexiskin'])  count($aData['flexiskin'])  
0)
foreach ($aData['flexiskin'] as $aConf) {
@@ -147,23 +147,23 @@
$aData = json_decode(self::getVal('data'));
$oData = $aData[0];
if (is_null($oData-template))
-   return json_encode(array('success' = false, 'msg' = 
wfMessage('bs-flexiskin-error-templateNotExists')-plain()));
+   return json_encode(array('success' = false, 'msg' = 
wfMessage('bs-flexiskin-error-templatenotexists')-plain()));
if( empty($oData-template) )
$oData-template = 'default';
 
$sId = str_replace( , _, strtolower($oData-name));
if (is_dir((self::$sFlexiskinPath . / . md5($sId {
-   return json_encode(array('success' = false, 'msg' = 
wfMessage('bs-flexiskin-error-skinExists')-plain()));
+   return json_encode(array('success' = false, 'msg' = 
wfMessage('bs-flexiskin-error-skinexists')-plain()));
}
//PW(27.11.2013) TODO: add check template really exists before 
add
if( empty($oData-name) ) {
//PW(27.11.2013) TODO: add msg
-   return json_encode(array('success' = false, 'msg' = 
wfMessage('bs-flexiskin-error-nameEmpty')-plain()));
+   return json_encode(array('success' = false, 'msg' = 
wfMessage('bs-flexiskin-error-nameempty')-plain()));
}
if ( $oData-template != 'default'){
$oConfig = self::getFlexiskinConfig(true, 
$oData-template);
if (!$oConfig-isGood())
-   return json_encode(array('success' = false, 
'msg' = wfMessage('bs-flexiskin-error-templateNotExists')-plain()));
+   return json_encode(array('success' = false, 
'msg' = wfMessage('bs-flexiskin-error-templatenotexists')-plain()));
$oConf = json_decode($oConfig-getValue());
$oConf[0]-name = $oData-name;
$oConf[0]-desc = $oData-desc;
@@ -270,7 +270,7 @@
$aConfigs = json_decode($aData['data']);
$aFile = self::generateStyleFile($aConfigs);
if (self::$iOldId != self::$iNewId  
is_dir(self::$sFlexiskinPath . DS . self::$iNewId)  
file_exists(self::$sFlexiskinPath . DS . self::$iNewId . DS . conf.json)) {
-   return json_encode(array('success' = false, 'msg' = 
wfMessage('bs-flexiskin-error-skinExists')-plain()));
+   return json_encode(array('success' = false, 'msg' = 
wfMessage('bs-flexiskin-error-skinexists')-plain()));
}
if (self::$iOldId != self::$iNewId  
is_dir(self::$sFlexiskinPath . DS . self::$iOldId)) {
$oStatus = BsFileSystemHelper::renameFolder(flexiskin 
. DS . self::$iOldId, flexiskin . DS . self::$iNewId);
diff --git a/Flexiskin/Flexiskin.setup.php b/Flexiskin/Flexiskin.setup.php
index e4d32c6..7a55fd7 100644
--- a/Flexiskin/Flexiskin.setup.php
+++ b/Flexiskin/Flexiskin.setup.php
@@ -1,6 +1,8 @@
 ?php
 
-BsExtensionManager::registerExtension('Flexiskin', BsRUNLEVEL::FULL | 
BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'Flexiskin',

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files
Added GENDER support
Fixed typo
Added missing qqq

Change-Id: I5b67b186d76e1fe906ca35760cbae52b0dfe
---
M Readers/Readers.setup.php
A Readers/i18n/de-formal.json
A Readers/i18n/de.json
A Readers/i18n/en.json
A Readers/i18n/qqq.json
M Readers/includes/specials/SpecialReaders.class.php
M Readers/languages/Readers.i18n.php
M Readers/resources/BS.Readers/Panel.js
M Readers/resources/BS.Readers/PathPanel.js
M Readers/views/view.Readers.php
10 files changed, 176 insertions(+), 154 deletions(-)

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



diff --git a/Readers/Readers.setup.php b/Readers/Readers.setup.php
index 7b6caa1..0865be7 100644
--- a/Readers/Readers.setup.php
+++ b/Readers/Readers.setup.php
@@ -39,9 +39,9 @@
),
'position' = 'bottom',
'messages' = array(
-   'bs-readers-headerUsername',
-   'bs-readers-headerReadersPath',
-   'bs-readers-headerTs'
+   'bs-readers-header-username',
+   'bs-readers-header-readerspath',
+   'bs-readers-header-ts'
)
 ) + $aResourceModuleTemplate;
 
@@ -54,8 +54,8 @@
),
'position' = 'bottom',
'messages' = array(
-   'bs-readers-headerUsername',
-   'bs-readers-headerReadersPath',
-   'bs-readers-headerTs'
+   'bs-readers-header-username',
+   'bs-readers-header-readerspath',
+   'bs-readers-header-ts'
)
 ) + $aResourceModuleTemplate;
\ No newline at end of file
diff --git a/Readers/i18n/de-formal.json b/Readers/i18n/de-formal.json
new file mode 100644
index 000..9044d26
--- /dev/null
+++ b/Readers/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-readers-emptyinput: Sie müssen eine Seite angeben.
+}
diff --git a/Readers/i18n/de.json b/Readers/i18n/de.json
new file mode 100644
index 000..cc2f834
--- /dev/null
+++ b/Readers/i18n/de.json
@@ -0,0 +1,20 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-readers-desc: Zeigt die Besucher einer Seite an.,
+   prefs-readers: Besucher dieser Seite,
+   bs-readers-title: Besucher,
+   readers-user: Seiten besucht von: $1,
+   readers: Besucher der Seite: $1,
+   bs-readers-contentactions-label: Besucher anzeigen,
+   bs-readers-pagenotexists: Es wurde keine Seite übergeben.,
+   bs-readers-pref-active: Besucher dieser Seite aktivieren.,
+   bs-readers-pref-numofreaders: Anzahl der anzuzeigenden Besucher:,
+   bs-readers-emptyinput: Du musste einen Seite angeben.,
+   bs-readers-header-username: Benutzername,
+   bs-readers-header-readerspath: Leser,
+   bs-readers-header-ts: Datum
+}
diff --git a/Readers/i18n/en.json b/Readers/i18n/en.json
new file mode 100644
index 000..dc50a65
--- /dev/null
+++ b/Readers/i18n/en.json
@@ -0,0 +1,20 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-readers-desc: Displays readers of a page, and pages read by a 
user,
+   prefs-readers: Readers,
+   bs-readers-title: {{PLURAL:$1|{{GENDER:$2|Reader}}|Readers}},
+   readers-user: Pages {{GENDER:$1|read}} by: $1,
+   readers: Readers of \$1\,
+   bs-readers-contentactions-label: Display readers,
+   bs-readers-pagenotexists: Page does not exist.,
+   bs-readers-pref-active: Activate readers,
+   bs-readers-pref-numofreaders: Number of readers to display:,
+   bs-readers-emptyinput: No page has been provided.,
+   bs-readers-header-username: Username,
+   bs-readers-header-readerspath: Reader,
+   bs-readers-header-ts: Date
+}
diff --git a/Readers/i18n/qqq.json b/Readers/i18n/qqq.json
new file mode 100644
index 000..b90ef57
--- /dev/null
+++ b/Readers/i18n/qqq.json
@@ -0,0 +1,20 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-readers-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]], 
description of readers extension.,
+   prefs-readers: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for readers section in preferences.\n{{Identical|Readers}},
+   bs-readers-title: Headline below content for readers section\n*$1 is 
the number of readers for PLURAL distinction\n*$2 is the username of the user - 
use for GENDER distinction (singular only),
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I256df533e2c07b0c85a8a8e84ac2a0ae84bd1e48
---
M CSyntaxHighlight/CSyntaxHighlight.class.php
M CSyntaxHighlight/CSyntaxHighlight.setup.php
A CSyntaxHighlight/i18n/de.json
A CSyntaxHighlight/i18n/en.json
A CSyntaxHighlight/i18n/qqq.json
M CSyntaxHighlight/languages/CSyntaxHighlight.i18n.php
6 files changed, 72 insertions(+), 37 deletions(-)

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



diff --git a/CSyntaxHighlight/CSyntaxHighlight.class.php 
b/CSyntaxHighlight/CSyntaxHighlight.class.php
index 5ed5e80..f71f276 100644
--- a/CSyntaxHighlight/CSyntaxHighlight.class.php
+++ b/CSyntaxHighlight/CSyntaxHighlight.class.php
@@ -119,13 +119,10 @@
$this-setHook( 'SkinAfterBottomScripts' );
 
// TODO RBV (12.04.11 15:47): Provide all config possibilities 
of SyntaxHighlighter...
-   //User variables
-   BsConfig::registerVar( 'MW::CSyntaxHighlight::Theme', 
'Default', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-csyntaxhighlight-pref-Theme', 'select' );
-   BsConfig::registerVar( 'MW::CSyntaxHighlight::Gutter',true, 
 BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-Gutter', 'toggle' );
-   BsConfig::registerVar( 'MW::CSyntaxHighlight::AutoLinks', true, 
 BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-AutoLinks', 'toggle' );
-
-   //Admin variables
-   BsConfig::registerVar( 'MW::CSyntaxHighlight::Toolbar',   
false, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-Toolbar', 'toggle' );
+   BsConfig::registerVar( 'MW::CSyntaxHighlight::Theme', 
'Default', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-csyntaxhighlight-pref-theme', 'select' );
+   BsConfig::registerVar( 'MW::CSyntaxHighlight::Gutter',true, 
 BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-gutter', 'toggle' );
+   BsConfig::registerVar( 'MW::CSyntaxHighlight::AutoLinks', true, 
 BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-autolinks', 'toggle' );
+   BsConfig::registerVar( 'MW::CSyntaxHighlight::Toolbar',   
false, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-toolbar', 'toggle' );
wfProfileOut( 'BS::'.__METHOD__ );
}
 
diff --git a/CSyntaxHighlight/CSyntaxHighlight.setup.php 
b/CSyntaxHighlight/CSyntaxHighlight.setup.php
index 4910e23..d66d1f8 100644
--- a/CSyntaxHighlight/CSyntaxHighlight.setup.php
+++ b/CSyntaxHighlight/CSyntaxHighlight.setup.php
@@ -2,4 +2,6 @@
 
 BsExtensionManager::registerExtension('CSyntaxHighlight', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
 
+$wgMessagesDirs['CSyntaxHighlight'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['CSyntaxHighlight'] = __DIR__ . 
'/languages/CSyntaxHighlight.i18n.php';
\ No newline at end of file
diff --git a/CSyntaxHighlight/i18n/de.json b/CSyntaxHighlight/i18n/de.json
new file mode 100644
index 000..c010704
--- /dev/null
+++ b/CSyntaxHighlight/i18n/de.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-csyntaxhighlight-desc: Fügt eine konfigurierbare 
Syntaxhighlight-Funktionalität hinzu,
+   prefs-csyntaxhighlight: Syntax Highlighter,
+   bs-csyntaxhighlight-pref-theme: Theme:,
+   bs-csyntaxhighlight-pref-gutter: Zeige Zeilennummern,
+   bs-csyntaxhighlight-pref-autolinks: URLs verlinken,
+   bs-csyntaxhighlight-pref-toolbar: Werkzeugleiste einblenden
+}
diff --git a/CSyntaxHighlight/i18n/en.json b/CSyntaxHighlight/i18n/en.json
new file mode 100644
index 000..d56a634
--- /dev/null
+++ b/CSyntaxHighlight/i18n/en.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-csyntaxhighlight-desc: Adds customizable syntax highlighting 
functionality,
+   prefs-csyntaxhighlight: Syntax highlighter,
+   bs-csyntaxhighlight-pref-theme: Theme:,
+   bs-csyntaxhighlight-pref-gutter: Show line numbers,
+   bs-csyntaxhighlight-pref-autolinks: Link URLs,
+   bs-csyntaxhighlight-pref-toolbar: Show toolbar
+}
diff --git a/CSyntaxHighlight/i18n/qqq.json b/CSyntaxHighlight/i18n/qqq.json
new file mode

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-17 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

First step https://gerrit.wikimedia.org/r/#/c/146803/

Change-Id: If7787eaa8ab4615e2ea1a47a89fcc6a9d8fe158a
---
M GroupManager/i18n/de.json
M GroupManager/i18n/en.json
M GroupManager/i18n/qqq.json
3 files changed, 24 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/55/147055/1

diff --git a/GroupManager/i18n/de.json b/GroupManager/i18n/de.json
index 6d370e3..39a25c4 100644
--- a/GroupManager/i18n/de.json
+++ b/GroupManager/i18n/de.json
@@ -6,14 +6,13 @@
},
bs-groupmanager-desc: Administrationsoberfläche zur Konfiguration 
von Gruppen,
bs-groupmanager-grpexists: Die Gruppe ist bereits vorhanden.,
-   bs-groupmanager-grp_not_exists: Die Gruppe existiert nicht.,
bs-groupmanager-grpadded: Die Gruppe wurde hinzugefügt.,
bs-groupmanager-grpedited: Die Gruppe wurde bearbeitet.,
bs-groupmanager-grpremoved: Die Gruppe wurde gelöscht.,
bs-groupmanager-label: Gruppenverwaltung,
bs-groupmanager-invalid-name: Der Gruppenname enthält nicht erlaubte 
Zeichen: $1,
bs-groupmanager-invalid-name-length: Der Gruppenname darf nicht 
länger als 16 Zeichen lang sein.,
-   bs-groupmanager-invalid-name-numeric: Der Gruppenname darf nicht zur 
aus Zahlen bestehen.,
+   bs-groupmanager-invalid-name-numeric: Der Gruppenname muss 
minderstens einen Buchstaben beinhalten.,
bs-groupmanager-headergroup: Gruppen,
bs-groupmanager-tipremove: {{PLURAL:$1|Gruppe|Gruppen}} löschen,
bs-groupmanager-titlenewgroup: Gruppe hinzufügen,
diff --git a/GroupManager/i18n/en.json b/GroupManager/i18n/en.json
index 4d79b09..c7ad0c5 100644
--- a/GroupManager/i18n/en.json
+++ b/GroupManager/i18n/en.json
@@ -6,15 +6,14 @@
},
bs-groupmanager-desc: Administration interface for managing groups,
bs-groupmanager-grpexists: The group already exists.,
-   bs-groupmanager-grp_not_exists: The group does not exist.,
bs-groupmanager-grpadded: The group has been added.,
bs-groupmanager-grpedited: The group has been edited.,
bs-groupmanager-grpremoved: The group has been removed.,
bs-groupmanager-label: Group manager,
-   bs-groupmanager-invalid-name: The group name contains chars that are 
not allowed: $1,
+   bs-groupmanager-invalid-name: The group name contains characters 
that are not allowed: $1,
bs-groupmanager-invalid-name-length: The group name cannot be longer 
than 16 characters.,
-   bs-groupmanager-invalid-name-numeric: The group name cannot contain 
only numbers.,
-   bs-groupmanager-headergroup: Groups,
+   bs-groupmanager-invalid-name-numeric: The group name needs to have 
at least one character.,
+   bs-groupmanager-headergroup: Group,
bs-groupmanager-tipremove: Remove {{PLURAL:$1|group|groups}},
bs-groupmanager-titlenewgroup: New group,
bs-groupmanager-titleeditgroup: Edit group,
diff --git a/GroupManager/i18n/qqq.json b/GroupManager/i18n/qqq.json
index 38eaa1b..6de682d 100644
--- a/GroupManager/i18n/qqq.json
+++ b/GroupManager/i18n/qqq.json
@@ -4,7 +4,24 @@
Stephan Muggli mug...@hallowelt.biz
]
},
-   bs-groupmanager-removegroup-message-success: Success message after 
deleting a group or a pair of groups.,
-   bs-groupmanager-removegroup-message-failure: Failure message after 
deleting a group or a pair of groups.,
-   bs-groupmanager-removegroup-message-unknown: An unexpected error 
occurred while trying to delete a group.
+   bs-groupmanager-desc: Used in 
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}} 
Special:WikiAdmin?mode=ExtensionInfo], description of group manager extension,
+   bs-groupmanager-grpexists: Error message that the group you want to 
create already exists.,
+   bs-groupmanager-grpadded: Success message that the group has been 
added.,
+   bs-groupmanager-grpedited: Success message that the group has been 
edited.,
+   bs-groupmanager-grpremoved: Success message that the group has been 
removed.,
+   bs-groupmanager-label: Used in sidebar, anchor text for group 
manager\n{{Identical|Group manager}},
+   bs-groupmanager-invalid-name: Error message that the group name 
contains characters that are not allowed\n*$1 are the invalid characters,
+   bs-groupmanager-invalid-name-length: Error message that the group 
name cannot be longer than 16 characters.,
+   bs-groupmanager-invalid-name-numeric: Error message that the group 
name needs to have at least one character.,
+   bs-groupmanager-headergroup: Column headline for 
group\n{{Identical|Group}},
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-17 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved php i18n file into languages folder
Moved to Json i18n files

Change-Id: I51a1f429ca4b518cbcad4ac732baeb9871cd5d7b
---
M RSSStandards/RSSStandards.class.php
D RSSStandards/RSSStandards.i18n.php
M RSSStandards/RSSStandards.setup.php
A RSSStandards/i18n/de.json
A RSSStandards/i18n/en.json
A RSSStandards/i18n/qqq.json
A RSSStandards/languages/RSSStandards.i18n.php
7 files changed, 127 insertions(+), 96 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/71/147071/1

diff --git a/RSSStandards/RSSStandards.class.php 
b/RSSStandards/RSSStandards.class.php
index fb4c49d..3f18303 100644
--- a/RSSStandards/RSSStandards.class.php
+++ b/RSSStandards/RSSStandards.class.php
@@ -76,7 +76,7 @@
public function onBSRSSFeederGetRegisteredFeeds( $aFeeds ) {
RSSFeeder::registerFeed('recentchanges',
wfMessage( 'bs-rssfeeder-recent-changes' )-plain(),
-   wfMessage( 'bs-rssstandards-description_rc' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-rc' )-plain(),
$this,
NULL,
NULL,
@@ -84,8 +84,8 @@
);
 
RSSFeeder::registerFeed('followOwn',
-   wfMessage( 'bs-rssstandards-title_own' )-plain(),
-   wfMessage( 'bs-rssstandards-description_own' )-plain(),
+   wfMessage( 'bs-rssstandards-title-own' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-own' )-plain(),
$this,
'buildRssOwn',
array('u'),
@@ -93,8 +93,8 @@
);
 
RSSFeeder::registerFeed('followPage',
-   wfMessage( 'bs-rssstandards-title_page' )-plain(),
-   wfMessage( 'bs-rssstandards-description_page' 
)-plain(),
+   wfMessage( 'bs-rssstandards-title-page' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-page' )-plain(),
$this,
'buildRssPage',
array('p', 'ns'),
@@ -102,8 +102,8 @@
);
 
RSSFeeder::registerFeed('namespace',
-   wfMessage( 'bs-rssstandards-title_ns' )-plain(),
-   wfMessage( 'bs-rssstandards-description_ns' )-plain(),
+   wfMessage( 'bs-ns' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-ns' )-plain(),
$this,
'buildRssNs',
array('ns'),
@@ -111,8 +111,8 @@
);
 
RSSFeeder::registerFeed( 'category',
-   wfMessage( 'bs-rssstandards-title_cat' )-plain(),
-   wfMessage( 'bs-rssstandards-description_cat' )-plain(),
+   wfMessage( 'bs-rssstandards-title-cat' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-cat' )-plain(),
$this,
'buildRssCat',
array('cat'),
@@ -120,8 +120,8 @@
);
 
RSSFeeder::registerFeed('watchlist',
-   wfMessage( 'bs-rssstandards-title_watch' )-plain(),
-   wfMessage( 'bs-rssstandards-description_watch' 
)-plain(),
+   wfMessage( 'bs-rssstandards-title-watch' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-watch' )-plain(),
$this,
'buildRssWatch',
array('days'),
@@ -159,11 +159,11 @@
)
);
 
-   $oChannel = RSSCreator::createChannel(RSSCreator::xmlEncode( 
$wgSitename . ' - ' . $sPageName), 
'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], wfMessage( 
'bs-rssstandards-description_page' )-plain() );
+   $oChannel = RSSCreator::createChannel(RSSCreator::xmlEncode( 
$wgSitename . ' - ' . $sPageName), 
'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], wfMessage( 
'bs-rssstandards-desc-page' )-plain() );
while( $row = $res-fetchObject() ) {
$title = Title::makeTitle( $row-rc_namespace, 
$row-rc_title );
$entry = RSSItemCreator::createItem(
-   wfMessage( 'bs-rssstandards-changes_from' 
)-plain().$row-rc_user_text,
+   wfMessage( 'bs-rssstandards-changes-from', 
$row-rc_user_text )-plain(),
$title-getFullURL( 'diff=' . 
$row-rc_this_oldid . 'oldid=prev' ),

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-17 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

First step https://gerrit.wikimedia.org/r/#/c/146803/
Added PLURAL support to a message in all languages
Using suggest numParams

Change-Id: If7787eaa8ab4615e2ea1a47a89fcc6a9d8fe158a
---
M GroupManager/GroupManager.class.php
M GroupManager/i18n/de.json
M GroupManager/i18n/en.json
M GroupManager/i18n/qqq.json
4 files changed, 29 insertions(+), 11 deletions(-)

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



diff --git a/GroupManager/GroupManager.class.php 
b/GroupManager/GroupManager.class.php
index 46ba9f7..82a4cd7 100644
--- a/GroupManager/GroupManager.class.php
+++ b/GroupManager/GroupManager.class.php
@@ -298,7 +298,10 @@
if ( !empty( $aInvalidChars ) ) {
return array(
'success' = false,
-   'message' = wfMessage( 
'bs-groupmanager-invalid-name', implode( ',', $aInvalidChars ) )-plain()
+   'message' = wfMessage( 
'bs-groupmanager-invalid-name' )
+   -numParams( count( 
$aInvalidChars ) )
+   -params( implode( ',', 
$aInvalidChars ) )
+   -text()
);
} elseif ( preg_match( /^[0-9]+$/, $sGroup ) ) {
return array(
diff --git a/GroupManager/i18n/de.json b/GroupManager/i18n/de.json
index 6d370e3..09d32f5 100644
--- a/GroupManager/i18n/de.json
+++ b/GroupManager/i18n/de.json
@@ -6,14 +6,13 @@
},
bs-groupmanager-desc: Administrationsoberfläche zur Konfiguration 
von Gruppen,
bs-groupmanager-grpexists: Die Gruppe ist bereits vorhanden.,
-   bs-groupmanager-grp_not_exists: Die Gruppe existiert nicht.,
bs-groupmanager-grpadded: Die Gruppe wurde hinzugefügt.,
bs-groupmanager-grpedited: Die Gruppe wurde bearbeitet.,
bs-groupmanager-grpremoved: Die Gruppe wurde gelöscht.,
bs-groupmanager-label: Gruppenverwaltung,
-   bs-groupmanager-invalid-name: Der Gruppenname enthält nicht erlaubte 
Zeichen: $1,
+   bs-groupmanager-invalid-name: Der Gruppenname enthält 
{{PLURAL:$1|ein|}} nicht erlaubte{{PLURAL:$1|s|}} Zeichen: $2,
bs-groupmanager-invalid-name-length: Der Gruppenname darf nicht 
länger als 16 Zeichen lang sein.,
-   bs-groupmanager-invalid-name-numeric: Der Gruppenname darf nicht zur 
aus Zahlen bestehen.,
+   bs-groupmanager-invalid-name-numeric: Der Gruppenname muss 
minderstens einen Buchstaben beinhalten.,
bs-groupmanager-headergroup: Gruppen,
bs-groupmanager-tipremove: {{PLURAL:$1|Gruppe|Gruppen}} löschen,
bs-groupmanager-titlenewgroup: Gruppe hinzufügen,
diff --git a/GroupManager/i18n/en.json b/GroupManager/i18n/en.json
index 4d79b09..c3554ba 100644
--- a/GroupManager/i18n/en.json
+++ b/GroupManager/i18n/en.json
@@ -6,15 +6,14 @@
},
bs-groupmanager-desc: Administration interface for managing groups,
bs-groupmanager-grpexists: The group already exists.,
-   bs-groupmanager-grp_not_exists: The group does not exist.,
bs-groupmanager-grpadded: The group has been added.,
bs-groupmanager-grpedited: The group has been edited.,
bs-groupmanager-grpremoved: The group has been removed.,
bs-groupmanager-label: Group manager,
-   bs-groupmanager-invalid-name: The group name contains chars that are 
not allowed: $1,
+   bs-groupmanager-invalid-name: The group name contains 
{{PLURAL:$1|an|}} invalid {{PLURAL:$1|character|characters}}: $2,
bs-groupmanager-invalid-name-length: The group name cannot be longer 
than 16 characters.,
-   bs-groupmanager-invalid-name-numeric: The group name cannot contain 
only numbers.,
-   bs-groupmanager-headergroup: Groups,
+   bs-groupmanager-invalid-name-numeric: The group name needs to have 
at least one character.,
+   bs-groupmanager-headergroup: Group,
bs-groupmanager-tipremove: Remove {{PLURAL:$1|group|groups}},
bs-groupmanager-titlenewgroup: New group,
bs-groupmanager-titleeditgroup: Edit group,
diff --git a/GroupManager/i18n/qqq.json b/GroupManager/i18n/qqq.json
index 38eaa1b..01acc39 100644
--- a/GroupManager/i18n/qqq.json
+++ b/GroupManager/i18n/qqq.json
@@ -4,7 +4,24 @@
Stephan Muggli mug...@hallowelt.biz
]
},
-   bs-groupmanager-removegroup-message-success: Success message after 
deleting a group or a pair of groups.,
-   bs-groupmanager-removegroup-message-failure: Failure message after 
deleting a group or a pair of groups.,
-

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-17 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved php i18n file into languages folder
Moved to Json i18n files
Changed message and added GENDER support
Improved some messages

Change-Id: I51a1f429ca4b518cbcad4ac732baeb9871cd5d7b
---
M RSSStandards/RSSStandards.class.php
D RSSStandards/RSSStandards.i18n.php
M RSSStandards/RSSStandards.setup.php
A RSSStandards/i18n/de.json
A RSSStandards/i18n/en.json
A RSSStandards/i18n/qqq.json
A RSSStandards/languages/RSSStandards.i18n.php
7 files changed, 127 insertions(+), 96 deletions(-)

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



diff --git a/RSSStandards/RSSStandards.class.php 
b/RSSStandards/RSSStandards.class.php
index fb4c49d..b7a889d 100644
--- a/RSSStandards/RSSStandards.class.php
+++ b/RSSStandards/RSSStandards.class.php
@@ -76,7 +76,7 @@
public function onBSRSSFeederGetRegisteredFeeds( $aFeeds ) {
RSSFeeder::registerFeed('recentchanges',
wfMessage( 'bs-rssfeeder-recent-changes' )-plain(),
-   wfMessage( 'bs-rssstandards-description_rc' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-rc' )-plain(),
$this,
NULL,
NULL,
@@ -84,8 +84,8 @@
);
 
RSSFeeder::registerFeed('followOwn',
-   wfMessage( 'bs-rssstandards-title_own' )-plain(),
-   wfMessage( 'bs-rssstandards-description_own' )-plain(),
+   wfMessage( 'bs-rssstandards-title-own' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-own' )-plain(),
$this,
'buildRssOwn',
array('u'),
@@ -93,8 +93,8 @@
);
 
RSSFeeder::registerFeed('followPage',
-   wfMessage( 'bs-rssstandards-title_page' )-plain(),
-   wfMessage( 'bs-rssstandards-description_page' 
)-plain(),
+   wfMessage( 'bs-rssstandards-title-page' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-page' )-plain(),
$this,
'buildRssPage',
array('p', 'ns'),
@@ -102,8 +102,8 @@
);
 
RSSFeeder::registerFeed('namespace',
-   wfMessage( 'bs-rssstandards-title_ns' )-plain(),
-   wfMessage( 'bs-rssstandards-description_ns' )-plain(),
+   wfMessage( 'bs-ns' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-ns' )-plain(),
$this,
'buildRssNs',
array('ns'),
@@ -111,8 +111,8 @@
);
 
RSSFeeder::registerFeed( 'category',
-   wfMessage( 'bs-rssstandards-title_cat' )-plain(),
-   wfMessage( 'bs-rssstandards-description_cat' )-plain(),
+   wfMessage( 'bs-rssstandards-title-cat' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-cat' )-plain(),
$this,
'buildRssCat',
array('cat'),
@@ -120,8 +120,8 @@
);
 
RSSFeeder::registerFeed('watchlist',
-   wfMessage( 'bs-rssstandards-title_watch' )-plain(),
-   wfMessage( 'bs-rssstandards-description_watch' 
)-plain(),
+   wfMessage( 'bs-rssstandards-title-watch' )-plain(),
+   wfMessage( 'bs-rssstandards-desc-watch' )-plain(),
$this,
'buildRssWatch',
array('days'),
@@ -159,11 +159,11 @@
)
);
 
-   $oChannel = RSSCreator::createChannel(RSSCreator::xmlEncode( 
$wgSitename . ' - ' . $sPageName), 
'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], wfMessage( 
'bs-rssstandards-description_page' )-plain() );
+   $oChannel = RSSCreator::createChannel(RSSCreator::xmlEncode( 
$wgSitename . ' - ' . $sPageName), 
'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], wfMessage( 
'bs-rssstandards-desc-page' )-plain() );
while( $row = $res-fetchObject() ) {
$title = Title::makeTitle( $row-rc_namespace, 
$row-rc_title );
$entry = RSSItemCreator::createItem(
-   wfMessage( 'bs-rssstandards-changes_from' 
)-plain().$row-rc_user_text,
+   wfMessage( 'bs-rssstandards-changes-from', 
$row-rc_user_text )-text(),
$title-getFullURL( 'diff=' .

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-17 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved php i18n files into languages folder
Moved to Json i18n files
Fixed Typo

Change-Id: Id8a5ebd928b96f66199ecb992b4a2ff4debac2df
---
D NamespaceCss/NamespaceCss.i18n.php
M NamespaceCss/NamespaceCss.setup.php
A NamespaceCss/i18n/de.json
A NamespaceCss/i18n/en.json
A NamespaceCss/i18n/qqq.json
A NamespaceCss/languages/NamespaceCss.i18n.php
6 files changed, 63 insertions(+), 34 deletions(-)

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



diff --git a/NamespaceCss/NamespaceCss.i18n.php 
b/NamespaceCss/NamespaceCss.i18n.php
deleted file mode 100644
index 2fc15b0..000
--- a/NamespaceCss/NamespaceCss.i18n.php
+++ /dev/null
@@ -1,32 +0,0 @@
-?php
-/**
- * Internationalisation file for PagesVisited
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage PagesVisited
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['en'] = array(
-   'bs-namespacecss-extension-description' = 'NameSpace SkinSwitch.',
-   'prefs-NamespaceCss'= 'NameSpace SkinSwitch',
-   'bs-namespacecss-pref-Use_NSC'  = 'Use NameSpace SkinSwitch?',
-);
-
-$messages['de'] = array(
-   'bs-namespacecss-extension-description' = 'Namensraum Skinweiche.',
-   'prefs-NamespaceCss'= 'Namensraum Skinweiche',
-   'bs-namespacecss-pref-Use_NSC'  = 'Namensraum Skinweiche 
aktivieren?',
-);
-
-$messages['de-formal'] = array();
-
-$messages['qqq'] = array();
\ No newline at end of file
diff --git a/NamespaceCss/NamespaceCss.setup.php 
b/NamespaceCss/NamespaceCss.setup.php
index 1568e89..6c8c9e6 100644
--- a/NamespaceCss/NamespaceCss.setup.php
+++ b/NamespaceCss/NamespaceCss.setup.php
@@ -1,5 +1,7 @@
 ?php
 
-BsExtensionManager::registerExtension('NamespaceCss', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'NamespaceCss', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
 
-$wgExtensionMessagesFiles['NamespaceCss'] = __DIR__ . '/NamespaceCss.i18n.php';
\ No newline at end of file
+$wgMessagesDirs['NamespaceCss'] = __DIR__ . '/i18n';
+
+$wgExtensionMessagesFiles['NamespaceCss'] = __DIR__ . 
'/languages/NamespaceCss.i18n.php';
\ No newline at end of file
diff --git a/NamespaceCss/i18n/de.json b/NamespaceCss/i18n/de.json
new file mode 100644
index 000..b05818d
--- /dev/null
+++ b/NamespaceCss/i18n/de.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-namespacecss-desc: Namensraum spezifisches Aussehen
+}
diff --git a/NamespaceCss/i18n/en.json b/NamespaceCss/i18n/en.json
new file mode 100644
index 000..c16e218
--- /dev/null
+++ b/NamespaceCss/i18n/en.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-namespacecss-desc: Namespace specific styling
+}
diff --git a/NamespaceCss/i18n/qqq.json b/NamespaceCss/i18n/qqq.json
new file mode 100644
index 000..4bc18df
--- /dev/null
+++ b/NamespaceCss/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-namespacecss-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of namespace css 
extension
+}
diff --git a/NamespaceCss/languages/NamespaceCss.i18n.php 
b/NamespaceCss/languages/NamespaceCss.i18n.php
new file mode 100644
index 000..61f480f
--- /dev/null
+++ b/NamespaceCss/languages/NamespaceCss.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( 'wfJsonI18nShim7d1g51281835fe92a' ) ) {
+   function wfJsonI18nShim7d1g51281835fe92a( $cache, $code, $cachedData ) 
{
+   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
+   foreach

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-15 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved php i18n files into languages folder
Moved to Json i18n files

Change-Id: Id8a5ebd928b96f66199ecb992b4a2ff4debac2df
---
D NamespaceCss/NamespaceCss.i18n.php
M NamespaceCss/NamespaceCss.setup.php
A NamespaceCss/i18n/de.json
A NamespaceCss/i18n/en.json
A NamespaceCss/i18n/qqq.json
A NamespaceCss/languages/NamespaceCss.i18n.php
6 files changed, 63 insertions(+), 34 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/13/146413/1

diff --git a/NamespaceCss/NamespaceCss.i18n.php 
b/NamespaceCss/NamespaceCss.i18n.php
deleted file mode 100644
index 2fc15b0..000
--- a/NamespaceCss/NamespaceCss.i18n.php
+++ /dev/null
@@ -1,32 +0,0 @@
-?php
-/**
- * Internationalisation file for PagesVisited
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage PagesVisited
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['en'] = array(
-   'bs-namespacecss-extension-description' = 'NameSpace SkinSwitch.',
-   'prefs-NamespaceCss'= 'NameSpace SkinSwitch',
-   'bs-namespacecss-pref-Use_NSC'  = 'Use NameSpace SkinSwitch?',
-);
-
-$messages['de'] = array(
-   'bs-namespacecss-extension-description' = 'Namensraum Skinweiche.',
-   'prefs-NamespaceCss'= 'Namensraum Skinweiche',
-   'bs-namespacecss-pref-Use_NSC'  = 'Namensraum Skinweiche 
aktivieren?',
-);
-
-$messages['de-formal'] = array();
-
-$messages['qqq'] = array();
\ No newline at end of file
diff --git a/NamespaceCss/NamespaceCss.setup.php 
b/NamespaceCss/NamespaceCss.setup.php
index 1568e89..6c8c9e6 100644
--- a/NamespaceCss/NamespaceCss.setup.php
+++ b/NamespaceCss/NamespaceCss.setup.php
@@ -1,5 +1,7 @@
 ?php
 
-BsExtensionManager::registerExtension('NamespaceCss', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'NamespaceCss', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
 
-$wgExtensionMessagesFiles['NamespaceCss'] = __DIR__ . '/NamespaceCss.i18n.php';
\ No newline at end of file
+$wgMessagesDirs['NamespaceCss'] = __DIR__ . '/i18n';
+
+$wgExtensionMessagesFiles['NamespaceCss'] = __DIR__ . 
'/languages/NamespaceCss.i18n.php';
\ No newline at end of file
diff --git a/NamespaceCss/i18n/de.json b/NamespaceCss/i18n/de.json
new file mode 100644
index 000..b05818d
--- /dev/null
+++ b/NamespaceCss/i18n/de.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-namespacecss-desc: Namensraum spezifisches Aussehen
+}
diff --git a/NamespaceCss/i18n/en.json b/NamespaceCss/i18n/en.json
new file mode 100644
index 000..89a3c36
--- /dev/null
+++ b/NamespaceCss/i18n/en.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-namespacecss-desc: Namespcae specific styling
+}
diff --git a/NamespaceCss/i18n/qqq.json b/NamespaceCss/i18n/qqq.json
new file mode 100644
index 000..4bc18df
--- /dev/null
+++ b/NamespaceCss/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-namespacecss-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of namespace css 
extension
+}
diff --git a/NamespaceCss/languages/NamespaceCss.i18n.php 
b/NamespaceCss/languages/NamespaceCss.i18n.php
new file mode 100644
index 000..61f480f
--- /dev/null
+++ b/NamespaceCss/languages/NamespaceCss.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( 'wfJsonI18nShim7d1g51281835fe92a' ) ) {
+   function wfJsonI18nShim7d1g51281835fe92a( $cache, $code, $cachedData ) 
{
+   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-15 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved php i18n file to languages folder
Moved to Json i18n files

Change-Id: Ia3d4fa898721eac7b9d8752019884fdf30748aa7
---
M NamespaceManager/NamespaceManager.class.php
M NamespaceManager/NamespaceManager.setup.php
A NamespaceManager/includes/NamespaceNuker.php
A NamespaceManager/languages/NamespaceManager.i18n.php
M NamespaceManager/resources/BS.NamespaceManager/NamespaceDialog.js
M NamespaceManager/resources/BS.NamespaceManager/NamespaceRemoveDialog.js
M NamespaceManager/resources/BS.NamespaceManager/Panel.js
7 files changed, 380 insertions(+), 53 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/28/146428/1

diff --git a/NamespaceManager/NamespaceManager.class.php 
b/NamespaceManager/NamespaceManager.class.php
index c2261c8..d20a0ab 100644
--- a/NamespaceManager/NamespaceManager.class.php
+++ b/NamespaceManager/NamespaceManager.class.php
@@ -401,13 +401,13 @@
if ( strlen( $sNamespace )  2 ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-namespace_name_length' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-ns-length' )-plain()
) );
// TODO MRG (06.11.13 11:17): Unicodefähigkeit?
} else if ( !preg_match( 
'%^[a-zA-Z_\\x80-\\xFF][a-zA-Z0-9_\\x80-\\xFF]{1,99}$%i', $sNamespace ) ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-wrong_namespace_name_format' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-wrong-name' )-plain()
) );
} else {
$aUserNamespaces[$iNS] = array( 'name' = 
$sNamespace );
@@ -432,7 +432,7 @@
// Zweig hier weglassen.
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-namespace_already_exists' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-ns-exists' )-plain()
) );
}
}
@@ -460,19 +460,19 @@
if ( $iNS !== NS_MAIN  !$iNS ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-no_valid_namespace_id' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-invalid-id' )-plain()
) );
}
if ( strlen( $sNamespace )  2 ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-namespace_name_length' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-ns-length' )-plain()
) );
}
if ( $iNS !== NS_MAIN  $iNS !== NS_PROJECT  $iNS !== 
NS_PROJECT_TALK  !preg_match( 
'%^[a-zA-Z_\\x80-\\xFF][a-zA-Z0-9_\\x80-\\xFF]{1,99}$%', $sNamespace ) ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-wrong_namespace_name_format' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-wrong-name' )-plain()
) );
}
 
@@ -518,7 +518,7 @@
if ( !$iNS ) {
return FormatJson::encode( array(
'success' = false,
-   'message' = wfMessage( 
'bs-namespacemanager-no_valid_namespace_id' )-plain()
+   'message' = wfMessage( 
'bs-namespacemanager-invalid-id' )-plain()
) );
}
 
diff --git a/NamespaceManager/NamespaceManager.setup.php 
b/NamespaceManager/NamespaceManager.setup.php
index 15a394f..7bec4b2 100644
--- a/NamespaceManager/NamespaceManager.setup.php
+++ b/NamespaceManager/NamespaceManager.setup.php
@@ -1,55 +1,34 @@
 ?php
 
-BsExtensionManager::registerExtension('NamespaceManager',

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-14 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files
Removed duplicate message

Change-Id: I5fe67695e2791b7fde8353d7de48256d93e07033
---
M Checklist/Checklist.class.php
M Checklist/Checklist.setup.php
A Checklist/i18n/de.json
A Checklist/i18n/en.json
A Checklist/i18n/qqq.json
M Checklist/languages/Checklist.i18n.php
M Checklist/resources/bluespice.checklist.js
7 files changed, 117 insertions(+), 86 deletions(-)

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



diff --git a/Checklist/Checklist.class.php b/Checklist/Checklist.class.php
index 86029bc..da50946 100644
--- a/Checklist/Checklist.class.php
+++ b/Checklist/Checklist.class.php
@@ -44,7 +44,7 @@
 
public $iCheckboxCounter = 0;
public $bCheckboxFound = false;
-   
+
public function __construct() {
wfProfileIn( 'BS::'.__METHOD__ );
 
@@ -88,7 +88,7 @@
 
$iIndexStandard = array_search( 
'unlink',$aConfigStandard[toolbar1] );
array_splice( $aConfigStandard[toolbar1], $iIndexStandard + 
1, 0, bscheckbox );
-   
+
// Add context menu entry
$aConfigStandard[contextmenu] = 
str_replace('bsContextMenuMarker', 'bsContextMenuMarker bsChecklist', 
$aConfigStandard[contextmenu] );
return true;
@@ -106,7 +106,7 @@
$oWikiPage = WikiPage::newFromID( $sArticleId );
$oContent = $oWikiPage-getContent();
$sContent = $oContent-getNativeData();
-   
+
// Maybe a sanity-check is just enough here
$sNewValue = 'value=';
if ($sValue == 'true' )
@@ -117,11 +117,11 @@
$sNewValue .= $sValue;
#$sNewValue .= $iPos;
$sNewValue .= ' ';
-   
+
$sContent = self::preg_replace_nth( /(bs:checklist 
)([^]*?)/, $1.$sNewValue.$2, $sContent, $iPos );
-   
+
#return $sContent;
-   
+
$sSummary = Modified Check;
$oContentHandler = $oContent-getContentHandler();
$oNewContent = $oContentHandler-makeContent($sContent, 
$oWikiPage-getTitle());
@@ -129,7 +129,7 @@
 
return 'true';
}
-   
+
public static function getOptionsList() {
$oRequest = RequestContext::getMain()-getRequest();
$sList = $oRequest-getVal( 'listId', '' );
@@ -150,25 +150,25 @@
return reset($found);
}, $subject,$nth  );
}
-   
+
/**
 *
 * @param Parser $parser
-* @return boolean 
+* @return boolean
 */
public function onParserFirstCallInit( $parser ) {
$parser-setHook( 'bs:checklist', array( $this, 
'onMagicWordBsChecklist' ) );
return true;
}
-   
-   public function onBSExtendedEditBarBeforeEditToolbar( $aRows, 
$aButtonCfgs ) {
+
+   public function onBSExtendedEditBarBeforeEditToolbar( $aRows, 
$aButtonCfgs ) {

$this-getOutput()-addModuleStyles('ext.bluespice.checklist.styles');
$this-getOutput()-addModules('ext.bluespice.checklist');
-   
+
$aRows[0]['dialogs'][60] = 'bs-editbutton-checklist';
 
$aButtonCfgs['bs-editbutton-checklist'] = array(
-   'tip' = wfMessage( 'bs-checklist-menu_insert_checkbox' 
)-plain(),
+   'tip' = wfMessage( 'bs-checklist-menu-insert-checkbox' 
)-plain(),
'open' = 'bs:checklist /'
);
return true;
@@ -183,17 +183,23 @@
public function onBSInsertMagicAjaxGetData( $oResponse, $type ) {
if( $type != 'tags' ) return true;
 
+   $aMessage = array();
+   $aMessage[] = wfMessage( 'bs-checklist-tag-checklist-desc' 
)-plain().'br /';
+   $aMessage[] = wfMessage( 
'bs-checklist-tag-checklist-param-type' )-plain();
+   $aMessage[] = wfMessage( 
'bs-checklist-tag-checklist-param-list' )-plain();
+   $aMessage[] = wfMessage( 
'bs-checklist-tag-checklist-param-value' )-plain();
+
$oResponse-result[] = array(
'id' = 'bs:checklist',
'type' = 'tag',
'name' = 'checklist',
-   'desc' = wfMessage( 'bs-checklist-tag-checklist-desc' 
)-parse(),
+   'desc' = implode( 'br /', $aMessage ),
'code' = 'bs:checklist /',
);
 
return true;
}
-   
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-11 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I5fe67695e2791b7fde8353d7de48256d93e07033
---
M Checklist/Checklist.class.php
M Checklist/Checklist.setup.php
A Checklist/i18n/de.json
A Checklist/i18n/en.json
A Checklist/i18n/qqq.json
M Checklist/languages/Checklist.i18n.php
M Checklist/resources/bluespice.checklist.js
7 files changed, 117 insertions(+), 86 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/23/145523/1

diff --git a/Checklist/Checklist.class.php b/Checklist/Checklist.class.php
index 86029bc..da50946 100644
--- a/Checklist/Checklist.class.php
+++ b/Checklist/Checklist.class.php
@@ -44,7 +44,7 @@
 
public $iCheckboxCounter = 0;
public $bCheckboxFound = false;
-   
+
public function __construct() {
wfProfileIn( 'BS::'.__METHOD__ );
 
@@ -88,7 +88,7 @@
 
$iIndexStandard = array_search( 
'unlink',$aConfigStandard[toolbar1] );
array_splice( $aConfigStandard[toolbar1], $iIndexStandard + 
1, 0, bscheckbox );
-   
+
// Add context menu entry
$aConfigStandard[contextmenu] = 
str_replace('bsContextMenuMarker', 'bsContextMenuMarker bsChecklist', 
$aConfigStandard[contextmenu] );
return true;
@@ -106,7 +106,7 @@
$oWikiPage = WikiPage::newFromID( $sArticleId );
$oContent = $oWikiPage-getContent();
$sContent = $oContent-getNativeData();
-   
+
// Maybe a sanity-check is just enough here
$sNewValue = 'value=';
if ($sValue == 'true' )
@@ -117,11 +117,11 @@
$sNewValue .= $sValue;
#$sNewValue .= $iPos;
$sNewValue .= ' ';
-   
+
$sContent = self::preg_replace_nth( /(bs:checklist 
)([^]*?)/, $1.$sNewValue.$2, $sContent, $iPos );
-   
+
#return $sContent;
-   
+
$sSummary = Modified Check;
$oContentHandler = $oContent-getContentHandler();
$oNewContent = $oContentHandler-makeContent($sContent, 
$oWikiPage-getTitle());
@@ -129,7 +129,7 @@
 
return 'true';
}
-   
+
public static function getOptionsList() {
$oRequest = RequestContext::getMain()-getRequest();
$sList = $oRequest-getVal( 'listId', '' );
@@ -150,25 +150,25 @@
return reset($found);
}, $subject,$nth  );
}
-   
+
/**
 *
 * @param Parser $parser
-* @return boolean 
+* @return boolean
 */
public function onParserFirstCallInit( $parser ) {
$parser-setHook( 'bs:checklist', array( $this, 
'onMagicWordBsChecklist' ) );
return true;
}
-   
-   public function onBSExtendedEditBarBeforeEditToolbar( $aRows, 
$aButtonCfgs ) {
+
+   public function onBSExtendedEditBarBeforeEditToolbar( $aRows, 
$aButtonCfgs ) {

$this-getOutput()-addModuleStyles('ext.bluespice.checklist.styles');
$this-getOutput()-addModules('ext.bluespice.checklist');
-   
+
$aRows[0]['dialogs'][60] = 'bs-editbutton-checklist';
 
$aButtonCfgs['bs-editbutton-checklist'] = array(
-   'tip' = wfMessage( 'bs-checklist-menu_insert_checkbox' 
)-plain(),
+   'tip' = wfMessage( 'bs-checklist-menu-insert-checkbox' 
)-plain(),
'open' = 'bs:checklist /'
);
return true;
@@ -183,17 +183,23 @@
public function onBSInsertMagicAjaxGetData( $oResponse, $type ) {
if( $type != 'tags' ) return true;
 
+   $aMessage = array();
+   $aMessage[] = wfMessage( 'bs-checklist-tag-checklist-desc' 
)-plain().'br /';
+   $aMessage[] = wfMessage( 
'bs-checklist-tag-checklist-param-type' )-plain();
+   $aMessage[] = wfMessage( 
'bs-checklist-tag-checklist-param-list' )-plain();
+   $aMessage[] = wfMessage( 
'bs-checklist-tag-checklist-param-value' )-plain();
+
$oResponse-result[] = array(
'id' = 'bs:checklist',
'type' = 'tag',
'name' = 'checklist',
-   'desc' = wfMessage( 'bs-checklist-tag-checklist-desc' 
)-parse(),
+   'desc' = implode( 'br /', $aMessage ),
'code' = 'bs:checklist /',
);
 
return true;
}
-   
+
public

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-10 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I460aefd3ed6e31d3357b3ac10f46c5a546211128
---
M UserManager/UserManager.class.php
M UserManager/UserManager.setup.php
A UserManager/i18n/de-formal.json
A UserManager/i18n/de.json
A UserManager/i18n/en.json
A UserManager/i18n/qqq.json
M UserManager/languages/UserManager.i18n.php
M UserManager/resources/BS.UserManager/Panel.js
M UserManager/resources/BS.UserManager/UserDialog.js
9 files changed, 190 insertions(+), 282 deletions(-)

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



diff --git a/UserManager/UserManager.class.php 
b/UserManager/UserManager.class.php
index 9fff604..66121e9 100644
--- a/UserManager/UserManager.class.php
+++ b/UserManager/UserManager.class.php
@@ -210,45 +210,45 @@
);
 
$sUsername = ucfirst( $sUsername );
-   if ( Sanitizer::validateEmail( $sUsername ) === false ) { 
//TODO: Check if User::isCreatableName() is a better validation
+   if ( User::isCreatableName( $sUsername ) === false ) {
$aResponse['errors'][] = array(
'id' = 'username',
-   'message' = wfMessage( 
'bs-usermanager-invalid_uname_gen' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-invalid-uname' )-plain()
);
}
 
-   if ( $sEmail != ''  User::isValidEmailAddr ( $sEmail ) === 
false ) {
+   if ( $sEmail != ''  Sanitizer::validateEmail( $sEmail ) === 
false ) {
$aResponse['errors'][] = array(
'id' = 'email',
-   'message' = wfMessage( 
'bs-usermanager-invalid_email_gen' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-invalid-email-gen' )-plain()
);
}
 
if ( $sPassword == '' ) {
$aResponse['errors'][] = array(
'id' = 'pass',
-   'message' = wfMessage( 
'bs-usermanager-enter_pwd' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-enter-pwd' )-plain()
);
}
 
if ( strpos( $sRealname, '\\' ) ) {
$aResponse['errors'][] = array(
'id' = 'realname',
-   'message' = wfMessage( 
'bs-usermanager-invalid_realname' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-invalid-realname' )-plain()
);
}
 
if ( $sPassword != $sRePassword ) {
$aResponse['errors'][] = array(
'id' = 'repass',
-   'message' = wfMessage( 
'bs-usermanager-pwd_nomatch' )-plain()
+   'message' = wfMessage( 'badretype' )-plain() 
// MW message
);
}
 
if ( strtolower( $sUsername ) == strtolower( $sPassword ) ) {
$aResponse['errors'][] = array(
'id' = 'pass',
-   'message' = wfMessage( 
'bs-usermanager-user_pwd_match' )-plain()
+   'message' = wfMessage( 'password-name-match' 
)-plain() // MW message
);
}
 
@@ -256,7 +256,7 @@
if ( $oNewUser == null ) { //Should not be neccessary as we 
check for username validity above
$aResponse['errors'][] = array(
'id' = 'username',
-   'message' = wfMessage( 
'bs-usermanager-invalid_uname' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-invalid-uname' )-plain()
);
}
 
@@ -264,7 +264,7 @@
if( $oNewUser-getId() != 0 ) {
$aResponse['errors'][] = array(
'id' = 'username',
-   'message' = wfMessage( 
'bs-usermanager-user_exists' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-user-exists' )-plain()
);
}
 
@@ -272,7 +272,7 @@
//TODO: $oNewUser-getPasswordValidity() 
returns a message key in case of error. Maybe we sould return this message.
$aResponse['errors'][] = array(

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-10 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I256df533e2c07b0c85a8a8e84ac2a0ae84bd1e48
---
M CSyntaxHighlight/CSyntaxHighlight.class.php
M CSyntaxHighlight/CSyntaxHighlight.setup.php
A CSyntaxHighlight/i18n/de.json
A CSyntaxHighlight/i18n/en.json
A CSyntaxHighlight/i18n/qqq.json
M CSyntaxHighlight/languages/CSyntaxHighlight.i18n.php
6 files changed, 72 insertions(+), 37 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/55/145255/1

diff --git a/CSyntaxHighlight/CSyntaxHighlight.class.php 
b/CSyntaxHighlight/CSyntaxHighlight.class.php
index 5ed5e80..f71f276 100644
--- a/CSyntaxHighlight/CSyntaxHighlight.class.php
+++ b/CSyntaxHighlight/CSyntaxHighlight.class.php
@@ -119,13 +119,10 @@
$this-setHook( 'SkinAfterBottomScripts' );
 
// TODO RBV (12.04.11 15:47): Provide all config possibilities 
of SyntaxHighlighter...
-   //User variables
-   BsConfig::registerVar( 'MW::CSyntaxHighlight::Theme', 
'Default', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-csyntaxhighlight-pref-Theme', 'select' );
-   BsConfig::registerVar( 'MW::CSyntaxHighlight::Gutter',true, 
 BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-Gutter', 'toggle' );
-   BsConfig::registerVar( 'MW::CSyntaxHighlight::AutoLinks', true, 
 BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-AutoLinks', 'toggle' );
-
-   //Admin variables
-   BsConfig::registerVar( 'MW::CSyntaxHighlight::Toolbar',   
false, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-Toolbar', 'toggle' );
+   BsConfig::registerVar( 'MW::CSyntaxHighlight::Theme', 
'Default', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-csyntaxhighlight-pref-theme', 'select' );
+   BsConfig::registerVar( 'MW::CSyntaxHighlight::Gutter',true, 
 BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-gutter', 'toggle' );
+   BsConfig::registerVar( 'MW::CSyntaxHighlight::AutoLinks', true, 
 BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-autolinks', 'toggle' );
+   BsConfig::registerVar( 'MW::CSyntaxHighlight::Toolbar',   
false, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-csyntaxhighlight-pref-toolbar', 'toggle' );
wfProfileOut( 'BS::'.__METHOD__ );
}
 
diff --git a/CSyntaxHighlight/CSyntaxHighlight.setup.php 
b/CSyntaxHighlight/CSyntaxHighlight.setup.php
index 4910e23..d66d1f8 100644
--- a/CSyntaxHighlight/CSyntaxHighlight.setup.php
+++ b/CSyntaxHighlight/CSyntaxHighlight.setup.php
@@ -2,4 +2,6 @@
 
 BsExtensionManager::registerExtension('CSyntaxHighlight', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
 
+$wgMessagesDirs['CSyntaxHighlight'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['CSyntaxHighlight'] = __DIR__ . 
'/languages/CSyntaxHighlight.i18n.php';
\ No newline at end of file
diff --git a/CSyntaxHighlight/i18n/de.json b/CSyntaxHighlight/i18n/de.json
new file mode 100644
index 000..c010704
--- /dev/null
+++ b/CSyntaxHighlight/i18n/de.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-csyntaxhighlight-desc: Fügt eine konfigurierbare 
Syntaxhighlight-Funktionalität hinzu,
+   prefs-csyntaxhighlight: Syntax Highlighter,
+   bs-csyntaxhighlight-pref-theme: Theme:,
+   bs-csyntaxhighlight-pref-gutter: Zeige Zeilennummern,
+   bs-csyntaxhighlight-pref-autolinks: URLs verlinken,
+   bs-csyntaxhighlight-pref-toolbar: Werkzeugleiste einblenden
+}
diff --git a/CSyntaxHighlight/i18n/en.json b/CSyntaxHighlight/i18n/en.json
new file mode 100644
index 000..d56a634
--- /dev/null
+++ b/CSyntaxHighlight/i18n/en.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-csyntaxhighlight-desc: Adds customizable syntax highlighting 
functionality,
+   prefs-csyntaxhighlight: Syntax highlighter,
+   bs-csyntaxhighlight-pref-theme: Theme:,
+   bs-csyntaxhighlight-pref-gutter: Show line numbers,
+   bs-csyntaxhighlight-pref-autolinks: Link URLs,
+   bs-csyntaxhighlight-pref-toolbar: Show toolbar
+}
diff --git a/CSyntaxHighlight/i18n/qqq.json b/CSyntaxHighlight/i18n/qqq.json
new

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-10 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I5b67b186d76e1fe906ca35760cbae52b0dfe
---
M Readers/Readers.setup.php
A Readers/i18n/de-formal.json
A Readers/i18n/de.json
A Readers/i18n/en.json
A Readers/i18n/qqq.json
M Readers/includes/specials/SpecialReaders.class.php
M Readers/languages/Readers.i18n.php
M Readers/resources/BS.Readers/Panel.js
M Readers/resources/BS.Readers/PathPanel.js
9 files changed, 110 insertions(+), 92 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/65/145265/1

diff --git a/Readers/Readers.setup.php b/Readers/Readers.setup.php
index 7b6caa1..ea91c7d 100644
--- a/Readers/Readers.setup.php
+++ b/Readers/Readers.setup.php
@@ -39,9 +39,9 @@
),
'position' = 'bottom',
'messages' = array(
-   'bs-readers-headerUsername',
-   'bs-readers-headerReadersPath',
-   'bs-readers-headerTs'
+   'bs-readers-headerusername',
+   'bs-readers-headerreaderspath',
+   'bs-readers-headerts'
)
 ) + $aResourceModuleTemplate;
 
@@ -54,8 +54,8 @@
),
'position' = 'bottom',
'messages' = array(
-   'bs-readers-headerUsername',
-   'bs-readers-headerReadersPath',
-   'bs-readers-headerTs'
+   'bs-readers-headerusername',
+   'bs-readers-headerreaderspath',
+   'bs-readers-headerts'
)
 ) + $aResourceModuleTemplate;
\ No newline at end of file
diff --git a/Readers/i18n/de-formal.json b/Readers/i18n/de-formal.json
new file mode 100644
index 000..9044d26
--- /dev/null
+++ b/Readers/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-readers-emptyinput: Sie müssen eine Seite angeben.
+}
diff --git a/Readers/i18n/de.json b/Readers/i18n/de.json
new file mode 100644
index 000..5125fbe
--- /dev/null
+++ b/Readers/i18n/de.json
@@ -0,0 +1,20 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-readers-desc: Zeigt die Besucher einer Seite an.,
+   prefs-readers: Besucher dieser Seite,
+   bs-readers-title: Besucher,
+   readers-user: Seiten besucht von: $1,
+   readers: Besucher der Seite: $1,
+   bs-readers-contentactions-label: Besucher anzeigen,
+   bs-readers-pagenotexists: Es wurde keine Seite übergeben.,
+   bs-readers-pref-active: Besucher dieser Seite aktivieren.,
+   bs-readers-pref-numofreaders: Anzahl der anzuzeigenden Besucher:,
+   bs-readers-emptyinput: Du musste einen Seite angeben.,
+   bs-readers-headerusername: Benutzername,
+   bs-readers-headerreaderspath: Leser,
+   bs-readers-headerts: Datum
+}
diff --git a/Readers/i18n/en.json b/Readers/i18n/en.json
new file mode 100644
index 000..690da69
--- /dev/null
+++ b/Readers/i18n/en.json
@@ -0,0 +1,20 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-readers-desc: Displays readers of a page and pages read by an 
user,
+   prefs-readers: Readers,
+   bs-readers-title: {{PLURAL:$1|Reader|Readers}},
+   readers-user: Pages {{GENDER:$1|read}} by: $1,
+   readers: Readers of page: $1,
+   bs-readers-contentactions-label: Display readers,
+   bs-readers-pagenotexists: Page does not exist.,
+   bs-readers-pref-active: Activate readers,
+   bs-readers-pref-numofreaders: Number of readers to display:,
+   bs-readers-emptyinput: No page has been provided.,
+   bs-readers-headerusername: Username,
+   bs-readers-headerreaderspath: Reader,
+   bs-readers-headerts: Date
+}
diff --git a/Readers/i18n/qqq.json b/Readers/i18n/qqq.json
new file mode 100644
index 000..fb8f759
--- /dev/null
+++ b/Readers/i18n/qqq.json
@@ -0,0 +1,20 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-readers-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]], 
description of readers extension.,
+   prefs-readers: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for readers section in preferences.\n{{Identical|Readers}},
+   bs-readers-title: Headline below content for readers, $1 is the 
number of readers for PLURAL distinction,
+   readers-user: Special page title for pages {{GENDER:$1|read}} by: 
$1\n $1 is the username - use for GENDER distinction,
+   readers: Special page title for readers of page: $1\n $1

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-10 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I92296b94beec4f131b876bcf1b7ac6e950318ef3
---
M Emoticons/Emoticons.class.php
M Emoticons/Emoticons.setup.php
A Emoticons/i18n/de.json
A Emoticons/i18n/en.json
A Emoticons/i18n/qqq.json
M Emoticons/languages/Emoticons.i18n.php
6 files changed, 82 insertions(+), 59 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/18/145318/1

diff --git a/Emoticons/Emoticons.class.php b/Emoticons/Emoticons.class.php
index f46ed9f..df9fa7d 100644
--- a/Emoticons/Emoticons.class.php
+++ b/Emoticons/Emoticons.class.php
@@ -96,8 +96,6 @@
wfProfileIn( 'BS::'.__METHOD__ );
$this-setHook( 'OutputPageBeforeHTML' );
$this-setHook( 'ArticleSave' );
-
-   BsConfig::registerVar( 'MW::Emoticons::PathToEmoticons', 
'/extensions/BlueSpiceExtensions/Emoticons/emoticons', 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING, 
'bs-emoticons-pref-PathToEmoticons' );
wfProfileOut( 'BS::'.__METHOD__ );
}
 
@@ -122,10 +120,27 @@
$aMapping = $wgMemc-get( $sKey );
 
if ( $aMapping == false ) {
-   $sPathToEmoticons = 
$wgScriptPath.BsConfig::get('MW::Emoticons::PathToEmoticons');
+   $sPathToEmoticons = $wgScriptPath . 
'/extensions/BlueSpiceExtensions/Emoticons/emoticons';
 
// Get the list of emoticons from the message system.
-   $sMappingContent = 
wfMessage('bs-emoticons-mapping')-plain();
+   $sMappingContent = smile.png   :-) :)
+   sad.png 
:-( :(
+   neutral.png 
:-| :|
+   angry.png   
:-@ :@
+   wink.png
;-) ;)
+   smile-big.png   
:D :-D
+   thinking.png
:-/ :/
+   shut-mouth.png  
:-X :X
+   crying.png  
:'(
+   shock.png   
:-O
+   confused.png
:-S
+   
glasses-cool.png8-)
+   laugh.png   
:lol:
+   yawn.png
(:|
+   good.png
:good:
+   bad.png 
:bad:
+   embarrassed.png 
:-[
+   shame.png   
[-X [-x;
if( empty( $sMappingContent ) ) return true; // If the 
content successfully loaded, do the replacement
 
$aMappingLines = explode( \n, $sMappingContent );
diff --git a/Emoticons/Emoticons.setup.php b/Emoticons/Emoticons.setup.php
index 0e3f61c..d4adb32 100644
--- a/Emoticons/Emoticons.setup.php
+++ b/Emoticons/Emoticons.setup.php
@@ -1,5 +1,7 @@
 ?php
 
-BsExtensionManager::registerExtension('Emoticons',   
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'Emoticons', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
+
+$wgMessagesDirs['Emoticons'] = __DIR__ . '/i18n';
 
 $wgExtensionMessagesFiles['Emoticons'] = __DIR__ . 
'/languages/Emoticons.i18n.php';
diff --git a/Emoticons/i18n/de.json b/Emoticons/i18n/de.json
new file mode 100644
index 000..7aaf705
--- /dev/null
+++ b/Emoticons/i18n/de.json
@@ -0,0 +1,11 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-emoticons-desc: Erzeugt Smiley-Bilder,
+   bs-emoticons-error-validation-missing-symbol: Fehler in Zeile $1: 
Dem Bild \$2\ ist kein Symbol zugeordnet.,
+   bs-emoticons-error-validation-imagename: Fehler in Zeile $1: Der 
Bildname \$2\ ist nicht zulässig.,
+   bs-emoticons-error-validation-symbol: Fehler in Zeile $1: Das Symbol 
\$2\ ist nicht zulässig. Es muss aus mindestens Zwei und maximal Zehn Zeichen 
bestehen
+}
diff --git

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-10 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I92296b94beec4f131b876bcf1b7ac6e950318ef3
---
M Emoticons/Emoticons.class.php
M Emoticons/Emoticons.setup.php
A Emoticons/i18n/de.json
A Emoticons/i18n/en.json
A Emoticons/i18n/qqq.json
M Emoticons/languages/Emoticons.i18n.php
6 files changed, 82 insertions(+), 59 deletions(-)

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



diff --git a/Emoticons/Emoticons.class.php b/Emoticons/Emoticons.class.php
index f46ed9f..df9fa7d 100644
--- a/Emoticons/Emoticons.class.php
+++ b/Emoticons/Emoticons.class.php
@@ -96,8 +96,6 @@
wfProfileIn( 'BS::'.__METHOD__ );
$this-setHook( 'OutputPageBeforeHTML' );
$this-setHook( 'ArticleSave' );
-
-   BsConfig::registerVar( 'MW::Emoticons::PathToEmoticons', 
'/extensions/BlueSpiceExtensions/Emoticons/emoticons', 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING, 
'bs-emoticons-pref-PathToEmoticons' );
wfProfileOut( 'BS::'.__METHOD__ );
}
 
@@ -122,10 +120,27 @@
$aMapping = $wgMemc-get( $sKey );
 
if ( $aMapping == false ) {
-   $sPathToEmoticons = 
$wgScriptPath.BsConfig::get('MW::Emoticons::PathToEmoticons');
+   $sPathToEmoticons = $wgScriptPath . 
'/extensions/BlueSpiceExtensions/Emoticons/emoticons';
 
// Get the list of emoticons from the message system.
-   $sMappingContent = 
wfMessage('bs-emoticons-mapping')-plain();
+   $sMappingContent = smile.png   :-) :)
+   sad.png 
:-( :(
+   neutral.png 
:-| :|
+   angry.png   
:-@ :@
+   wink.png
;-) ;)
+   smile-big.png   
:D :-D
+   thinking.png
:-/ :/
+   shut-mouth.png  
:-X :X
+   crying.png  
:'(
+   shock.png   
:-O
+   confused.png
:-S
+   
glasses-cool.png8-)
+   laugh.png   
:lol:
+   yawn.png
(:|
+   good.png
:good:
+   bad.png 
:bad:
+   embarrassed.png 
:-[
+   shame.png   
[-X [-x;
if( empty( $sMappingContent ) ) return true; // If the 
content successfully loaded, do the replacement
 
$aMappingLines = explode( \n, $sMappingContent );
diff --git a/Emoticons/Emoticons.setup.php b/Emoticons/Emoticons.setup.php
index 0e3f61c..d4adb32 100644
--- a/Emoticons/Emoticons.setup.php
+++ b/Emoticons/Emoticons.setup.php
@@ -1,5 +1,7 @@
 ?php
 
-BsExtensionManager::registerExtension('Emoticons',   
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'Emoticons', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
+
+$wgMessagesDirs['Emoticons'] = __DIR__ . '/i18n';
 
 $wgExtensionMessagesFiles['Emoticons'] = __DIR__ . 
'/languages/Emoticons.i18n.php';
diff --git a/Emoticons/i18n/de.json b/Emoticons/i18n/de.json
new file mode 100644
index 000..7aaf705
--- /dev/null
+++ b/Emoticons/i18n/de.json
@@ -0,0 +1,11 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-emoticons-desc: Erzeugt Smiley-Bilder,
+   bs-emoticons-error-validation-missing-symbol: Fehler in Zeile $1: 
Dem Bild \$2\ ist kein Symbol zugeordnet.,
+   bs-emoticons-error-validation-imagename: Fehler in Zeile $1: Der 
Bildname \$2\ ist nicht zulässig.,
+   bs-emoticons-error-validation-symbol: Fehler in Zeile $1: Das Symbol 
\$2\ ist nicht zulässig. Es muss aus mindestens Zwei und maximal Zehn Zeichen 
bestehen
+}
diff --git a/Emoticons/i18n/en.json

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-09 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved t Json i18n files

Change-Id: I40600068d2015dc8eef46d2aab8ece38bc862ec0
---
A SaferEdit/i18n/de-formal.json
A SaferEdit/i18n/de.json
A SaferEdit/i18n/en.json
A SaferEdit/i18n/qqq.json
M SaferEdit/languages/SaferEdit.i18n.php
5 files changed, 114 insertions(+), 79 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/43/144943/1

diff --git a/SaferEdit/i18n/de-formal.json b/SaferEdit/i18n/de-formal.json
new file mode 100644
index 000..d190b05
--- /dev/null
+++ b/SaferEdit/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-saferedit-unsavedchanges: Sie haben noch ungespeicherte 
Änderungen.,
+   bs-saferedit-othersectiontext3: Möchten Sie zum Seitenabschnitt 
wechseln?
+}
diff --git a/SaferEdit/i18n/de.json b/SaferEdit/i18n/de.json
new file mode 100644
index 000..a4ed2be
--- /dev/null
+++ b/SaferEdit/i18n/de.json
@@ -0,0 +1,26 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-saferedit-desc: Bearbeitungen an Seiten werden automatisch 
zwischengespeichert,
+   prefs-saferedit: Sicheres Bearbeiten,
+   bs-saferedit-restore: Wiederherstellen,
+   bs-saferedit-safer-edit-tooltip: Es gibt eine 
Wiederherstellungsversion.,
+   bs-saferedit-safer-edit-topbar: Wiederherstellung,
+   bs-saferedit-user-editing: $1 bearbeitet die Seite gerade,
+   bs-saferedit-someone-editing: Die Seite wird gerade bearbeitet,
+   bs-saferedit-pref-interval: Intervall der Zwischenspeicherung:,
+   bs-saferedit-pref-shownameofeditinguser: Name des aktuellen 
Bearbeiters anzeigen,
+   bs-saferedit-pref-warnonleave: Warnung bei ungespeicherten Inhalten,
+   bs-saferedit-pref-usese: Sicheres Bearbeiten aktivieren,
+   bs-saferedit-statebartopsaferedit: Sicheres Bearbeiten,
+   bs-saferedit-statebartopsafereditediting: Sicheres Bearbeiten - In 
Bearbeitung,
+   bs-saferedit-lastsavedversion: Alter der Sicherungsversion: $1,
+   bs-saferedit-unsavedchanges: Es gibt noch ungespeicherte 
Änderungen.,
+   bs-saferedit-othersectiontitle: Sicherung in einem anderen 
Seitenabschnitt.,
+   bs-saferedit-othersectiontext1: Es gibt eine Sicherung eines 
Seiten-Abschnitts.,
+   bs-saferedit-othersectiontext2: Sicherungsversion wurde erstellt am 
$1,
+   bs-saferedit-othersectiontext3: Möchtest Du zum Seitenabschnitt 
wechseln?
+}
diff --git a/SaferEdit/i18n/en.json b/SaferEdit/i18n/en.json
new file mode 100644
index 000..910cc1a
--- /dev/null
+++ b/SaferEdit/i18n/en.json
@@ -0,0 +1,26 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-saferedit-desc: Intermediate saving of edits,
+   prefs-saferedit: Safer editing,
+   bs-saferedit-restore: Restore,
+   bs-saferedit-safer-edit-tooltip: A recovery version is available.,
+   bs-saferedit-safer-edit-topbar: Recovery,
+   bs-saferedit-user-editing: $1 is {{GENDER:$1|editing}} the page,
+   bs-saferedit-someone-editing: The page is being edited,
+   bs-saferedit-pref-interval: Intermediate saving interval:,
+   bs-saferedit-pref-shownameofeditinguser: Show name of current 
editor,
+   bs-saferedit-pref-warnonleave: Warn user when unsaved changes,
+   bs-saferedit-pref-usese: Activate safer editing,
+   bs-saferedit-statebartopsaferedit: Safer editing,
+   bs-saferedit-statebartopsafereditediting: Safer editing - someone is 
editing,
+   bs-saferedit-lastsavedversion: Last saved version: $1,
+   bs-saferedit-unsavedchanges: There are unsaved changes.,
+   bs-saferedit-othersectiontitle: Section to restore,
+   bs-saferedit-othersectiontext1: There is a backup of another 
section.,
+   bs-saferedit-othersectiontext2: The backup was created on $1.,
+   bs-saferedit-othersectiontext3: Do you want to switch to that 
section?
+}
diff --git a/SaferEdit/i18n/qqq.json b/SaferEdit/i18n/qqq.json
new file mode 100644
index 000..3185b00
--- /dev/null
+++ b/SaferEdit/i18n/qqq.json
@@ -0,0 +1,26 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-saferedit-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of pages visited 
extension,
+   prefs-saferedit: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for safer edit section in preferences.\n{{Identical|Safer editing}},
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-09 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I460aefd3ed6e31d3357b3ac10f46c5a546211128
---
M UserManager/UserManager.class.php
M UserManager/UserManager.setup.php
A UserManager/i18n/de-formal.json
A UserManager/i18n/de.json
A UserManager/i18n/en.json
A UserManager/i18n/qqq.json
M UserManager/languages/UserManager.i18n.php
M UserManager/resources/BS.UserManager/Panel.js
M UserManager/resources/BS.UserManager/UserDialog.js
9 files changed, 190 insertions(+), 282 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/68/144968/1

diff --git a/UserManager/UserManager.class.php 
b/UserManager/UserManager.class.php
index 9fff604..66121e9 100644
--- a/UserManager/UserManager.class.php
+++ b/UserManager/UserManager.class.php
@@ -210,45 +210,45 @@
);
 
$sUsername = ucfirst( $sUsername );
-   if ( Sanitizer::validateEmail( $sUsername ) === false ) { 
//TODO: Check if User::isCreatableName() is a better validation
+   if ( User::isCreatableName( $sUsername ) === false ) {
$aResponse['errors'][] = array(
'id' = 'username',
-   'message' = wfMessage( 
'bs-usermanager-invalid_uname_gen' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-invalid-uname' )-plain()
);
}
 
-   if ( $sEmail != ''  User::isValidEmailAddr ( $sEmail ) === 
false ) {
+   if ( $sEmail != ''  Sanitizer::validateEmail( $sEmail ) === 
false ) {
$aResponse['errors'][] = array(
'id' = 'email',
-   'message' = wfMessage( 
'bs-usermanager-invalid_email_gen' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-invalid-email-gen' )-plain()
);
}
 
if ( $sPassword == '' ) {
$aResponse['errors'][] = array(
'id' = 'pass',
-   'message' = wfMessage( 
'bs-usermanager-enter_pwd' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-enter-pwd' )-plain()
);
}
 
if ( strpos( $sRealname, '\\' ) ) {
$aResponse['errors'][] = array(
'id' = 'realname',
-   'message' = wfMessage( 
'bs-usermanager-invalid_realname' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-invalid-realname' )-plain()
);
}
 
if ( $sPassword != $sRePassword ) {
$aResponse['errors'][] = array(
'id' = 'repass',
-   'message' = wfMessage( 
'bs-usermanager-pwd_nomatch' )-plain()
+   'message' = wfMessage( 'badretype' )-plain() 
// MW message
);
}
 
if ( strtolower( $sUsername ) == strtolower( $sPassword ) ) {
$aResponse['errors'][] = array(
'id' = 'pass',
-   'message' = wfMessage( 
'bs-usermanager-user_pwd_match' )-plain()
+   'message' = wfMessage( 'password-name-match' 
)-plain() // MW message
);
}
 
@@ -256,7 +256,7 @@
if ( $oNewUser == null ) { //Should not be neccessary as we 
check for username validity above
$aResponse['errors'][] = array(
'id' = 'username',
-   'message' = wfMessage( 
'bs-usermanager-invalid_uname' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-invalid-uname' )-plain()
);
}
 
@@ -264,7 +264,7 @@
if( $oNewUser-getId() != 0 ) {
$aResponse['errors'][] = array(
'id' = 'username',
-   'message' = wfMessage( 
'bs-usermanager-user_exists' )-plain()
+   'message' = wfMessage( 
'bs-usermanager-user-exists' )-plain()
);
}
 
@@ -272,7 +272,7 @@
//TODO: $oNewUser-getPasswordValidity() 
returns a message key in case of error. Maybe we sould return this message.
$aResponse['errors'][] = array(

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-09 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved php language file into languages folder
Moved to Json i18n files

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(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/72/144972/1

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..000
--- a/UserSidebar/UserSidebar.i18n.php
+++ /dev/null
@@ -1,46 +0,0 @@
-?php
-/**
- * Internationalisation file for UserSidebar
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
- * @packageBlueSpice_Extensions
- * @subpackage UserSidebar
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://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_Adminmode=ExtensionInfo]], description of user sidebar 
extension.',
-   'prefs-usersidebar'= 'Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for user sidebar section in preferences.\n{{Identical|User sidebar}}',
-   'bs-usersidebar-pref-userpagesubpagetitle' = 'Option in 
[[Special:Wiki_Adminmode=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',
-);
\

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-09 Thread Smuggli (Code Review)

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..000
--- a/UserSidebar/UserSidebar.i18n.php
+++ /dev/null
@@ -1,46 +0,0 @@
-?php
-/**
- * Internationalisation file for UserSidebar
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
- * @packageBlueSpice_Extensions
- * @subpackage UserSidebar
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://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_Adminmode=ExtensionInfo]], description of user sidebar 
extension.',
-   'prefs-usersidebar'= 'Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for user sidebar section in preferences.\n{{Identical|User sidebar}}',
-   'bs-usersidebar-pref-userpagesubpagetitle' = 'Option in 
[[Special:Wiki_Adminmode=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

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-09 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files
Improved messages
Seperated timestamp to date and time
Suggested message is better because the preference is for all users and
not only administrators

Change-Id: I40600068d2015dc8eef46d2aab8ece38bc862ec0
---
M SaferEdit/SaferEdit.class.php
A SaferEdit/i18n/de-formal.json
A SaferEdit/i18n/de.json
A SaferEdit/i18n/en.json
A SaferEdit/i18n/qqq.json
M SaferEdit/languages/SaferEdit.i18n.php
M SaferEdit/resources/bluespice.SaferEdit.editmode.js
7 files changed, 143 insertions(+), 98 deletions(-)

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



diff --git a/SaferEdit/SaferEdit.class.php b/SaferEdit/SaferEdit.class.php
index 98f2a32..a92ce35 100644
--- a/SaferEdit/SaferEdit.class.php
+++ b/SaferEdit/SaferEdit.class.php
@@ -403,6 +403,7 @@
$sOrigText = $wgParser-getSection( $sOrigText, 
$iSection );
}
 
+   $oLang = RequestContext::getMain()-getLanguage();
if ( $iSection != $row['se_edit_section'] ) {
if ( $row['se_edit_section'] == '-1' ) {
$sEditUrl = $oTitle-getEditURL();
@@ -410,16 +411,18 @@
$sEditUrl = 
$oTitle-getEditURL().section=.$row['se_edit_section'];
}
$aData = array(
-   ts = 
BsFormatConverter::mwTimestampToAgeString( $row['se_timestamp'] ),
+   time = $oLang-time( 
$row['se_timestamp'] ),
+   date = $oLang-date( 
$row['se_timestamp'] ),
savedOtherSection = 1,
redirect = $sEditUrl
);
} elseif ( strcmp( $sOrigText, 
urldecode($row['se_text'] ) ) == 0 ) {
$aData = array( notexts = 1 );
} else {
-   $str = urldecode($row['se_text']);
+   $str = urldecode( $row['se_text'] );
$aData = array(
-   ts = 
BsFormatConverter::mwTimestampToAgeString( $row['se_timestamp'] ),
+   time = $oLang-time( 
$row['se_timestamp'] ),
+   date = $oLang-date( 
$row['se_timestamp'] ),
html = 
BsCore::getInstance()-parseWikiText( $str, 
RequestContext::getMain()-getTitle() ), //breaks on Mainpage
wiki = $str,
section = $row['se_edit_section'],
diff --git a/SaferEdit/i18n/de-formal.json b/SaferEdit/i18n/de-formal.json
new file mode 100644
index 000..d190b05
--- /dev/null
+++ b/SaferEdit/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-saferedit-unsavedchanges: Sie haben noch ungespeicherte 
Änderungen.,
+   bs-saferedit-othersectiontext3: Möchten Sie zum Seitenabschnitt 
wechseln?
+}
diff --git a/SaferEdit/i18n/de.json b/SaferEdit/i18n/de.json
new file mode 100644
index 000..9bf61cc
--- /dev/null
+++ b/SaferEdit/i18n/de.json
@@ -0,0 +1,26 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-saferedit-desc: Bearbeitungen an Seiten werden automatisch 
zwischengespeichert,
+   prefs-saferedit: Sicheres Bearbeiten,
+   bs-saferedit-restore: Wiederherstellen,
+   bs-saferedit-safer-edit-tooltip: Es gibt eine 
Wiederherstellungsversion.,
+   bs-saferedit-safer-edit-topbar: Wiederherstellung,
+   bs-saferedit-user-editing: $1 bearbeitet die Seite gerade,
+   bs-saferedit-someone-editing: Die Seite wird gerade bearbeitet,
+   bs-saferedit-pref-interval: Intervall der Zwischenspeicherung:,
+   bs-saferedit-pref-shownameofeditinguser: Name des aktuellen 
Bearbeiters anzeigen,
+   bs-saferedit-pref-warnonleave: Warnung bei ungespeicherten Inhalten,
+   bs-saferedit-pref-usese: Sicheres Bearbeiten aktivieren,
+   bs-saferedit-statebartopsaferedit: Sicheres Bearbeiten,
+   bs-saferedit-statebartopsafereditediting: Sicheres Bearbeiten - In 
Bearbeitung,
+   bs-saferedit-lastsavedversion: Sicherungsversion vom $1 - $2,
+   bs-saferedit-unsavedchanges: Es gibt noch ungespeicherte 
Änderungen.,
+   bs-saferedit-othersectiontitle: Sicherung in einem

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-09 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

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(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/86/144986/1

diff --git a/Preferences/Preferences.i18n.php b/Preferences/Preferences.i18n.php
deleted file mode 100644
index a998fda..000
--- a/Preferences/Preferences.i18n.php
+++ /dev/null
@@ -1,173 +0,0 @@
-?php
-/**
- * Internationalisation file for Preferences
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage Preferences
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://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 
(strongrecentchanges/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/):',
-   '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',
-

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-09 Thread Smuggli (Code Review)

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..000
--- a/Preferences/Preferences.i18n.php
+++ /dev/null
@@ -1,173 +0,0 @@
-?php
-/**
- * Internationalisation file for Preferences
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage Preferences
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://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 
(strongrecentchanges/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/):',
-   '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'

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-07 Thread Smuggli (Code Review)

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 000..35691fb
--- /dev/null
+++ b/Dashboards/i18n/de.json
@@ -0,0 +1,17 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   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 000..36657d9
--- /dev/null
+++ b/Dashboards/i18n/en.json
@@ -0,0 +1,17 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   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 000..2881476
--- /dev/null
+++ b/Dashboards/i18n/qqq.json
@@ -0,0 +1,17 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-dashboards-desc: Used in 
[[Special:Wiki_Adminmode=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_Adminmode=Preferences]], 
headline of dashboards section.\\n {{Identical|Dashboard}},
+   bs-dashboards-pref-userdashboardonlogo: Option in 
[[Special:Wiki_Adminmode=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;
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-07 Thread Smuggli (Code Review)

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 000..0978cbf
--- /dev/null
+++ b/WhoIsOnline/i18n/de.json
@@ -0,0 +1,19 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   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;codeanchortext/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 000..41b6c37
--- /dev/null
+++ b/WhoIsOnline/i18n/en.json
@@ -0,0 +1,19 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   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;codeanchortext/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 000..153
--- /dev/null
+++ b/WhoIsOnline/i18n/qqq.json
@@ -0,0 +1,19 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-whoisonline-desc: Used in 
[[Special:Wiki_Adminmode=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_Adminmode=Preferences]], 
headline for who is online section.\n{{Identical|Who is online?}},
+   bs-whoisonline-pref-limitcount: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for maximum number of users 
shown:,
+   bs-whoisonline-pref-orderby: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for sort by:,
+   bs-whoisonline-pref-maxidletime: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for time in seconds until a user 
is marked as offline:,
+   bs-whoisonline-pref-orderby-time: Option in 
[[Special:Wiki_Adminmode=Preferences]], option label for uptime,
+   bs-whoisonline-pref-orderby-name: Option in 
[[Special:Wiki_Adminmode=Preferences]], option label for name,
+   bs-whoisonline-pref-interval: Option in 
[[Special:Wiki_Adminmode=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

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-07 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved php i18n file into languages folder
Moved to Json i18n files
Fixed typos

Change-Id: Ibc2844b060cc33e228ab002c632b036c775e87c2
---
M UEModulePDF/UEModulePDF.class.php
D UEModulePDF/UEModulePDF.i18n.php
M UEModulePDF/UEModulePDF.setup.php
A UEModulePDF/i18n/de-formal.json
A UEModulePDF/i18n/de.json
A UEModulePDF/i18n/en.json
A UEModulePDF/i18n/qqq.json
M UEModulePDF/includes/ExportModulePDF.class.php
A UEModulePDF/languages/UEModulePDF.i18n.php
9 files changed, 123 insertions(+), 82 deletions(-)

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



diff --git a/UEModulePDF/UEModulePDF.class.php 
b/UEModulePDF/UEModulePDF.class.php
index d296fef..7866211 100644
--- a/UEModulePDF/UEModulePDF.class.php
+++ b/UEModulePDF/UEModulePDF.class.php
@@ -82,12 +82,12 @@
protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
//Variables
-   BsConfig::registerVar( 'MW::UEModulePDF::PdfServiceURL',   
'http://localhost:8080/BShtml2PDF', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 
'bs-uemodulepdf-pref-PdfServiceURL' );
-   BsConfig::registerVar( 'MW::UEModulePDF::DefaultTemplate', 
'BlueSpice', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-uemodulepdf-pref-DefaultTemplate' );
-   BsConfig::registerVar( 'MW::UEModulePDF::SuppressNS',  
false,   BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-uemodulepdf-pref-SuppressNS', 'toggle' );
+   BsConfig::registerVar( 'MW::UEModulePDF::PdfServiceURL',   
'http://localhost:8080/BShtml2PDF', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 
'bs-uemodulepdf-pref-pdfserviceurl' );
+   BsConfig::registerVar( 'MW::UEModulePDF::DefaultTemplate', 
'BlueSpice', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-uemodulepdf-pref-templatepath' );
+   BsConfig::registerVar( 'MW::UEModulePDF::SuppressNS',  
false,   BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-uemodulepdf-pref-suppressns', 'toggle' );
/* This setting is no longer needed. We do not provide the old 
bn2pdf.war anymore */
-   BsConfig::registerVar( 'MW::UEModulePDF::Backend',
'BsPDFServlet', 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-uemodulepdf-pref-Backend' );
-   BsConfig::registerVar( 'MW::UEModulePDF::TemplatePath',   
'extensions/BlueSpiceFoundation/data/PDFTemplates', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 
'bs-uemodulepdf-pref-TemplatePath' );
+   BsConfig::registerVar( 'MW::UEModulePDF::Backend',
'BsPDFServlet', 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS );
+   BsConfig::registerVar( 'MW::UEModulePDF::TemplatePath',   
'extensions/BlueSpiceFoundation/data/PDFTemplates', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 
'bs-uemodulepdf-pref-templatepath' );
 
//Hooks
$this-setHook('BSUniversalExportGetWidget');
diff --git a/UEModulePDF/UEModulePDF.i18n.php b/UEModulePDF/UEModulePDF.i18n.php
deleted file mode 100644
index 0096bbb..000
--- a/UEModulePDF/UEModulePDF.i18n.php
+++ /dev/null
@@ -1,74 +0,0 @@
-?php
-/**
- * Internationalisation file for UEModulePDF
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage UEModulePDF
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['en'] = array(
-   'UEModulePDF'   = 
'UniversalExport PDF Module',
-   'prefs-UEModulePDF' = 
'UniversalExport PDF Module',
-   'bs-uemodulepdf-extension-description'  = 'Enables 
export to PDF',
-   'bs-uemodulepdf-pref-PdfServiceURL' = 'Backend 
URL',
-   'bs-uemodulepdf-pref-PDFenNS'   = 'Link for 
PDF single page',
-   'bs-uemodulepdf-pref-PDFwithATTenNS'= 'Link for 
PDF single page with attachments',
-   'bs-uemodulepdf-pref-TemplatePath'  = 'Path to 
templates',
-   'bs-uemodulepdf-pref-DefaultTemplate'   = 'Standard 
template',
-   'bs-uemodulepdf-pref-SuppressNS'= 'Hide 
namespace prefix in PDF',
-   'bs-uemodulepdf-pref-Backend'   = 'Backend',
-

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-07 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Created languages folder
Moved php i18n file into languages folder
Moved to Json i18n files
Removed superfulous word from description

Change-Id: Iac4676c3e5ac035d263431f955eaf95d30f0a704
---
M SecureFileStore/SecureFileStore.class.php
D SecureFileStore/SecureFileStore.i18n.php
M SecureFileStore/SecureFileStore.setup.php
A SecureFileStore/i18n/de.json
A SecureFileStore/i18n/en.json
A SecureFileStore/i18n/qqq.json
A SecureFileStore/languages/SecureFileStore.i18n.php
7 files changed, 114 insertions(+), 79 deletions(-)

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



diff --git a/SecureFileStore/SecureFileStore.class.php 
b/SecureFileStore/SecureFileStore.class.php
index b273d41..6d69a42 100644
--- a/SecureFileStore/SecureFileStore.class.php
+++ b/SecureFileStore/SecureFileStore.class.php
@@ -3,7 +3,7 @@
  * SecureFileStore extension for BlueSpice
  *
  * Prevent unauthorized access to files and images.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * 
+ *
  * This file is part of BlueSpice for MediaWiki
  * For further information visit http://www.blue-spice.org
  *
@@ -86,11 +86,11 @@
protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
BsExtensionManager::setContext( 'MW::SecureFileStore::Active' );
-   
-   BsConfig::registerVar( 'MW::SecureFileStore::Active',   
  true, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-securefilestore-pref-Active' );
-   BsConfig::registerVar( 
'MW::SecureFileStore::DefaultDisposition', 'inline', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-securefilestore-pref-DefaultDisposition', 'select' );
-   BsConfig::registerVar( 
'MW::SecureFileStore::DispositionInline',  array( 'pdf' ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-securefilestore-pref-DispositionInline', 'multiselectplusadd' );
-   BsConfig::registerVar( 
'MW::SecureFileStore::DispositionAttachment',  array( 'doc', 'docx', 'xls', 
'xlsx', 'ppt', 'pptx' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-securefilestore-pref-DispositionAttachment', 'multiselectplusadd' );
+
+   BsConfig::registerVar( 'MW::SecureFileStore::Active',   
  true, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT );
+   BsConfig::registerVar( 
'MW::SecureFileStore::DefaultDisposition', 'inline', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-securefilestore-pref-defaultdisposition', 'select' );
+   BsConfig::registerVar( 
'MW::SecureFileStore::DispositionInline',  array( 'pdf' ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-securefilestore-pref-dispositioninline', 'multiselectplusadd' );
+   BsConfig::registerVar( 
'MW::SecureFileStore::DispositionAttachment',  array( 'doc', 'docx', 'xls', 
'xlsx', 'ppt', 'pptx' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-securefilestore-pref-dispositionattachment', 'multiselectplusadd' );
BsConfig::registerVar( 
'MW::SecureFileStore::FileExtensionWhitelist', array(), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING|BsConfig::RENDER_AS_JAVASCRIPT,
 'bs-securefilestore-pref-FileExtensionWhitelist', 'multiselectplusadd' );
 
$this-setHook( 'SkinTemplateOutputPageBeforeExec', 
'secureImages' );
@@ -107,7 +107,12 @@
}
 
public function runPreferencePlugin( $sAdapterName, $oVariable ) {
-   $aPrefs = array( 'options' = array( 'inline' = 'inline', 
'attachment' = 'attachment' ) );
+   $aPrefs = array(
+   'options' = array(
+   wfMessage( 
'bs-securefilestore-pref-defaultdisposition-brower' )-plain() = 'inline',
+   wfMessage( 
'bs-securefilestore-pref-defaultdisposition-external' )-plain() = 'attachment'
+   )
+   );
return $aPrefs;
}
 
@@ -115,7 +120,7 @@
 * Replaces links to files with links to secure file dispatcher.
 * @param object $oObject needed by hook
 * @param object $oText reference to skin template

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-07 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved php i18n file into languages folder
Moved to Json i18n files
Removed unused in message in german
Added PLURAL support to message
Fixed typo
Improved message removed superfluous word

Change-Id: I20b9ae3e3a297d88a68cc1aa35588cbe9f6efd40
---
M WantedArticle/WantedArticle.class.php
D WantedArticle/WantedArticle.i18n.php
M WantedArticle/WantedArticle.setup.php
A WantedArticle/i18n/de-formal.json
A WantedArticle/i18n/de.json
A WantedArticle/i18n/en.json
A WantedArticle/i18n/qqq.json
M WantedArticle/languages/WantedArticle.i18n.php
M WantedArticle/resources/bluespice.wantedArticle.js
9 files changed, 209 insertions(+), 300 deletions(-)

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



diff --git a/WantedArticle/WantedArticle.class.php 
b/WantedArticle/WantedArticle.class.php
index 0f281f5..4a9bae0 100644
--- a/WantedArticle/WantedArticle.class.php
+++ b/WantedArticle/WantedArticle.class.php
@@ -358,13 +358,23 @@
 * @return always true to keep hook running
 */
public function onBSInsertMagicAjaxGetData( $oResponse, $type ) {
-   if( $type != 'tags' ) return true;
+   if ( $type != 'tags' ) return true;
+
+   $aParams = array(
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-count' )-text(),
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-title' )-text(),
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-order' )-text(),
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-sort' )-text(),
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-type' )-text()
+   );
+   $sDesc = wfMessage( 'bs-wantedarticle-tag-wantedarticle-desc' 
)-plain().
+   'br /br /' . implode( 'br /', $aParams );
 
$oResponse-result[] = array(
'id' = 'bs:wantedarticle',
'type' = 'tag',
'name' = 'wantedarticle',
-   'desc' = wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc' )-parse(),
+   'desc' = $sDesc,
'code' = 'bs:wantedarticle /',
);
 
@@ -488,19 +498,25 @@
}
 
if ( count( $aFoundChars )  0 ) {
-   $sErrorMsg  = wfMessage( 
'bs-wantedarticle-ajax-error-invalid-chars' )-plain();
-   $sErrorMsg .= implode( ', ', $aFoundChars );
+   $sChars = implode( ', ', $aFoundChars );
+   $sErrorMsg = wfMessage( 
'bs-wantedarticle-title-invalid-chars', count( $aFoundChars ), $sChars 
)-plain();
return json_encode( array('success' = false, 'message' 
= $sErrorMsg ) );
}
 
//Check if suggested page already exists
$oSuggestedTitle = Title::newFromText( 
$sSuggestedArticleWikiLink );
+   $sSuggestedTitle = $oSuggestedTitle-getPrefixedText();
if ( $oSuggestedTitle-exists() ) {
$sErrorMsg = wfMessage(

'bs-wantedarticle-ajax-error-suggested-page-already-exists',
-   $oSuggestedTitle-getPrefixedText()
+   $sSuggestedTitle
)-plain();
-   return json_encode(  array('success' = false, 
'message' = $sErrorMsg ) );
+   return json_encode(
+   array(
+   'success' = false,
+   'message' = $sErrorMsg
+   )
+   );
}
 
$oWantedArticle = BsExtensionManager::getExtension( 
'WantedArticle' );
@@ -513,9 +529,14 @@
if ( $oSuggestedTitle-equals( $aWish['title'] ) ){
$sErrorMsg = wfMessage(

'bs-wantedarticle-ajax-error-suggested-page-already-on-list',
-   $oSuggestedTitle-getPrefixedText()
+   $sSuggestedTitle
)-plain();
-   return json_encode( array('success' = true, 
'message' = $sErrorMsg ) );
+   return json_encode(
+   array(
+   'success' = true,
+   'message' = $sErrorMsg
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-02 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files
Changed some messages to make them mor BlueSpice specific
Made action- and right- messages similar
fixed typo

Change-Id: I1071bdba3c802a1c1cf6508017cfa56bcb43c58e
---
M WikiAdmin/WikiAdmin.class.php
M WikiAdmin/WikiAdmin.setup.php
A WikiAdmin/i18n/de-formal.json
A WikiAdmin/i18n/de.json
A WikiAdmin/i18n/en.json
A WikiAdmin/i18n/qqq.json
M WikiAdmin/languages/WikiAdmin.i18n.php
7 files changed, 121 insertions(+), 54 deletions(-)

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



diff --git a/WikiAdmin/WikiAdmin.class.php b/WikiAdmin/WikiAdmin.class.php
index 5f05ef9..2736543 100644
--- a/WikiAdmin/WikiAdmin.class.php
+++ b/WikiAdmin/WikiAdmin.class.php
@@ -24,22 +24,11 @@
   * http://www.gnu.org/copyleft/gpl.html
   *
   * For further information visit http://www.blue-spice.org
-  *
-  * Version information
-  * $LastChangedDate: 2013-06-25 11:17:54 +0200 (Di, 25 Jun 2013) $
-  * $LastChangedBy: rvogel $
-  * $Rev: 9912 $
-
   */
 
 /* Changelog
- * v1.20.0
- * - MediaWiki I18N
- * v0.1.0
- * FIRST CHANGES
+ * v2.23.0
  */
-
- // Last review: (01.07.11 01:58)
 
 class WikiAdmin extends BsExtensionMW {
 
@@ -196,4 +185,49 @@
 
wfProfileOut( 'BS::'.__METHOD__ );
}
+
+   /**
+* Adds WikiAdmin tab to main navigation
+* @param SkinTemplate $sktemplate
+* @param BaseTemplate $tpl
+* @return boolean Always true to keep hook running
+*/
+   public static function onSkinTemplateOutputPageBeforeExec( 
$sktemplate, $tpl ) {
+   if( $sktemplate-getUser()-isAllowed('wikiadmin') === false ) {
+   return true;
+   }
+
+   $oSpecialPage = SpecialPage::getTitleFor('WikiAdmin');
+   $aRegisteredModules = WikiAdmin::getRegisteredModules();
+
+   $aOut = array();
+   $aOut[] = 'ul';
+
+   foreach ( $aRegisteredModules as $sModuleKey = $aModulParams ) 
{
+   $skeyLower = mb_strtolower($sModuleKey);
+   $sModulLabel = wfMessage( 'bs-' . $skeyLower . '-label' 
)-plain();
+   $sUrl = $oSpecialPage-getLocalURL( array( 'mode' = 
$sModuleKey ) );
+   //$sUrl = str_replace( '', 'amp;', $sUrl );
+   $sLink = Html::element(
+   'a',
+   array(
+   'id' = 'bs-admin-'.$skeyLower,
+   'href' = $sUrl,
+   'title' = $sModulLabel
+   ),
+   $sModulLabel
+   );
+   $aOut[] = '  li'.$sLink.'/li';
+   }
+
+   $aOut[] = '/ul';
+
+   $tpl-data['bs_navigation_main']['bs-wikiadmin'] = array(
+   'position' = 100,
+   'label' = wfMessage('bs-tab_admin')-plain(),
+   'class' = 'icon-wrench',
+   'content' = implode( \n, $aOut )
+   );
+   return true;
+   }
 }
\ No newline at end of file
diff --git a/WikiAdmin/WikiAdmin.setup.php b/WikiAdmin/WikiAdmin.setup.php
index 03396ca..819c864 100644
--- a/WikiAdmin/WikiAdmin.setup.php
+++ b/WikiAdmin/WikiAdmin.setup.php
@@ -7,8 +7,9 @@
 $wgExtensionMessagesFiles['WikiAdmin'] = __DIR__ . 
'/languages/WikiAdmin.i18n.php';
 
 // Specialpage and messages
-$wgAutoloadClasses['SpecialWikiAdmin'] = __DIR__ . 
'/includes/specials/SpecialWikiAdmin.class.php'; # Location of the 
SpecialMyExtension class (Tell MediaWiki to load this file)
+$wgAutoloadClasses['SpecialWikiAdmin'] = __DIR__ . 
'/includes/specials/SpecialWikiAdmin.class.php';
 $wgSpecialPageGroups['SpecialWikiAdmin'] = 'bluespice';
-$wgExtensionMessagesFiles['WikiAdminAlias'] = __DIR__ . 
'/includes/specials/SpecialWikiAdmin.alias.php'; # Location of an aliases file 
(Tell MediaWiki to load this file)
-$wgSpecialPages['SpecialWikiAdmin'] = 'SpecialWikiAdmin'; # Tell MediaWiki 
about the new special page and its class name
+$wgExtensionMessagesFiles['WikiAdminAlias'] = __DIR__ . 
'/includes/specials/SpecialWikiAdmin.alias.php';
+$wgSpecialPages['SpecialWikiAdmin'] = 'SpecialWikiAdmin';
 
+$wgHooks['SkinTemplateOutputPageBeforeExec'][] = 
'WikiAdmin::onSkinTemplateOutputPageBeforeExec';
\ No newline at end of file
diff --git a/WikiAdmin/i18n/de-formal.json b/WikiAdmin/i18n/de-formal.json
new file mode 100644
index 000..20ecc84
--- /dev/null
+++ b/WikiAdmin/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-02 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files
Improved english extension description
Added missing message in german

Change-Id: I745d9ec16afc71a4bd6253812cf71684ace87424
---
M VisualEditor/VisualEditor.class.php
A VisualEditor/i18n/de.json
A VisualEditor/i18n/en.json
A VisualEditor/i18n/qqq.json
M VisualEditor/languages/VisualEditor.i18n.php
5 files changed, 158 insertions(+), 120 deletions(-)

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



diff --git a/VisualEditor/VisualEditor.class.php 
b/VisualEditor/VisualEditor.class.php
index 315df73..ef10529 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -209,19 +209,19 @@
);
$this-mExtensionKey = 'MW::VisualEditor';
 
-   BsConfig::registerVar('MW::VisualEditor::disableNS', 
array(NS_MEDIAWIKI), BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_ARRAY_INT | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-visualeditor-pref-disableNS', 
'multiselectex');
-   BsConfig::registerVar('MW::VisualEditor::defaultNoContextNS', 
array(NS_SPECIAL, NS_MEDIA, NS_FILE), BsConfig::LEVEL_PRIVATE | 
BsConfig::TYPE_ARRAY_INT, 'bs-visualeditor-pref-defaultNoContextNS', 
'multiselectex');
+   BsConfig::registerVar('MW::VisualEditor::disableNS', 
array(NS_MEDIAWIKI), BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_ARRAY_INT | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-visualeditor-pref-disablens', 
'multiselectex');
+   BsConfig::registerVar('MW::VisualEditor::defaultNoContextNS', 
array(NS_SPECIAL, NS_MEDIA, NS_FILE), BsConfig::LEVEL_PRIVATE | 
BsConfig::TYPE_ARRAY_INT, 'bs-visualeditor-pref-defaultnocontextns', 
'multiselectex');
 
-   BsConfig::registerVar('MW::VisualEditor::SpecialTags', array(), 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-SpecialTags');
-   BsConfig::registerVar('MW::VisualEditor::AllowedTags', array(), 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-AllowedTags');
+   BsConfig::registerVar('MW::VisualEditor::SpecialTags', array(), 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-specialtags');
+   BsConfig::registerVar('MW::VisualEditor::AllowedTags', array(), 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-allowedtags');
 
-   BsConfig::registerVar('MW::VisualEditor::Use', true, 
BsConfig::LEVEL_USER | BsConfig::TYPE_BOOL, 'bs-visualeditor-pref-Use', 
'toggle');
-   BsConfig::registerVar('MW::VisualEditor::UseLimited', false, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-UseLimited', 'toggle');
-   BsConfig::registerVar('MW::VisualEditor::UseForceLimited', 
false, BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | 
BsConfig::TYPE_BOOL, 'bs-visualeditor-pref-UseForceLimited', 'toggle');
+   BsConfig::registerVar('MW::VisualEditor::Use', true, 
BsConfig::LEVEL_USER | BsConfig::TYPE_BOOL, 'bs-visualeditor-pref-use', 
'toggle');
+   BsConfig::registerVar('MW::VisualEditor::UseLimited', false, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-uselimited', 'toggle');
+   BsConfig::registerVar('MW::VisualEditor::UseForceLimited', 
false, BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | 
BsConfig::TYPE_BOOL, 'bs-visualeditor-pref-useforcelimited', 'toggle');
 
-   BsConfig::registerVar('MW::VisualEditor::DebugMode', false, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-DebugMode');
-   BsConfig::registerVar('MW::VisualEditor::GuiMode', true, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-GuiMode');
-   BsConfig::registerVar('MW::VisualEditor::GuiSwitchable', true, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-GuiSwitchable');
+   BsConfig::registerVar('MW::VisualEditor::DebugMode', false, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-debugmode');
+   BsConfig::registerVar('MW::VisualEditor::GuiMode', true, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-guimode');
+   BsConfig::registerVar('MW::VisualEditor::GuiSwitchable', true, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT |

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-02 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: Ice4e7b5fade898e6f0a3821ab6e87d9d4a24c8a8
---
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
A TopMenuBarCustomizer/i18n/de.json
A TopMenuBarCustomizer/i18n/en.json
A TopMenuBarCustomizer/i18n/qqq.json
M TopMenuBarCustomizer/languages/TopMenuBarCustomizer.i18n.php
M TopMenuBarCustomizer/views/view.TopMenuItem.php
M TopMenuBarCustomizer/views/view.TopMenuItemMain.php
7 files changed, 142 insertions(+), 138 deletions(-)

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



diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php 
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 6d6e913..ac8efcb 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -17,7 +17,7 @@
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-* 
+*
 * This file is part of BlueSpice for MediaWiki
 * For further information visit http://www.blue-spice.org
 *
@@ -66,14 +66,12 @@
 */
public function initExt() {
//TODO: Add some error massages on article save (more than 5 
entrys etc.)
-   
$this-setHook('BSBlueSpiceSkin:ApplicationList','onBlueSpiceSkinApplicationList',
 true);
$this-setHook('BeforePageDisplay');
-   $this-setHook('EditFormPreloadText');
+   $this-setHook('SkinTemplateOutputPageBeforeExec');
 
-   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NuberOfLevels',   2, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-NumberOfLevels' );
-   
BsConfig::registerVar('MW::TopMenuBarCustomizer::DataSourceTitle', 
'TopBarMenu', BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING, 
'bs-topmenubarcustomizer-pref-DataSourceTitle' );
-   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NumberOfMainEntries', 10, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-NumberOfMainEntries', 'int' );
-   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NumberOfSubEntries',  25, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-NumberOfSubEntries', 'int' );
+   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NuberOfLevels',   2, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-numberoflevels' );
+   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NumberOfMainEntries', 10, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-numberofmainentries', 'int' );
+   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NumberOfSubEntries',  25, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-numberofsubentries', 'int' );
}
 
/**
@@ -88,67 +86,35 @@
}
 
/**
-* Hook-Handle for MW hook EditFormPreloadText
-* @param string $sText
-* @param Title $oTitle
-* @return boolean - always true
+* Overrides existing bs_navigation_topbar
+* @param SkinTemplate $sktemplate
+* @param BaseTemplate $tpl
+* @return boolean Always true to keep hook running
 */
-   public function onEditFormPreloadText($sText, $oTitle) {
-   if( 
!$oTitle-equals(Title::newFromText(BsConfig::get('MW::TopMenuBarCustomizer::DataSourceTitle'),
 NS_MEDIAWIKI)) ) return true;
-
-   global $wgUser;
-   $aApplications = BsConfig::get('MW::Applications');
-   $sCurrentApplicationContext = 
BsConfig::get('MW::ApplicationContext');
-   $aOut = array();
-   wfRunHooks( 'BSBlueSpiceSkin:ApplicationList', array( 
$aApplications, $sCurrentApplicationContext, $wgUser, $aOut, $this ) );
-
-   foreach($aApplications as $aApplication) {
-   $sText .= *{$aApplication['name']}\n;
+   public function onSkinTemplateOutputPageBeforeExec( $sktemplate, $tpl 
){
+   $oTopBarMenuTitle = Title::makeTitle( NS_MEDIAWIKI, 
'TopBarMenu' );
+   if( is_null($oTopBarMenuTitle ) || !$oTopBarMenuTitle-exists() 
) {
+   return true;
}
-
-   return true;
-   }
-
-   /**
-* Hook-Handler for BSBlueSpiceSkin:ApplicationList
-* @param Array $aApplications
-* @param String $sCurrentApplicationContext
-* @param User $wgUser
-* @param Array $aOut
-* @param Object $oSender
-* @return boolean -

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-02 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I8f02f4b573f682f7ace8147a88e529a07d4a595a
---
A UserPreferences/i18n/de.json
A UserPreferences/i18n/en.json
A UserPreferences/i18n/qqq.json
M UserPreferences/languages/UserPreferences.i18n.php
4 files changed, 51 insertions(+), 19 deletions(-)

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



diff --git a/UserPreferences/i18n/de.json b/UserPreferences/i18n/de.json
new file mode 100644
index 000..6187daf
--- /dev/null
+++ b/UserPreferences/i18n/de.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-userpreferences-desc: Generiert ein zusätzliches 
BlueSpice-Register in den Benutzereinstellungen
+}
diff --git a/UserPreferences/i18n/en.json b/UserPreferences/i18n/en.json
new file mode 100644
index 000..3dc4f1e
--- /dev/null
+++ b/UserPreferences/i18n/en.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-userpreferences-desc: Adds the BlueSpice tab in preferences
+}
diff --git a/UserPreferences/i18n/qqq.json b/UserPreferences/i18n/qqq.json
new file mode 100644
index 000..c5b7515
--- /dev/null
+++ b/UserPreferences/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-userpreferences-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of user preferences 
extension
+}
diff --git a/UserPreferences/languages/UserPreferences.i18n.php 
b/UserPreferences/languages/UserPreferences.i18n.php
index db7bc5c..1798b8d 100644
--- a/UserPreferences/languages/UserPreferences.i18n.php
+++ b/UserPreferences/languages/UserPreferences.i18n.php
@@ -1,27 +1,35 @@
 ?php
 /**
- * Internationalisation file for UserPreferences
+ * 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 mug...@hallowelt.biz
- * @packageBlueSpice_Extensions
- * @subpackage UserPreferences
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://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( 'wfJsonI18nShim031d7d45afd5215c' ) ) {
+   function wfJsonI18nShim031d7d45afd5215c( $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-userpreferences-desc' = 'Renders the BlueSpice tab in preferences.'
-);
+   $cachedData['deps'][] = new FileDependency( $fileName );
+   }
+   return true;
+   }
 
-$messages['de'] = array(
-   'bs-userpreferences-desc' = 'Generiert ein zusätzliches 
BlueSpice-Register in den Benutzereinstellungen.'
-);
-
-$messages['qqq'] = array(
-   'bs-userpreferences-desc' = 'Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of user preferences 
extension'
-);
\ No newline at end of file
+   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim031d7d45afd5215c';
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-02 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files
Impreoved some messages in punctuation and syntactically
Added PLURAL support

Change-Id: I5d147a9db396d4823b2ea86868bea8ca0e34a234
---
M PageTemplates/PageTemplates.class.php
A PageTemplates/i18n/de-formal.json
A PageTemplates/i18n/de.json
A PageTemplates/i18n/en.json
A PageTemplates/i18n/qqq.json
M PageTemplates/languages/PageTemplates.i18n.php
6 files changed, 183 insertions(+), 146 deletions(-)

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



diff --git a/PageTemplates/PageTemplates.class.php 
b/PageTemplates/PageTemplates.class.php
index 3f8820b..f8d61d4 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -129,8 +129,8 @@
}
 
/**
-* Automatically modifies noarticletext message. Otherwise, you would 
-* have to modify MediaWiki:noarticletext in the wiki, wich causes 
+* Automatically modifies noarticletext message. Otherwise, you would
+* have to modify MediaWiki:noarticletext in the wiki, wich causes
 * installation overhead.
 * @param string $sKey The message key. Note that it comes ucfirst and 
can be an i18n version (e.g. Noarticletext/de-formal)
 * @param string $sMessage This variable is called by reference and 
modified.
@@ -148,8 +148,8 @@
}
 
/*
-* As we are in view mode but we present the user only links to 
-* edit/create mode we do a preemptive check wether or not th 
user 
+* As we are in view mode but we present the user only links to
+* edit/create mode we do a preemptive check wether or not th 
user
 * also has edit/create permission
 */
if ( !$oTitle-userCan( 'edit' ) ) {
@@ -197,23 +197,7 @@
// if we are not on a wiki page, return. This is important when 
calling import scripts that try to create nonexistent pages, e.g. importImages
if ( !is_object( $oTitle ) ) return true;
 
-   // TODO RBV (18.05.11 08:53): Coding Conventions bei Variablen. 
View? BaseView mit Template?
-   $sOut = wfMessage( 'bs-pagetemplates-choose-template' 
)-plain();
-   $aOutNs = array();
-   $sOutAll = '';
-   $oTargetNsTitle = null;
-
$dbr = wfGetDB( DB_SLAVE );
-
-   $sOut .= 'br /br /ulli';
-   $sOut .= BsLinkProvider::makeLink( $oTitle, wfMessage( 
'bs-pagetemplates-empty-page' )-plain(), $aCostumAttr = array(), array( 
'preload' = '' ) );
-   $sOut .= 'br /' . wfMessage( 
'bs-pagetemplates-empty-page-desc' )-plain();
-   $sOut .= '/li/ul';
-
-   $oSortingTitle = Title::makeTitle( NS_MEDIAWIKI, 
'PageTemplatesSorting' );
-   $vOrder = 
BsPageContentProvider::getInstance()-getContentFromTitle( $oSortingTitle );
-   $vOrder = explode( '*', $vOrder );
-   $vOrder = array_map( 'trim', $vOrder );
 
$aConds = array();
if ( BsConfig::get( 'MW::PageTemplates::HideIfNotInTargetNs' ) 
) {
@@ -238,6 +222,23 @@
array( 'ORDER BY' = 'pt_label' )
);
 
+   // There is always one template for empty page it is added some 
lines beneath that
+   $iCount = $dbr-numRows( $res ) + 1;
+   $sOut = wfMessage( 'bs-pagetemplates-choose-template', $iCount 
)-plain();
+   $aOutNs = array();
+   $sOutAll = '';
+   $oTargetNsTitle = null;
+
+   $sOut .= 'br /br /ulli';
+   $sOut .= BsLinkProvider::makeLink( $oTitle, wfMessage( 
'bs-pagetemplates-empty-page' )-plain(), array(), array( 'preload' = '' ) );
+   $sOut .= 'br /' . wfMessage( 
'bs-pagetemplates-empty-page-desc' )-plain();
+   $sOut .= '/li/ul';
+
+   $oSortingTitle = Title::makeTitle( NS_MEDIAWIKI, 
'PageTemplatesSorting' );
+   $vOrder = 
BsPageContentProvider::getInstance()-getContentFromTitle( $oSortingTitle );
+   $vOrder = explode( '*', $vOrder );
+   $vOrder = array_map( 'trim', $vOrder );
+
if ( $res  $dbr-numRows( $res )  0 ) {
while ( $row = $dbr-fetchObject( $res ) ) {
$oNsTitle = Title::makeTitle( 
$row-pt_template_namespace, $row-pt_template_title );
diff --git a/PageTemplates/i18n/de-formal.json 
b/PageTemplates/i18n/de-formal.json
new file mode 100644
index 000..54a4959
--- /dev/null
+++ b/PageTemplates/i18n/de-formal.json
@@ -0,0 +1,16 @@
+{
+   @metadata: {
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-02 Thread Smuggli (Code Review)

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
Corrected some messages
All keys lowercase

Change-Id: I8407e91ee7751ae6116ab5befa634de683c8fbd0
---
M ShoutBox/ShoutBox.setup.php
A ShoutBox/i18n/de-formal.json
A ShoutBox/i18n/de.json
A ShoutBox/i18n/en.json
A ShoutBox/i18n/qqq.json
M ShoutBox/languages/ShoutBox.i18n.php
M ShoutBox/resources/bluespice.shoutBox.js
M ShoutBox/views/view.ShoutBox.php
8 files changed, 155 insertions(+), 119 deletions(-)

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



diff --git a/ShoutBox/ShoutBox.setup.php b/ShoutBox/ShoutBox.setup.php
index 92fc639..0aa0c97 100644
--- a/ShoutBox/ShoutBox.setup.php
+++ b/ShoutBox/ShoutBox.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('ShoutBox', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
 
+$wgMessagesDirs['ShoutBox'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['ShoutBox'] = __DIR__ . 
'/languages/ShoutBox.i18n.php';
 $wgExtensionMessagesFiles['ShoutBoxMagic'] = __DIR__ . 
'/languages/ShoutBox.i18n.magic.php';
 
@@ -17,13 +19,14 @@
'bs-shoutbox-confirm-text',
'bs-shoutbox-confirm-title',
'bs-shoutbox-entermessage',
-   'bs-shoutbox-too-early'
+   'bs-shoutbox-too-early',
+   'bs-shoutbox-charactersleft'
),
'position' = 'bottom'
 ) + $aResourceModuleTemplate;
 
 $wgResourceModules['ext.bluespice.shoutbox.styles'] = array(
-   'styles'  = 'bluespice.shoutBox.css',
+   'styles' = 'bluespice.shoutBox.css',
 ) + $aResourceModuleTemplate;
 
 unset( $aResourceModuleTemplate );
diff --git a/ShoutBox/i18n/de-formal.json b/ShoutBox/i18n/de-formal.json
new file mode 100644
index 000..d4d1853
--- /dev/null
+++ b/ShoutBox/i18n/de-formal.json
@@ -0,0 +1,11 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-shoutbox-archive-failure: Beim Löschen des Eintrags ist ein Fehler 
aufgetreten, bitte versuchen Sie es erneut.,
+bs-shoutbox-confirm-text: Möchten Sie diesen Eintrag wirklich löschen?,
+bs-shoutbox-entermessage: Bitte geben Sie eine Nachricht ein.,
+bs-shoutbox-too-early: Bitte warten Sie ein paar Sekunden, bevor Sie 
den nächsten Eintrag abschicken.
+}
diff --git a/ShoutBox/i18n/de.json b/ShoutBox/i18n/de.json
new file mode 100644
index 000..7c44e6a
--- /dev/null
+++ b/ShoutBox/i18n/de.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-shoutbox-desc: Stellt eine Shoutbox unterhalb jeder Seite bereit,
+prefs-shoutbox: Shoutbox,
+bs-shoutbox-title: Shoutbox,
+bs-shoutbox-message: Mitteilung,
+bs-shoutbox-shout: Schicken,
+bs-shoutbox-no-entries: Bisher wurden keine Mitteilungen gesendet.,
+bs-shoutbox-loading: Lade...,
+bs-shoutbox-pref-committimeinterval: Zeit zwischen zwei Eintragungen 
(Sekunden):,
+bs-shoutbox-pref-maxmessagelength: Maximale Länge der Mittelungen,
+bs-shoutbox-pref-numberofshouts: Anzahl der dargestellten Mitteilungen,
+bs-shoutbox-pref-showage: Alter der Mitteilung anzeigen,
+bs-shoutbox-pref-showuser: Sender der Mitteilung anzeigen,
+bs-shoutbox-pref-allowarchive: Benutzer können ihre eigenen Einträge 
löschen,
+bs-shoutbox-archive-success: Eintrag wurde erfolgreich gelöscht.,
+bs-shoutbox-archive-failure: Beim Löschen des Eintrags ist ein Fehler 
aufgetreten, bitte versuche es erneut.,
+bs-shoutbox-archive-failure-user: Einträge können nur von deren Autor 
gelöscht werden.,
+bs-shoutbox-switch-description: Shoutbox wird auf dieser Seite nicht 
angezeigt,
+bs-shoutbox-pref-show: Shoutbox anzeigen,
+bs-shoutbox-charactersleft: $1 Zeichen übrig,
+bs-shoutbox-confirm-text: Möchtest du diesen Eintrag wirklich löschen?,
+bs-shoutbox-confirm-title: Bestätigen,
+bs-shoutbox-entermessage: Bitte gib eine Nachricht ein.,
+bs-shoutbox-too-early: Bitte warte ein paar Sekunden, bevor du den 
nächsten Eintrag abschickst.
+}
diff --git a/ShoutBox/i18n/en.json b/ShoutBox/i18n/en.json
new file mode 100644
index 000..3cffd82
--- /dev/null
+++ b/ShoutBox/i18n/en.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-shoutbox-desc: Adds a shoutbox after the content of a page,
+prefs-shoutbox: Shoutbox,
+bs-shoutbox-title: Shoutbox,
+bs-shoutbox-message: Message,
+bs-shoutbox-shout: Shout it,
+bs-shoutbox-no-entries: Nothing here yet.,
+bs-shoutbox-loading: Loading...,
+bs-shoutbox-pref-committimeinterval: Time between two messages (in 
seconds):,
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-02 Thread Smuggli (Code Review)

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 path to i18n folder
Improved message use displays instead of show

Change-Id: Ie8231d4a73ac299392b3975634fe2a54d300831b
---
M PagesVisited/PagesVisited.class.php
M PagesVisited/PagesVisited.setup.php
A PagesVisited/i18n/de-formal.json
A PagesVisited/i18n/de.json
A PagesVisited/i18n/en.json
A PagesVisited/i18n/qqq.json
M PagesVisited/languages/PagesVisited.i18n.php
7 files changed, 100 insertions(+), 70 deletions(-)

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



diff --git a/PagesVisited/PagesVisited.class.php 
b/PagesVisited/PagesVisited.class.php
index c3d7d19..ca4cec9 100644
--- a/PagesVisited/PagesVisited.class.php
+++ b/PagesVisited/PagesVisited.class.php
@@ -90,9 +90,9 @@
$this-setHook( 'BSWidgetListHelperInitKeyWords' );
$this-setHook( 'BSInsertMagicAjaxGetData' );
 
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetLimit', 
 10, BsConfig::LEVEL_USER|BsConfig::TYPE_INT, 
'bs-pagesvisited-pref-widgetlimit', 'int' );
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetNS', array( 
0 ), 
BsConfig::LEVEL_USER|BsConfig::TYPE_ARRAY_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
 'bs-pagesvisited-pref-widgetns', 'multiselectex' );
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetSortOdr',
'time', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-pagesvisited-pref-widgetsortodr', 'select' );
+   BsConfig::registerVar( 'MW::PagesVisited::WidgetLimit', 10, 
BsConfig::LEVEL_USER|BsConfig::TYPE_INT, 'bs-pagesvisited-pref-widgetlimit', 
'int' );
+   BsConfig::registerVar( 'MW::PagesVisited::WidgetNS', array( 0 
), 
BsConfig::LEVEL_USER|BsConfig::TYPE_ARRAY_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
 'bs-pagesvisited-pref-widgetns', 'multiselectex' );
+   BsConfig::registerVar( 'MW::PagesVisited::WidgetSortOdr', 
'time', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-pagesvisited-pref-widgetsortodr', 'select' );
 
wfProfileOut( 'BS::'.__METHOD__ );
}
@@ -108,7 +108,7 @@
switch( $oVariable-getName() ) {
case 'WidgetNS':
$aPrefs = array(
-   'type'= 'multiselectex',
+   'type' = 'multiselectex',
'options' = 
BsNamespaceHelper::getNamespacesForSelectOptions( array( -2, NS_MEDIA, 
NS_MEDIAWIKI, NS_MEDIAWIKI_TALK, NS_SPECIAL ) )
);
break;
@@ -178,10 +178,10 @@
$oParser-disableCache();
$oErrorListView = new ViewTagErrorList( $this );
 
-   $iCount = BsCore::sanitizeArrayEntry( $aAttributes, 'count',
  5, BsPARAMTYPE::INT );
-   $iMaxTitleLength = BsCore::sanitizeArrayEntry( $aAttributes, 
'maxtitlelength',20, BsPARAMTYPE::INT );
-   $sNamespaces = BsCore::sanitizeArrayEntry( $aAttributes, 
'namespaces', 'all', BsPARAMTYPE::STRING | BsPARAMOPTION::CLEANUP_STRING );
-   $sSortOrder = BsCore::sanitizeArrayEntry( $aAttributes, 
'order',  'time', BsPARAMTYPE::STRING | BsPARAMOPTION::CLEANUP_STRING );
+   $iCount = BsCore::sanitizeArrayEntry( $aAttributes, 'count', 5, 
BsPARAMTYPE::INT );
+   $iMaxTitleLength = BsCore::sanitizeArrayEntry( $aAttributes, 
'maxtitlelength', 20, BsPARAMTYPE::INT );
+   $sNamespaces = BsCore::sanitizeArrayEntry( $aAttributes, 
'namespaces', 'all', BsPARAMTYPE::STRING | BsPARAMOPTION::CLEANUP_STRING );
+   $sSortOrder = BsCore::sanitizeArrayEntry( $aAttributes, 
'order', 'time', BsPARAMTYPE::STRING | BsPARAMOPTION::CLEANUP_STRING );
 
//Validation
$oValidationICount = BsValidator::isValid( 'IntegerRange', 
$iCount, array('fullResponse' = true, 'lowerBoundary' = 1, 'upperBoundary' = 
30) );
@@ -244,15 +244,12 @@
$iCount = BsConfig::get( 'MW::PagesVisited::WidgetLimit' );
$aNamespaces = BsConfig::get( 'MW::PagesVisited::WidgetNS' );
$sSortOrder = BsConfig::get( 'MW::PagesVisited::WidgetSortOdr' 
);
-   $iCurrentNamespaceId = 0;
 
//Validation
$oValidationICount = BsValidator::isValid( 'IntegerRange', 
$iCount, array( 'fullResponse' = true, 'lowerBoundary' = 1, 'upperBoundary' 
= 30 ) );
if ( $oValidationICount-getErrorCode() ) $iCount = 10;
 
-   if ( $this-getTitle() !== null  ) { // TODO RBV (15.04.11 
13:05): Necessary?
-

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-01 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Removed preference key because it is already used in mediawiki

Change-Id: I713f2910ac4b9e91e3b07fbb776098de73ffafda
---
M WatchList/i18n/de.json
M WatchList/i18n/en.json
M WatchList/i18n/qqq.json
3 files changed, 0 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/54/143254/1

diff --git a/WatchList/i18n/de.json b/WatchList/i18n/de.json
index aa324c6..b1c5ddc 100644
--- a/WatchList/i18n/de.json
+++ b/WatchList/i18n/de.json
@@ -5,7 +5,6 @@
]
},
bs-watchlist-desc: Fügt ein Beobachtungsliste-Widget und Tag hinzu,
-   prefs-watchlist: Beobachtete Seiten,
bs-watchlist-title-sidebar: Beobachtete Seiten,
bs-watchlist-pref-widgetlimit: Anzahl der Einträge:,
bs-watchlist-pref-widgetsortodr: Sortieren nach:,
diff --git a/WatchList/i18n/en.json b/WatchList/i18n/en.json
index f999255..2ae70bd 100644
--- a/WatchList/i18n/en.json
+++ b/WatchList/i18n/en.json
@@ -5,7 +5,6 @@
]
},
bs-watchlist-desc: Adds a watchlist widget and tag,
-   prefs-watchlist: Watchlist,
bs-watchlist-title-sidebar: Watchlist,
bs-watchlist-pref-widgetlimit: Limit of entries:,
bs-watchlist-pref-widgetsortodr: Sort by:,
diff --git a/WatchList/i18n/qqq.json b/WatchList/i18n/qqq.json
index e91c4ab..2bfcb14 100644
--- a/WatchList/i18n/qqq.json
+++ b/WatchList/i18n/qqq.json
@@ -5,7 +5,6 @@
]
},
bs-watchlist-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of watchlist extension,
-   prefs-watchlist: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for watchlist section.\n{{Identical|Watchlist}},
bs-watchlist-title-sidebar: Headline for watchlist 
\n{{Identical|Watchlist}},
bs-watchlist-pref-widgetlimit: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for limit of entries:,
bs-watchlist-pref-widgetsortodr: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for sort by,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I713f2910ac4b9e91e3b07fbb776098de73ffafda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-01 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Removed preference key because it is already used in mediawiki

Change-Id: I713f2910ac4b9e91e3b07fbb776098de73ffafda
---
M WatchList/i18n/de.json
M WatchList/i18n/en.json
M WatchList/i18n/qqq.json
3 files changed, 0 insertions(+), 3 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/WatchList/i18n/de.json b/WatchList/i18n/de.json
index aa324c6..b1c5ddc 100644
--- a/WatchList/i18n/de.json
+++ b/WatchList/i18n/de.json
@@ -5,7 +5,6 @@
]
},
bs-watchlist-desc: Fügt ein Beobachtungsliste-Widget und Tag hinzu,
-   prefs-watchlist: Beobachtete Seiten,
bs-watchlist-title-sidebar: Beobachtete Seiten,
bs-watchlist-pref-widgetlimit: Anzahl der Einträge:,
bs-watchlist-pref-widgetsortodr: Sortieren nach:,
diff --git a/WatchList/i18n/en.json b/WatchList/i18n/en.json
index f999255..2ae70bd 100644
--- a/WatchList/i18n/en.json
+++ b/WatchList/i18n/en.json
@@ -5,7 +5,6 @@
]
},
bs-watchlist-desc: Adds a watchlist widget and tag,
-   prefs-watchlist: Watchlist,
bs-watchlist-title-sidebar: Watchlist,
bs-watchlist-pref-widgetlimit: Limit of entries:,
bs-watchlist-pref-widgetsortodr: Sort by:,
diff --git a/WatchList/i18n/qqq.json b/WatchList/i18n/qqq.json
index e91c4ab..2bfcb14 100644
--- a/WatchList/i18n/qqq.json
+++ b/WatchList/i18n/qqq.json
@@ -5,7 +5,6 @@
]
},
bs-watchlist-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of watchlist extension,
-   prefs-watchlist: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for watchlist section.\n{{Identical|Watchlist}},
bs-watchlist-title-sidebar: Headline for watchlist 
\n{{Identical|Watchlist}},
bs-watchlist-pref-widgetlimit: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for limit of entries:,
bs-watchlist-pref-widgetsortodr: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for sort by,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I713f2910ac4b9e91e3b07fbb776098de73ffafda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-01 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I1071bdba3c802a1c1cf6508017cfa56bcb43c58e
---
M WikiAdmin/WikiAdmin.class.php
M WikiAdmin/WikiAdmin.setup.php
A WikiAdmin/i18n/de-formal.json
A WikiAdmin/i18n/de.json
A WikiAdmin/i18n/en.json
A WikiAdmin/i18n/qqq.json
M WikiAdmin/languages/WikiAdmin.i18n.php
7 files changed, 121 insertions(+), 54 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/62/143262/1

diff --git a/WikiAdmin/WikiAdmin.class.php b/WikiAdmin/WikiAdmin.class.php
index 5f05ef9..2736543 100644
--- a/WikiAdmin/WikiAdmin.class.php
+++ b/WikiAdmin/WikiAdmin.class.php
@@ -24,22 +24,11 @@
   * http://www.gnu.org/copyleft/gpl.html
   *
   * For further information visit http://www.blue-spice.org
-  *
-  * Version information
-  * $LastChangedDate: 2013-06-25 11:17:54 +0200 (Di, 25 Jun 2013) $
-  * $LastChangedBy: rvogel $
-  * $Rev: 9912 $
-
   */
 
 /* Changelog
- * v1.20.0
- * - MediaWiki I18N
- * v0.1.0
- * FIRST CHANGES
+ * v2.23.0
  */
-
- // Last review: (01.07.11 01:58)
 
 class WikiAdmin extends BsExtensionMW {
 
@@ -196,4 +185,49 @@
 
wfProfileOut( 'BS::'.__METHOD__ );
}
+
+   /**
+* Adds WikiAdmin tab to main navigation
+* @param SkinTemplate $sktemplate
+* @param BaseTemplate $tpl
+* @return boolean Always true to keep hook running
+*/
+   public static function onSkinTemplateOutputPageBeforeExec( 
$sktemplate, $tpl ) {
+   if( $sktemplate-getUser()-isAllowed('wikiadmin') === false ) {
+   return true;
+   }
+
+   $oSpecialPage = SpecialPage::getTitleFor('WikiAdmin');
+   $aRegisteredModules = WikiAdmin::getRegisteredModules();
+
+   $aOut = array();
+   $aOut[] = 'ul';
+
+   foreach ( $aRegisteredModules as $sModuleKey = $aModulParams ) 
{
+   $skeyLower = mb_strtolower($sModuleKey);
+   $sModulLabel = wfMessage( 'bs-' . $skeyLower . '-label' 
)-plain();
+   $sUrl = $oSpecialPage-getLocalURL( array( 'mode' = 
$sModuleKey ) );
+   //$sUrl = str_replace( '', 'amp;', $sUrl );
+   $sLink = Html::element(
+   'a',
+   array(
+   'id' = 'bs-admin-'.$skeyLower,
+   'href' = $sUrl,
+   'title' = $sModulLabel
+   ),
+   $sModulLabel
+   );
+   $aOut[] = '  li'.$sLink.'/li';
+   }
+
+   $aOut[] = '/ul';
+
+   $tpl-data['bs_navigation_main']['bs-wikiadmin'] = array(
+   'position' = 100,
+   'label' = wfMessage('bs-tab_admin')-plain(),
+   'class' = 'icon-wrench',
+   'content' = implode( \n, $aOut )
+   );
+   return true;
+   }
 }
\ No newline at end of file
diff --git a/WikiAdmin/WikiAdmin.setup.php b/WikiAdmin/WikiAdmin.setup.php
index 03396ca..819c864 100644
--- a/WikiAdmin/WikiAdmin.setup.php
+++ b/WikiAdmin/WikiAdmin.setup.php
@@ -7,8 +7,9 @@
 $wgExtensionMessagesFiles['WikiAdmin'] = __DIR__ . 
'/languages/WikiAdmin.i18n.php';
 
 // Specialpage and messages
-$wgAutoloadClasses['SpecialWikiAdmin'] = __DIR__ . 
'/includes/specials/SpecialWikiAdmin.class.php'; # Location of the 
SpecialMyExtension class (Tell MediaWiki to load this file)
+$wgAutoloadClasses['SpecialWikiAdmin'] = __DIR__ . 
'/includes/specials/SpecialWikiAdmin.class.php';
 $wgSpecialPageGroups['SpecialWikiAdmin'] = 'bluespice';
-$wgExtensionMessagesFiles['WikiAdminAlias'] = __DIR__ . 
'/includes/specials/SpecialWikiAdmin.alias.php'; # Location of an aliases file 
(Tell MediaWiki to load this file)
-$wgSpecialPages['SpecialWikiAdmin'] = 'SpecialWikiAdmin'; # Tell MediaWiki 
about the new special page and its class name
+$wgExtensionMessagesFiles['WikiAdminAlias'] = __DIR__ . 
'/includes/specials/SpecialWikiAdmin.alias.php';
+$wgSpecialPages['SpecialWikiAdmin'] = 'SpecialWikiAdmin';
 
+$wgHooks['SkinTemplateOutputPageBeforeExec'][] = 
'WikiAdmin::onSkinTemplateOutputPageBeforeExec';
\ No newline at end of file
diff --git a/WikiAdmin/i18n/de-formal.json b/WikiAdmin/i18n/de-formal.json
new file mode 100644
index 000..20ecc84
--- /dev/null
+++ b/WikiAdmin/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-07-01 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: Ice4e7b5fade898e6f0a3821ab6e87d9d4a24c8a8
---
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
A TopMenuBarCustomizer/i18n/de.json
A TopMenuBarCustomizer/i18n/en.json
A TopMenuBarCustomizer/i18n/qqq.json
M TopMenuBarCustomizer/languages/TopMenuBarCustomizer.i18n.php
M TopMenuBarCustomizer/views/view.TopMenuItem.php
M TopMenuBarCustomizer/views/view.TopMenuItemMain.php
7 files changed, 142 insertions(+), 138 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/77/143277/1

diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php 
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 6d6e913..ac8efcb 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -17,7 +17,7 @@
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-* 
+*
 * This file is part of BlueSpice for MediaWiki
 * For further information visit http://www.blue-spice.org
 *
@@ -66,14 +66,12 @@
 */
public function initExt() {
//TODO: Add some error massages on article save (more than 5 
entrys etc.)
-   
$this-setHook('BSBlueSpiceSkin:ApplicationList','onBlueSpiceSkinApplicationList',
 true);
$this-setHook('BeforePageDisplay');
-   $this-setHook('EditFormPreloadText');
+   $this-setHook('SkinTemplateOutputPageBeforeExec');
 
-   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NuberOfLevels',   2, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-NumberOfLevels' );
-   
BsConfig::registerVar('MW::TopMenuBarCustomizer::DataSourceTitle', 
'TopBarMenu', BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING, 
'bs-topmenubarcustomizer-pref-DataSourceTitle' );
-   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NumberOfMainEntries', 10, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-NumberOfMainEntries', 'int' );
-   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NumberOfSubEntries',  25, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-NumberOfSubEntries', 'int' );
+   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NuberOfLevels',   2, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-numberoflevels' );
+   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NumberOfMainEntries', 10, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-numberofmainentries', 'int' );
+   
BsConfig::registerVar('MW::TopMenuBarCustomizer::NumberOfSubEntries',  25, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 
'bs-topmenubarcustomizer-pref-numberofsubentries', 'int' );
}
 
/**
@@ -88,67 +86,35 @@
}
 
/**
-* Hook-Handle for MW hook EditFormPreloadText
-* @param string $sText
-* @param Title $oTitle
-* @return boolean - always true
+* Overrides existing bs_navigation_topbar
+* @param SkinTemplate $sktemplate
+* @param BaseTemplate $tpl
+* @return boolean Always true to keep hook running
 */
-   public function onEditFormPreloadText($sText, $oTitle) {
-   if( 
!$oTitle-equals(Title::newFromText(BsConfig::get('MW::TopMenuBarCustomizer::DataSourceTitle'),
 NS_MEDIAWIKI)) ) return true;
-
-   global $wgUser;
-   $aApplications = BsConfig::get('MW::Applications');
-   $sCurrentApplicationContext = 
BsConfig::get('MW::ApplicationContext');
-   $aOut = array();
-   wfRunHooks( 'BSBlueSpiceSkin:ApplicationList', array( 
$aApplications, $sCurrentApplicationContext, $wgUser, $aOut, $this ) );
-
-   foreach($aApplications as $aApplication) {
-   $sText .= *{$aApplication['name']}\n;
+   public function onSkinTemplateOutputPageBeforeExec( $sktemplate, $tpl 
){
+   $oTopBarMenuTitle = Title::makeTitle( NS_MEDIAWIKI, 
'TopBarMenu' );
+   if( is_null($oTopBarMenuTitle ) || !$oTopBarMenuTitle-exists() 
) {
+   return true;
}
-
-   return true;
-   }
-
-   /**
-* Hook-Handler for BSBlueSpiceSkin:ApplicationList
-* @param Array $aApplications
-* @param String $sCurrentApplicationContext
-* @param User $wgUser
-* @param Array $aOut
-* @param Object $oSender
-

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-30 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I634421889e819d113c1ba3ce89870768d0149f8f
---
A WatchList/i18n/de-formal.json
A WatchList/i18n/de.json
A WatchList/i18n/en.json
A WatchList/i18n/qqq.json
M WatchList/languages/WatchList.i18n.php
5 files changed, 80 insertions(+), 40 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/WatchList/i18n/de-formal.json b/WatchList/i18n/de-formal.json
new file mode 100644
index 000..230a869
--- /dev/null
+++ b/WatchList/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-watchlist-tag-watchlist-desc: Erstellt eine Liste von Seiten, die 
eine noch nicht gesehene Änderung beinhalten und sich auf Ihrer 
Beobachtungsliste befinden.
+}
diff --git a/WatchList/i18n/de.json b/WatchList/i18n/de.json
new file mode 100644
index 000..aa324c6
--- /dev/null
+++ b/WatchList/i18n/de.json
@@ -0,0 +1,15 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-watchlist-desc: Fügt ein Beobachtungsliste-Widget und Tag hinzu,
+   prefs-watchlist: Beobachtete Seiten,
+   bs-watchlist-title-sidebar: Beobachtete Seiten,
+   bs-watchlist-pref-widgetlimit: Anzahl der Einträge:,
+   bs-watchlist-pref-widgetsortodr: Sortieren nach:,
+   bs-watchlist-pref-sort-time: Zeit,
+   bs-watchlist-pref-sort-title: Titel,
+   bs-watchlist-tag-watchlist-desc: Erstellt eine Liste von Seiten, die 
eine noch nicht gesehene Änderung beinhalten und sich auf deiner 
Beobachtungsliste befinden.
+}
diff --git a/WatchList/i18n/en.json b/WatchList/i18n/en.json
new file mode 100644
index 000..f999255
--- /dev/null
+++ b/WatchList/i18n/en.json
@@ -0,0 +1,15 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-watchlist-desc: Adds a watchlist widget and tag,
+   prefs-watchlist: Watchlist,
+   bs-watchlist-title-sidebar: Watchlist,
+   bs-watchlist-pref-widgetlimit: Limit of entries:,
+   bs-watchlist-pref-widgetsortodr: Sort by:,
+   bs-watchlist-pref-sort-time: Time,
+   bs-watchlist-pref-sort-title: Title,
+   bs-watchlist-tag-watchlist-desc: Creates a list of pages which are 
on your watchlist and have a non sighted change.
+}
diff --git a/WatchList/i18n/qqq.json b/WatchList/i18n/qqq.json
new file mode 100644
index 000..e91c4ab
--- /dev/null
+++ b/WatchList/i18n/qqq.json
@@ -0,0 +1,15 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-watchlist-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of watchlist extension,
+   prefs-watchlist: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for watchlist section.\n{{Identical|Watchlist}},
+   bs-watchlist-title-sidebar: Headline for watchlist 
\n{{Identical|Watchlist}},
+   bs-watchlist-pref-widgetlimit: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for limit of entries:,
+   bs-watchlist-pref-widgetsortodr: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for sort by,
+   bs-watchlist-pref-sort-time: Option in 
[[Special:Wiki_Adminmode=Preferences]], option for time,
+   bs-watchlist-pref-sort-title: Option in 
[[Special:Wiki_Adminmode=Preferences]], option for title,
+   bs-watchlist-tag-watchlist-desc: Used in InsertMagic extension, tag 
description for creates a list of pages which are on your watchlist and have a 
non sighted change.
+}
diff --git a/WatchList/languages/WatchList.i18n.php 
b/WatchList/languages/WatchList.i18n.php
index c7600ae..c6dc1ce 100644
--- a/WatchList/languages/WatchList.i18n.php
+++ b/WatchList/languages/WatchList.i18n.php
@@ -1,48 +1,35 @@
 ?php
 /**
- * Internationalisation file for WatchList
+ * 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 mug...@hallowelt.biz
- * @packageBlueSpice_Extensions
- * @subpackage UserManager
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- *

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-26 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved php i18n file into languages folder
Moved to Json i18n files

Change-Id: I20b9ae3e3a297d88a68cc1aa35588cbe9f6efd40
---
M WantedArticle/WantedArticle.class.php
D WantedArticle/WantedArticle.i18n.php
M WantedArticle/WantedArticle.setup.php
A WantedArticle/i18n/de-formal.json
A WantedArticle/i18n/de.json
A WantedArticle/i18n/en.json
A WantedArticle/i18n/qqq.json
M WantedArticle/languages/WantedArticle.i18n.php
M WantedArticle/resources/bluespice.wantedArticle.js
9 files changed, 210 insertions(+), 300 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/13/142213/1

diff --git a/WantedArticle/WantedArticle.class.php 
b/WantedArticle/WantedArticle.class.php
index 0f281f5..877afb9 100644
--- a/WantedArticle/WantedArticle.class.php
+++ b/WantedArticle/WantedArticle.class.php
@@ -358,13 +358,23 @@
 * @return always true to keep hook running
 */
public function onBSInsertMagicAjaxGetData( $oResponse, $type ) {
-   if( $type != 'tags' ) return true;
+   if ( $type != 'tags' ) return true;
+
+   $aParams = array(
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-count' )-text(),
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-title' )-text(),
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-order' )-text(),
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-sort' )-text(),
+   wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc-param-type' )-text()
+   );
+   $sDesc = wfMessage( 'bs-wantedarticle-tag-wantedarticle-desc' 
)-plain().
+   'br /br /' . implode( 'br /', $aParams );
 
$oResponse-result[] = array(
'id' = 'bs:wantedarticle',
'type' = 'tag',
'name' = 'wantedarticle',
-   'desc' = wfMessage( 
'bs-wantedarticle-tag-wantedarticle-desc' )-parse(),
+   'desc' = $sDesc,
'code' = 'bs:wantedarticle /',
);
 
@@ -488,19 +498,25 @@
}
 
if ( count( $aFoundChars )  0 ) {
-   $sErrorMsg  = wfMessage( 
'bs-wantedarticle-ajax-error-invalid-chars' )-plain();
-   $sErrorMsg .= implode( ', ', $aFoundChars );
+   $sChars = implode( ', ', $aFoundChars );
+   $sErrorMsg  = wfMessage( 
'bs-wantedarticle-title-invalid-chars', $sChars )-plain();
return json_encode( array('success' = false, 'message' 
= $sErrorMsg ) );
}
 
//Check if suggested page already exists
$oSuggestedTitle = Title::newFromText( 
$sSuggestedArticleWikiLink );
+   $sSuggestedTitle = $oSuggestedTitle-getPrefixedText();
if ( $oSuggestedTitle-exists() ) {
$sErrorMsg = wfMessage(

'bs-wantedarticle-ajax-error-suggested-page-already-exists',
-   $oSuggestedTitle-getPrefixedText()
+   $sSuggestedTitle
)-plain();
-   return json_encode(  array('success' = false, 
'message' = $sErrorMsg ) );
+   return json_encode(
+   array(
+   'success' = false,
+   'message' = $sErrorMsg
+   )
+   );
}
 
$oWantedArticle = BsExtensionManager::getExtension( 
'WantedArticle' );
@@ -513,9 +529,14 @@
if ( $oSuggestedTitle-equals( $aWish['title'] ) ){
$sErrorMsg = wfMessage(

'bs-wantedarticle-ajax-error-suggested-page-already-on-list',
-   $oSuggestedTitle-getPrefixedText()
+   $sSuggestedTitle
)-plain();
-   return json_encode( array('success' = true, 
'message' = $sErrorMsg ) );
+   return json_encode(
+   array(
+   'success' = true,
+   'message' = $sErrorMsg
+   )
+   );
}
if ( $bDeleteExisting

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-26 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Fixed path to i18n folder
Changed key description in qqq
Removed trailing dot
Fixed typo
Improved some messages
Changed order of messages
Small improvement for consistency in german

Change-Id: Ib96f3810d3cd57cd0c9b8e63c69585204d0bf0f4
---
A Blog/i18n/de.json
A Blog/i18n/en.json
A Blog/i18n/qqq.json
M Blog/languages/Blog.i18n.php
4 files changed, 117 insertions(+), 89 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/Blog/i18n/de.json b/Blog/i18n/de.json
new file mode 100644
index 000..4e5cb5c
--- /dev/null
+++ b/Blog/i18n/de.json
@@ -0,0 +1,30 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-blog-desc: Seiten werden in chronologischer Reihenfolge als 
Blog-Einträge dargestellt,
+   prefs-blog: Blog,
+   bs-blog-no-entries: Es sind keine Blog-Einträge vorhanden.,
+   bs-blog-comments: Kommentare,
+   bs-blog-read-more: Weiterlesen,
+   bs-blog-trackback: Trackback,
+   bs-blog-permalink: Permalink,
+   bs-blog-show-all: Alle Beiträge anzeigen,
+   bs-blog-form-inline-text: Titel ...,
+   bs-blog-form-title-text: Neuen Blogeintrag verfassen,
+   bs-blog-form-button-text: Erstellen,
+   bs-blog-blog: Blog,
+   bs-blog-pref-moreinnewwindow: Bei Klick auf weiterlesen ein neues 
Fenster öffnen,
+   bs-blog-pref-newentryfieldposition: Position des Formulars für neue 
Einträge:,
+   bs-blog-pref-showall: Link alle anzeigen darstellen,
+   bs-blog-pref-showinfo: Informationen über den Blogeintrag anzeigen,
+   bs-blog-pref-showlimit: Anzahl darzustellender Blog-Einträge:,
+   bs-blog-pref-shownewentryfield: Formular für neue Einträge anzeigen,
+   bs-blog-pref-showpermalink: Link Permalink anzeigen,
+   bs-blog-pref-sortby: Sortierung:,
+   bs-blog-pref-imagerendermode: Bilder anzeigen als:,
+   bs-blog-pref-maxentrycharacters: Anzahl darzustellender Wörter:,
+   bs-blog-tag-blog-desc: Zeigt Blog-Einträge auf jeder beliebigen 
Seite an.
+}
diff --git a/Blog/i18n/en.json b/Blog/i18n/en.json
new file mode 100644
index 000..caadefc
--- /dev/null
+++ b/Blog/i18n/en.json
@@ -0,0 +1,30 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-blog-desc: Displays a blog style list of pages,
+   prefs-blog: Blog,
+   bs-blog-no-entries: There are no blog entries.,
+   bs-blog-comments: Comments,
+   bs-blog-read-more: Read more,
+   bs-blog-trackback: Trackback,
+   bs-blog-permalink: Permalink,
+   bs-blog-show-all: Show all entries,
+   bs-blog-form-inline-text: Title ...,
+   bs-blog-form-title-text: Create new blog entry,
+   bs-blog-form-button-text: Create,
+   bs-blog-blog: Blog,
+   bs-blog-pref-moreinnewwindow: Open new window for read more,
+   bs-blog-pref-newentryfieldposition: Position for the new blog entry 
form:,
+   bs-blog-pref-showall: Show all entries link,
+   bs-blog-pref-showinfo: Show information about the entry,
+   bs-blog-pref-showlimit: Number of blog entries:,
+   bs-blog-pref-shownewentryfield: Show new blog entry form,
+   bs-blog-pref-showpermalink: Show permalink link,
+   bs-blog-pref-sortby: Sort by:,
+   bs-blog-pref-imagerendermode: Display pictures as:,
+   bs-blog-pref-maxentrycharacters: Number of words per entry:,
+   bs-blog-tag-blog-desc: Display blog entries on every page.
+}
diff --git a/Blog/i18n/qqq.json b/Blog/i18n/qqq.json
new file mode 100644
index 000..0e65dcb
--- /dev/null
+++ b/Blog/i18n/qqq.json
@@ -0,0 +1,30 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-blog-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]], 
description of blog extension,
+   prefs-blog: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for blog section in preferences. \\n {{Identical|Blog}},
+   bs-blog-no-entries: Text for there are no blog entries.,
+   bs-blog-comments: Anchor title for comments,
+   bs-blog-read-more: Anchor title for read more,
+   bs-blog-trackback: Anchor title for trackback,
+   bs-blog-permalink: Anchor title for permalink,
+   bs-blog-show-all: Anchor title for show all entries,
+   bs-blog-form-inline-text: input field default text for title ...,
+   bs-blog-form-title-text: Headline for create new blog entry,
+   bs-blog-form-button-text: Button label for create,
+   bs-blog-blog: Text for blog,
+   bs-blog-pref-moreinnewwindow: Option in

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-25 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Created languages folder
Moved php i18n file into languages folder
Moved to Json i18n files

Change-Id: Iac4676c3e5ac035d263431f955eaf95d30f0a704
---
M SecureFileStore/SecureFileStore.class.php
D SecureFileStore/SecureFileStore.i18n.php
M SecureFileStore/SecureFileStore.setup.php
A SecureFileStore/i18n/de.json
A SecureFileStore/i18n/en.json
A SecureFileStore/i18n/qqq.json
A SecureFileStore/languages/SecureFileStore.i18n.php
7 files changed, 114 insertions(+), 79 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/71/141971/1

diff --git a/SecureFileStore/SecureFileStore.class.php 
b/SecureFileStore/SecureFileStore.class.php
index b273d41..6d69a42 100644
--- a/SecureFileStore/SecureFileStore.class.php
+++ b/SecureFileStore/SecureFileStore.class.php
@@ -3,7 +3,7 @@
  * SecureFileStore extension for BlueSpice
  *
  * Prevent unauthorized access to files and images.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * 
+ *
  * This file is part of BlueSpice for MediaWiki
  * For further information visit http://www.blue-spice.org
  *
@@ -86,11 +86,11 @@
protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
BsExtensionManager::setContext( 'MW::SecureFileStore::Active' );
-   
-   BsConfig::registerVar( 'MW::SecureFileStore::Active',   
  true, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-securefilestore-pref-Active' );
-   BsConfig::registerVar( 
'MW::SecureFileStore::DefaultDisposition', 'inline', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-securefilestore-pref-DefaultDisposition', 'select' );
-   BsConfig::registerVar( 
'MW::SecureFileStore::DispositionInline',  array( 'pdf' ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-securefilestore-pref-DispositionInline', 'multiselectplusadd' );
-   BsConfig::registerVar( 
'MW::SecureFileStore::DispositionAttachment',  array( 'doc', 'docx', 'xls', 
'xlsx', 'ppt', 'pptx' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-securefilestore-pref-DispositionAttachment', 'multiselectplusadd' );
+
+   BsConfig::registerVar( 'MW::SecureFileStore::Active',   
  true, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT );
+   BsConfig::registerVar( 
'MW::SecureFileStore::DefaultDisposition', 'inline', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-securefilestore-pref-defaultdisposition', 'select' );
+   BsConfig::registerVar( 
'MW::SecureFileStore::DispositionInline',  array( 'pdf' ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-securefilestore-pref-dispositioninline', 'multiselectplusadd' );
+   BsConfig::registerVar( 
'MW::SecureFileStore::DispositionAttachment',  array( 'doc', 'docx', 'xls', 
'xlsx', 'ppt', 'pptx' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 
'bs-securefilestore-pref-dispositionattachment', 'multiselectplusadd' );
BsConfig::registerVar( 
'MW::SecureFileStore::FileExtensionWhitelist', array(), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING|BsConfig::RENDER_AS_JAVASCRIPT,
 'bs-securefilestore-pref-FileExtensionWhitelist', 'multiselectplusadd' );
 
$this-setHook( 'SkinTemplateOutputPageBeforeExec', 
'secureImages' );
@@ -107,7 +107,12 @@
}
 
public function runPreferencePlugin( $sAdapterName, $oVariable ) {
-   $aPrefs = array( 'options' = array( 'inline' = 'inline', 
'attachment' = 'attachment' ) );
+   $aPrefs = array(
+   'options' = array(
+   wfMessage( 
'bs-securefilestore-pref-defaultdisposition-brower' )-plain() = 'inline',
+   wfMessage( 
'bs-securefilestore-pref-defaultdisposition-external' )-plain() = 'attachment'
+   )
+   );
return $aPrefs;
}
 
@@ -115,7 +120,7 @@
 * Replaces links to files with links to secure file dispatcher.
 * @param object $oObject needed by hook
 * @param object $oText reference to skin template object
-

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-23 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

Moved to Json i18n files
Added rights message
Added periods to messages
Fixed some typos
Changed extensions description

Change-Id: Ib493680aa8cdaae988a3ff3788ef6b0ec4e71df2
---
M UniversalExport/UniversalExport.class.php
A UniversalExport/i18n/de-formal.json
A UniversalExport/i18n/de.json
A UniversalExport/i18n/en.json
A UniversalExport/i18n/qqq.json
M UniversalExport/languages/SpecialUniversalExport.alias.php
M UniversalExport/languages/UniversalExport.i18n.php
7 files changed, 137 insertions(+), 100 deletions(-)

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



diff --git a/UniversalExport/UniversalExport.class.php 
b/UniversalExport/UniversalExport.class.php
index dd07318..51bc3bb 100644
--- a/UniversalExport/UniversalExport.class.php
+++ b/UniversalExport/UniversalExport.class.php
@@ -122,8 +122,8 @@
 
BsConfig::registerVar( 
'MW::UniversalExport::CategoryWhitelist', $this-aCategoryWhitelist,  
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_STRING );
BsConfig::registerVar( 
'MW::UniversalExport::CategoryBlacklist', $this-aCategoryBlacklist,  
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_STRING );
-   BsConfig::registerVar( 'MW::UniversalExport::MetadataDefaults', 
 json_encode( $aMetadataDefaults ),  
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-MetadataDefaults', 'textarea' );
-   BsConfig::registerVar( 
'MW::UniversalExport::MetadataOverrides', json_encode( $aMetadataOverrides ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-MetadataOverrides', 'textarea' );
+   BsConfig::registerVar( 'MW::UniversalExport::MetadataDefaults', 
 json_encode( $aMetadataDefaults ),  
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-metadatadefaults', 'textarea' );
+   BsConfig::registerVar( 
'MW::UniversalExport::MetadataOverrides', json_encode( $aMetadataOverrides ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-metadataoverrides', 'textarea' );
BsConfig::registerVar( 'MW::UniversalExport::ParamsDefaults',   
 $this-aParamsDefaults, BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED 
);
BsConfig::registerVar( 'MW::UniversalExport::ParamsOverrides',  
 $this-aParamsOverrides,BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED 
);
 
diff --git a/UniversalExport/i18n/de-formal.json 
b/UniversalExport/i18n/de-formal.json
new file mode 100644
index 000..540273d
--- /dev/null
+++ b/UniversalExport/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-universalexport-error-permission: Sie haben nicht die 
erfoderlichen Rechte um diese Seite zu exportieren
+}
diff --git a/UniversalExport/i18n/de.json b/UniversalExport/i18n/de.json
new file mode 100644
index 000..1f8ebd1
--- /dev/null
+++ b/UniversalExport/i18n/de.json
@@ -0,0 +1,33 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-universalexport-desc: Stellt verschiedene Exportfunktionen 
bereit,
+   prefs-universalexport: Universal Export,
+   universalexport: Universal Export,
+   bs-universalexport-pref-metadatadefaults: Metadaten (Standard, 
JSON):,
+   bs-universalexport-pref-metadataoverrides: Metadaten (Übergeordnet, 
JSON):,
+   bs-universalexport-page-title-without-param: Universal Export: 
Module,
+   bs-universalexport-page-title-on-error: Universal Export: Fehler,
+   bs-universalexport-page-text-without-param: Diese Seite enthält 
Informationen über die derzeit installierten Export-Module des Universal 
Exports.,
+   bs-universalexport-page-text-without-param-no-modules-registered: Es 
sind keine Module registriert.,
+   bs-universalexport-widget-title: Export,
+   bs-universalexport-widget-tooltip: Die aktuelle Seite exportieren,
+   bs-universalexport-tag-pagebreak-text: Seitenumbruch,
+   bs-universalexport-tag-exclude-text: Dieser Text wird nicht 
exportiert.,
+   bs-universalexport-tag-hidetitle-text: Der Titel dieser Seite wird 
im Export nicht angezeigt.,
+   bs-universalexport-tag-excludearticle-text: Diese Seite kann nicht 
exportiert werden.,
+   bs-universalexport-error-requested-export-module-not-found: Das 
angeforderte Format kann nicht erzeugt werden.,
+   bs-universalexport-error-permission: Du hast

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-23 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I745d9ec16afc71a4bd6253812cf71684ace87424
---
M VisualEditor/VisualEditor.class.php
A VisualEditor/i18n/de.json
A VisualEditor/i18n/en.json
A VisualEditor/i18n/qqq.json
M VisualEditor/languages/VisualEditor.i18n.php
5 files changed, 157 insertions(+), 120 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/22/141422/1

diff --git a/VisualEditor/VisualEditor.class.php 
b/VisualEditor/VisualEditor.class.php
index 315df73..ef10529 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -209,19 +209,19 @@
);
$this-mExtensionKey = 'MW::VisualEditor';
 
-   BsConfig::registerVar('MW::VisualEditor::disableNS', 
array(NS_MEDIAWIKI), BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_ARRAY_INT | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-visualeditor-pref-disableNS', 
'multiselectex');
-   BsConfig::registerVar('MW::VisualEditor::defaultNoContextNS', 
array(NS_SPECIAL, NS_MEDIA, NS_FILE), BsConfig::LEVEL_PRIVATE | 
BsConfig::TYPE_ARRAY_INT, 'bs-visualeditor-pref-defaultNoContextNS', 
'multiselectex');
+   BsConfig::registerVar('MW::VisualEditor::disableNS', 
array(NS_MEDIAWIKI), BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_ARRAY_INT | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-visualeditor-pref-disablens', 
'multiselectex');
+   BsConfig::registerVar('MW::VisualEditor::defaultNoContextNS', 
array(NS_SPECIAL, NS_MEDIA, NS_FILE), BsConfig::LEVEL_PRIVATE | 
BsConfig::TYPE_ARRAY_INT, 'bs-visualeditor-pref-defaultnocontextns', 
'multiselectex');
 
-   BsConfig::registerVar('MW::VisualEditor::SpecialTags', array(), 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-SpecialTags');
-   BsConfig::registerVar('MW::VisualEditor::AllowedTags', array(), 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-AllowedTags');
+   BsConfig::registerVar('MW::VisualEditor::SpecialTags', array(), 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-specialtags');
+   BsConfig::registerVar('MW::VisualEditor::AllowedTags', array(), 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-allowedtags');
 
-   BsConfig::registerVar('MW::VisualEditor::Use', true, 
BsConfig::LEVEL_USER | BsConfig::TYPE_BOOL, 'bs-visualeditor-pref-Use', 
'toggle');
-   BsConfig::registerVar('MW::VisualEditor::UseLimited', false, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-UseLimited', 'toggle');
-   BsConfig::registerVar('MW::VisualEditor::UseForceLimited', 
false, BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | 
BsConfig::TYPE_BOOL, 'bs-visualeditor-pref-UseForceLimited', 'toggle');
+   BsConfig::registerVar('MW::VisualEditor::Use', true, 
BsConfig::LEVEL_USER | BsConfig::TYPE_BOOL, 'bs-visualeditor-pref-use', 
'toggle');
+   BsConfig::registerVar('MW::VisualEditor::UseLimited', false, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-uselimited', 'toggle');
+   BsConfig::registerVar('MW::VisualEditor::UseForceLimited', 
false, BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | 
BsConfig::TYPE_BOOL, 'bs-visualeditor-pref-useforcelimited', 'toggle');
 
-   BsConfig::registerVar('MW::VisualEditor::DebugMode', false, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-DebugMode');
-   BsConfig::registerVar('MW::VisualEditor::GuiMode', true, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-GuiMode');
-   BsConfig::registerVar('MW::VisualEditor::GuiSwitchable', true, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-GuiSwitchable');
+   BsConfig::registerVar('MW::VisualEditor::DebugMode', false, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-debugmode');
+   BsConfig::registerVar('MW::VisualEditor::GuiMode', true, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 
'bs-visualeditor-pref-guimode');
+   BsConfig::registerVar('MW::VisualEditor::GuiSwitchable', true, 
BsConfig::LEVEL_PRIVATE | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL,

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-20 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I634421889e819d113c1ba3ce89870768d0149f8f
---
A WatchList/i18n/de-formal.json
A WatchList/i18n/de.json
A WatchList/i18n/en.json
A WatchList/i18n/qqq.json
M WatchList/languages/WatchList.i18n.php
5 files changed, 80 insertions(+), 40 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/05/140905/1

diff --git a/WatchList/i18n/de-formal.json b/WatchList/i18n/de-formal.json
new file mode 100644
index 000..230a869
--- /dev/null
+++ b/WatchList/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-watchlist-tag-watchlist-desc: Erstellt eine Liste von Seiten, die 
eine noch nicht gesehene Änderung beinhalten und sich auf Ihrer 
Beobachtungsliste befinden.
+}
diff --git a/WatchList/i18n/de.json b/WatchList/i18n/de.json
new file mode 100644
index 000..aa324c6
--- /dev/null
+++ b/WatchList/i18n/de.json
@@ -0,0 +1,15 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-watchlist-desc: Fügt ein Beobachtungsliste-Widget und Tag hinzu,
+   prefs-watchlist: Beobachtete Seiten,
+   bs-watchlist-title-sidebar: Beobachtete Seiten,
+   bs-watchlist-pref-widgetlimit: Anzahl der Einträge:,
+   bs-watchlist-pref-widgetsortodr: Sortieren nach:,
+   bs-watchlist-pref-sort-time: Zeit,
+   bs-watchlist-pref-sort-title: Titel,
+   bs-watchlist-tag-watchlist-desc: Erstellt eine Liste von Seiten, die 
eine noch nicht gesehene Änderung beinhalten und sich auf deiner 
Beobachtungsliste befinden.
+}
diff --git a/WatchList/i18n/en.json b/WatchList/i18n/en.json
new file mode 100644
index 000..f999255
--- /dev/null
+++ b/WatchList/i18n/en.json
@@ -0,0 +1,15 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-watchlist-desc: Adds a watchlist widget and tag,
+   prefs-watchlist: Watchlist,
+   bs-watchlist-title-sidebar: Watchlist,
+   bs-watchlist-pref-widgetlimit: Limit of entries:,
+   bs-watchlist-pref-widgetsortodr: Sort by:,
+   bs-watchlist-pref-sort-time: Time,
+   bs-watchlist-pref-sort-title: Title,
+   bs-watchlist-tag-watchlist-desc: Creates a list of pages which are 
on your watchlist and have a non sighted change.
+}
diff --git a/WatchList/i18n/qqq.json b/WatchList/i18n/qqq.json
new file mode 100644
index 000..e91c4ab
--- /dev/null
+++ b/WatchList/i18n/qqq.json
@@ -0,0 +1,15 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-watchlist-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of watchlist extension,
+   prefs-watchlist: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for watchlist section.\n{{Identical|Watchlist}},
+   bs-watchlist-title-sidebar: Headline for watchlist 
\n{{Identical|Watchlist}},
+   bs-watchlist-pref-widgetlimit: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for limit of entries:,
+   bs-watchlist-pref-widgetsortodr: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for sort by,
+   bs-watchlist-pref-sort-time: Option in 
[[Special:Wiki_Adminmode=Preferences]], option for time,
+   bs-watchlist-pref-sort-title: Option in 
[[Special:Wiki_Adminmode=Preferences]], option for title,
+   bs-watchlist-tag-watchlist-desc: Used in InsertMagic extension, tag 
description for creates a list of pages which are on your watchlist and have a 
non sighted change.
+}
diff --git a/WatchList/languages/WatchList.i18n.php 
b/WatchList/languages/WatchList.i18n.php
index c7600ae..c6dc1ce 100644
--- a/WatchList/languages/WatchList.i18n.php
+++ b/WatchList/languages/WatchList.i18n.php
@@ -1,48 +1,35 @@
 ?php
 /**
- * Internationalisation file for WatchList
+ * 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 mug...@hallowelt.biz
- * @packageBlueSpice_Extensions
- * @subpackage UserManager
- * @copyright  Copyright (C)

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-18 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: Ib493680aa8cdaae988a3ff3788ef6b0ec4e71df2
---
M UniversalExport/UniversalExport.class.php
A UniversalExport/i18n/de-formal.json
A UniversalExport/i18n/de.json
A UniversalExport/i18n/en.json
A UniversalExport/i18n/qqq.json
M UniversalExport/languages/SpecialUniversalExport.alias.php
M UniversalExport/languages/UniversalExport.i18n.php
7 files changed, 134 insertions(+), 100 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/38/140338/1

diff --git a/UniversalExport/UniversalExport.class.php 
b/UniversalExport/UniversalExport.class.php
index dd07318..51bc3bb 100644
--- a/UniversalExport/UniversalExport.class.php
+++ b/UniversalExport/UniversalExport.class.php
@@ -122,8 +122,8 @@
 
BsConfig::registerVar( 
'MW::UniversalExport::CategoryWhitelist', $this-aCategoryWhitelist,  
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_STRING );
BsConfig::registerVar( 
'MW::UniversalExport::CategoryBlacklist', $this-aCategoryBlacklist,  
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_STRING );
-   BsConfig::registerVar( 'MW::UniversalExport::MetadataDefaults', 
 json_encode( $aMetadataDefaults ),  
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-MetadataDefaults', 'textarea' );
-   BsConfig::registerVar( 
'MW::UniversalExport::MetadataOverrides', json_encode( $aMetadataOverrides ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-MetadataOverrides', 'textarea' );
+   BsConfig::registerVar( 'MW::UniversalExport::MetadataDefaults', 
 json_encode( $aMetadataDefaults ),  
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-metadatadefaults', 'textarea' );
+   BsConfig::registerVar( 
'MW::UniversalExport::MetadataOverrides', json_encode( $aMetadataOverrides ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-metadataoverrides', 'textarea' );
BsConfig::registerVar( 'MW::UniversalExport::ParamsDefaults',   
 $this-aParamsDefaults, BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED 
);
BsConfig::registerVar( 'MW::UniversalExport::ParamsOverrides',  
 $this-aParamsOverrides,BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED 
);
 
diff --git a/UniversalExport/i18n/de-formal.json 
b/UniversalExport/i18n/de-formal.json
new file mode 100644
index 000..540273d
--- /dev/null
+++ b/UniversalExport/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-universalexport-error-permission: Sie haben nicht die 
erfoderlichen Rechte um diese Seite zu exportieren
+}
diff --git a/UniversalExport/i18n/de.json b/UniversalExport/i18n/de.json
new file mode 100644
index 000..7679d3e
--- /dev/null
+++ b/UniversalExport/i18n/de.json
@@ -0,0 +1,32 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-universalexport-desc: Ergänzt MediaWiki um verschiedene 
Exportfunktionen,
+   prefs-universalexport: Universal Export,
+   universalexport: Universal Export,
+   bs-universalexport-pref-metadatadefaults: Metadaten (Standard, 
JSON):,
+   bs-universalexport-pref-metadataoverrides: Metadaten (Übergeordnet, 
JSON):,
+   bs-universalexport-page-title-without-param: Universal Export: 
Module,
+   bs-universalexport-page-title-on-error: Universal Export: Fehler,
+   bs-universalexport-page-text-without-param: Diese Seite enthält 
Informationen über die derzeit installierten Export-Module des Universal 
Exports.,
+   bs-universalexport-page-text-without-param-no-modules-registered: Es 
sind keine Module registriert.,
+   bs-universalexport-widget-title: Export,
+   bs-universalexport-widget-tooltip: Die aktuelle Seite exportieren,
+   bs-universalexport-tag-pagebreak-text: Seitenumbruch,
+   bs-universalexport-tag-exclude-text: Dieser Text wird nicht 
exportiert.,
+   bs-universalexport-tag-hidetitle-text: Der Titel dieser Seite wird 
im Export nicht angezeigt.,
+   bs-universalexport-tag-excludearticle-text: Diese Seite kann nicht 
exportiert werden.,
+   bs-universalexport-error-requested-export-module-not-found: Das 
angeforderte Format kann nicht erzeugt werden.,
+   bs-universalexport-error-permission: Du hast nicht die erfoderlichen 
Rechte um diese Seite zu exportieren,
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-18 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved php i18n file into languages folder
Moved to Json i18n files

Change-Id: Ibc2844b060cc33e228ab002c632b036c775e87c2
---
M UEModulePDF/UEModulePDF.class.php
D UEModulePDF/UEModulePDF.i18n.php
M UEModulePDF/UEModulePDF.setup.php
A UEModulePDF/i18n/de-formal.json
A UEModulePDF/i18n/de.json
A UEModulePDF/i18n/en.json
A UEModulePDF/i18n/qqq.json
M UEModulePDF/includes/ExportModulePDF.class.php
A UEModulePDF/languages/UEModulePDF.i18n.php
9 files changed, 123 insertions(+), 82 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/54/140354/1

diff --git a/UEModulePDF/UEModulePDF.class.php 
b/UEModulePDF/UEModulePDF.class.php
index d296fef..7866211 100644
--- a/UEModulePDF/UEModulePDF.class.php
+++ b/UEModulePDF/UEModulePDF.class.php
@@ -82,12 +82,12 @@
protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
//Variables
-   BsConfig::registerVar( 'MW::UEModulePDF::PdfServiceURL',   
'http://localhost:8080/BShtml2PDF', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 
'bs-uemodulepdf-pref-PdfServiceURL' );
-   BsConfig::registerVar( 'MW::UEModulePDF::DefaultTemplate', 
'BlueSpice', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-uemodulepdf-pref-DefaultTemplate' );
-   BsConfig::registerVar( 'MW::UEModulePDF::SuppressNS',  
false,   BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-uemodulepdf-pref-SuppressNS', 'toggle' );
+   BsConfig::registerVar( 'MW::UEModulePDF::PdfServiceURL',   
'http://localhost:8080/BShtml2PDF', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 
'bs-uemodulepdf-pref-pdfserviceurl' );
+   BsConfig::registerVar( 'MW::UEModulePDF::DefaultTemplate', 
'BlueSpice', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-uemodulepdf-pref-templatepath' );
+   BsConfig::registerVar( 'MW::UEModulePDF::SuppressNS',  
false,   BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-uemodulepdf-pref-suppressns', 'toggle' );
/* This setting is no longer needed. We do not provide the old 
bn2pdf.war anymore */
-   BsConfig::registerVar( 'MW::UEModulePDF::Backend',
'BsPDFServlet', 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-uemodulepdf-pref-Backend' );
-   BsConfig::registerVar( 'MW::UEModulePDF::TemplatePath',   
'extensions/BlueSpiceFoundation/data/PDFTemplates', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 
'bs-uemodulepdf-pref-TemplatePath' );
+   BsConfig::registerVar( 'MW::UEModulePDF::Backend',
'BsPDFServlet', 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS );
+   BsConfig::registerVar( 'MW::UEModulePDF::TemplatePath',   
'extensions/BlueSpiceFoundation/data/PDFTemplates', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 
'bs-uemodulepdf-pref-templatepath' );
 
//Hooks
$this-setHook('BSUniversalExportGetWidget');
diff --git a/UEModulePDF/UEModulePDF.i18n.php b/UEModulePDF/UEModulePDF.i18n.php
deleted file mode 100644
index 0096bbb..000
--- a/UEModulePDF/UEModulePDF.i18n.php
+++ /dev/null
@@ -1,74 +0,0 @@
-?php
-/**
- * Internationalisation file for UEModulePDF
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage UEModulePDF
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['en'] = array(
-   'UEModulePDF'   = 
'UniversalExport PDF Module',
-   'prefs-UEModulePDF' = 
'UniversalExport PDF Module',
-   'bs-uemodulepdf-extension-description'  = 'Enables 
export to PDF',
-   'bs-uemodulepdf-pref-PdfServiceURL' = 'Backend 
URL',
-   'bs-uemodulepdf-pref-PDFenNS'   = 'Link for 
PDF single page',
-   'bs-uemodulepdf-pref-PDFwithATTenNS'= 'Link for 
PDF single page with attachments',
-   'bs-uemodulepdf-pref-TemplatePath'  = 'Path to 
templates',
-   'bs-uemodulepdf-pref-DefaultTemplate'   = 'Standard 
template',
-   'bs-uemodulepdf-pref-SuppressNS'= 'Hide 
namespace prefix in PDF',
-   'bs-uemodulepdf-pref-Backend'   = 'Backend',
-

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-17 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

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(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/89/140089/1

diff --git a/WhoIsOnline/i18n/de.json b/WhoIsOnline/i18n/de.json
new file mode 100644
index 000..9cbdd47
--- /dev/null
+++ b/WhoIsOnline/i18n/de.json
@@ -0,0 +1,19 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   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;anchortext: Der Text, an dem die Liste ausklappt.
+}
diff --git a/WhoIsOnline/i18n/en.json b/WhoIsOnline/i18n/en.json
new file mode 100644
index 000..c911ce8
--- /dev/null
+++ b/WhoIsOnline/i18n/en.json
@@ -0,0 +1,19 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   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;anchortext: 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 000..ac7cc6d
--- /dev/null
+++ b/WhoIsOnline/i18n/qqq.json
@@ -0,0 +1,19 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-whoisonline-desc: Used in 
[[Special:Wiki_Adminmode=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_Adminmode=Preferences]], 
headline for who is online section.\\n{{Identical|Who is online?}},
+   bs-whoisonline-pref-limitcount: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for maximum number of users 
shown:,
+   bs-whoisonline-pref-orderby: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for sort by:,
+   bs-whoisonline-pref-maxidletime: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for time in seconds until a user 
is marked as offline:,
+   bs-whoisonline-pref-orderby-time: Option in 
[[Special:Wiki_Adminmode=Preferences]], option label for uptime,
+   bs-whoisonline-pref-orderby-name: Option in 
[[Special:Wiki_Adminmode=Preferences]], option label for name,
+   bs-whoisonline-pref-interval: Option in 
[[Special:Wiki_Adminmode=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

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-17 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I5d147a9db396d4823b2ea86868bea8ca0e34a234
---
A PageTemplates/i18n/de-formal.json
A PageTemplates/i18n/de.json
A PageTemplates/i18n/en.json
A PageTemplates/i18n/qqq.json
M PageTemplates/languages/PageTemplates.i18n.php
5 files changed, 162 insertions(+), 126 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/98/140098/1

diff --git a/PageTemplates/i18n/de-formal.json 
b/PageTemplates/i18n/de-formal.json
new file mode 100644
index 000..63ee318
--- /dev/null
+++ b/PageTemplates/i18n/de-formal.json
@@ -0,0 +1,16 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-pagetemplates-empty-page-desc: Beginnen Sie mit einer leeren 
Seite.,
+   bs-pagetemplates-tpl-desc-toolong: Die Beschreibung ist zu lang. 
Geben Sie maximal 255 Zeichen an!,
+   bs-pagetemplates-tpl-label-toolong: Der Titel ist zu lang. Geben Sie 
maximal 255 Zeichen an!,
+   bs-pagetemplates-tpl-label-empty: Bitte geben Sie einen Titel ein.,
+   bs-pagetemplates-tpl-name-toolong: Der Name der Vorlage ist zu lang. 
Geben Sie maximal 255 Zeichen ein.,
+   bs-pagetemplates-tpl-name-empty: Bitte geben Sie eine Vorlage an.,
+   bs-pagetemplates-no-id: Bitte geben Sie eine Seite an, die als 
Vorlage verwendet werden soll.,
+   bs-pagetemplates-choose-template: Diese Seite existiert noch nicht. 
Sie können hier eine neue Seite verfassen. Falls Sie nichts eingeben möchten, 
klicken auf den Zurück-Button des Browsers, um zu der letzten Seite 
zurückzukehren.\n\nSie können aus einer dieser Vorlagen auswählen:,
+   bs-pagetemplates-confirm-deletetpl: Sind Sie sicher, dass Sie diese 
Vorlage löschen wollen?
+}
diff --git a/PageTemplates/i18n/de.json b/PageTemplates/i18n/de.json
new file mode 100644
index 000..b803e09
--- /dev/null
+++ b/PageTemplates/i18n/de.json
@@ -0,0 +1,39 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-pagetemplates-desc: Es können vorgefertigte Seitenvorlagen 
angelegt werden,
+   prefs-pagetemplates: Seitenvorlagen,
+   bs-pagetemplates-empty-page: Leere Seite,
+   bs-pagetemplates-empty-page-desc: Beginne mit einer leeren Seite.,
+   bs-pagetemplatesadmin-label: Seitenvorlagen,
+   bs-pagetemplates-tpl-desc-toolong: Die Beschreibung ist zu lang. Gib 
maximal 255 Zeichen an!,
+   bs-pagetemplates-tpl-label-toolong: Der Titel ist zu lang. Gib 
maximal 255 Zeichen an!,
+   bs-pagetemplates-tpl-label-empty: Bitte gib einen Titel ein.,
+   bs-pagetemplates-tpl-name-toolong: Der Name der Vorlage ist zu lang. 
Gib maximal 255 Zeichen ein.,
+   bs-pagetemplates-tpl-name-empty: Bitte gib eine Vorlage an.,
+   bs-pagetemplates-no-id: Bitte gib eine Seite an, die als Vorlage 
verwendet werden soll.,
+   bs-pagetemplates-tpl-added: Das Template wurde eingetragen.,
+   bs-pagetemplates-nooldtpl: Das urspruuml;ngliche Template wurde 
nicht gefunden.,
+   bs-pagetemplates-tpl-edited: Die Änderungen wurden übernommen.,
+   bs-pagetemplates-dberror: Es ist ein Datenbankfehler aufgetreten.,
+   bs-pagetemplates-tpl-deleted: Das Template wurde gelouml;scht.,
+   bs-pagetemplates-general-section: Allgemein,
+   bs-pagetemplates-choose-template: Diese Seite existiert noch nicht. 
Du kannst hier eine neue Seite verfassen. Falls Du nichts eingeben möchtest, 
klicke auf den Zurück-Button des Browsers, um zu der letzten Seite 
zurückzukehren.\n\nDu kannst aus einer dieser Vorlagen auswählen:,
+   bs-pagetemplates-pref-excludens: In diesen Namensräumen keine 
Vorlagen anzeigen:,
+   bs-pagetemplates-pref-forcenamespace: Ziel-Namensraum erzwingen,
+   bs-pagetemplates-pref-hideifnotintargetns: Vorlage verstecken, wenn 
die Seite nicht im Zielnamensraum angelegt wird,
+   bs-pagetemplates-headerlabel: Name,
+   bs-pagetemplates-headertargetnamespace: Namensraum,
+   bs-pagetemplates-tipeditdetails: Vorlage bearbeiten,
+   bs-pagetemplates-tipdeletetemplate: Vorlage löschen,
+   bs-pagetemplates-tipaddtemplate: Vorlage hinzufügen,
+   bs-pagetemplates-label-tpl: Name,
+   bs-pagetemplates-label-desc: Beschreibung,
+   bs-pagetemplates-label-targetns: Namensraum,
+   bs-pagetemplates-label-tplns: Vorlagen Namensraum,
+   bs-pagetemplates-label-article: Vorlage,
+   bs-pagetemplates-confirm-deletetpl: Bist du sicher, dass du diese 
Vorlage löschen willst?
+}
diff --git a/PageTemplates/i18n/en.json b/PageTemplates/i18n/en.json
new file mode 100644
index

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-17 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I8f02f4b573f682f7ace8147a88e529a07d4a595a
---
A UserPreferences/i18n/de.json
A UserPreferences/i18n/en.json
A UserPreferences/i18n/qqq.json
M UserPreferences/languages/UserPreferences.i18n.php
4 files changed, 51 insertions(+), 19 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/23/140123/1

diff --git a/UserPreferences/i18n/de.json b/UserPreferences/i18n/de.json
new file mode 100644
index 000..6187daf
--- /dev/null
+++ b/UserPreferences/i18n/de.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-userpreferences-desc: Generiert ein zusätzliches 
BlueSpice-Register in den Benutzereinstellungen
+}
diff --git a/UserPreferences/i18n/en.json b/UserPreferences/i18n/en.json
new file mode 100644
index 000..3dc4f1e
--- /dev/null
+++ b/UserPreferences/i18n/en.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-userpreferences-desc: Adds the BlueSpice tab in preferences
+}
diff --git a/UserPreferences/i18n/qqq.json b/UserPreferences/i18n/qqq.json
new file mode 100644
index 000..c5b7515
--- /dev/null
+++ b/UserPreferences/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-userpreferences-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of user preferences 
extension
+}
diff --git a/UserPreferences/languages/UserPreferences.i18n.php 
b/UserPreferences/languages/UserPreferences.i18n.php
index db7bc5c..1798b8d 100644
--- a/UserPreferences/languages/UserPreferences.i18n.php
+++ b/UserPreferences/languages/UserPreferences.i18n.php
@@ -1,27 +1,35 @@
 ?php
 /**
- * Internationalisation file for UserPreferences
+ * 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 mug...@hallowelt.biz
- * @packageBlueSpice_Extensions
- * @subpackage UserPreferences
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://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( 'wfJsonI18nShim031d7d45afd5215c' ) ) {
+   function wfJsonI18nShim031d7d45afd5215c( $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-userpreferences-desc' = 'Renders the BlueSpice tab in preferences.'
-);
+   $cachedData['deps'][] = new FileDependency( $fileName );
+   }
+   return true;
+   }
 
-$messages['de'] = array(
-   'bs-userpreferences-desc' = 'Generiert ein zusätzliches 
BlueSpice-Register in den Benutzereinstellungen.'
-);
-
-$messages['qqq'] = array(
-   'bs-userpreferences-desc' = 'Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of user preferences 
extension'
-);
\ No newline at end of file
+   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim031d7d45afd5215c';
+}

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

Gerrit-MessageType:

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-16 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: Ie8231d4a73ac299392b3975634fe2a54d300831b
---
M PagesVisited/PagesVisited.class.php
M PagesVisited/PagesVisited.setup.php
A PagesVisited/i18n/de-formal.json
A PagesVisited/i18n/de.json
A PagesVisited/i18n/en.json
A PagesVisited/i18n/qqq.json
M PagesVisited/languages/PagesVisited.i18n.php
7 files changed, 101 insertions(+), 73 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/23/139823/1

diff --git a/PagesVisited/PagesVisited.class.php 
b/PagesVisited/PagesVisited.class.php
index a8c4d7a..ca4cec9 100644
--- a/PagesVisited/PagesVisited.class.php
+++ b/PagesVisited/PagesVisited.class.php
@@ -90,9 +90,9 @@
$this-setHook( 'BSWidgetListHelperInitKeyWords' );
$this-setHook( 'BSInsertMagicAjaxGetData' );
 
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetLimit', 
 10, BsConfig::LEVEL_USER|BsConfig::TYPE_INT, 
'bs-pagesvisited-pref-WidgetLimit', 'int' );
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetNS', array( 
0 ), 
BsConfig::LEVEL_USER|BsConfig::TYPE_ARRAY_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
 'bs-pagesvisited-pref-WidgetNS', 'multiselectex' );
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetSortOdr',
'time', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-pagesvisited-pref-WidgetSortOdr', 'select' );
+   BsConfig::registerVar( 'MW::PagesVisited::WidgetLimit', 10, 
BsConfig::LEVEL_USER|BsConfig::TYPE_INT, 'bs-pagesvisited-pref-widgetlimit', 
'int' );
+   BsConfig::registerVar( 'MW::PagesVisited::WidgetNS', array( 0 
), 
BsConfig::LEVEL_USER|BsConfig::TYPE_ARRAY_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
 'bs-pagesvisited-pref-widgetns', 'multiselectex' );
+   BsConfig::registerVar( 'MW::PagesVisited::WidgetSortOdr', 
'time', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-pagesvisited-pref-widgetsortodr', 'select' );
 
wfProfileOut( 'BS::'.__METHOD__ );
}
@@ -108,7 +108,7 @@
switch( $oVariable-getName() ) {
case 'WidgetNS':
$aPrefs = array(
-   'type'= 'multiselectex',
+   'type' = 'multiselectex',
'options' = 
BsNamespaceHelper::getNamespacesForSelectOptions( array( -2, NS_MEDIA, 
NS_MEDIAWIKI, NS_MEDIAWIKI_TALK, NS_SPECIAL ) )
);
break;
@@ -148,7 +148,6 @@
 
/**
 * Event-Handler for 'MW::Utility::WidgetListHelper::InitKeywords'. 
Registers a callback for the PAGESVISITED Keyword.
-* @param BsEvent $oEvent The Event object
 * @param array $aKeywords An array of Keywords array( 'KEYWORD' = 
$callable )
 * @return array The appended array of Keywords array( 'KEYWORD' = 
$callable )
 */
@@ -163,7 +162,7 @@
 * @return bool Always true to keep hook running.
 */
public function onParserFirstCallInit( $oParser ) {
-   $oParser-setHook( 'pagesvisited',array( $this, 
'onPagesVisitedTag' ) );
+   $oParser-setHook( 'pagesvisited', array( $this, 
'onPagesVisitedTag' ) );
$oParser-setHook( 'bs:pagesvisited', array( $this, 
'onPagesVisitedTag' ) );
return true;
}
@@ -179,10 +178,10 @@
$oParser-disableCache();
$oErrorListView = new ViewTagErrorList( $this );
 
-   $iCount = BsCore::sanitizeArrayEntry( $aAttributes, 'count',
  5, BsPARAMTYPE::INT );
-   $iMaxTitleLength = BsCore::sanitizeArrayEntry( $aAttributes, 
'maxtitlelength',20, BsPARAMTYPE::INT );
-   $sNamespaces = BsCore::sanitizeArrayEntry( $aAttributes, 
'namespaces', 'all', BsPARAMTYPE::STRING | BsPARAMOPTION::CLEANUP_STRING );
-   $sSortOrder = BsCore::sanitizeArrayEntry( $aAttributes, 
'order',  'time', BsPARAMTYPE::STRING | BsPARAMOPTION::CLEANUP_STRING );
+   $iCount = BsCore::sanitizeArrayEntry( $aAttributes, 'count', 5, 
BsPARAMTYPE::INT );
+   $iMaxTitleLength = BsCore::sanitizeArrayEntry( $aAttributes, 
'maxtitlelength', 20, BsPARAMTYPE::INT );
+   $sNamespaces = BsCore::sanitizeArrayEntry( $aAttributes, 
'namespaces', 'all', BsPARAMTYPE::STRING | BsPARAMOPTION::CLEANUP_STRING );
+   $sSortOrder = BsCore::sanitizeArrayEntry( $aAttributes, 
'order', 'time', BsPARAMTYPE::STRING | BsPARAMOPTION::CLEANUP_STRING );
 
//Validation

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-16 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Moved to Json i18n files

Change-Id: I8407e91ee7751ae6116ab5befa634de683c8fbd0
---
M ShoutBox/ShoutBox.setup.php
A ShoutBox/i18n/de-formal.json
A ShoutBox/i18n/de.json
A ShoutBox/i18n/en.json
A ShoutBox/i18n/qqq.json
M ShoutBox/languages/ShoutBox.i18n.php
M ShoutBox/resources/bluespice.shoutBox.js
M ShoutBox/views/view.ShoutBox.php
8 files changed, 162 insertions(+), 118 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/31/139831/1

diff --git a/ShoutBox/ShoutBox.setup.php b/ShoutBox/ShoutBox.setup.php
index a70da25..0aa0c97 100644
--- a/ShoutBox/ShoutBox.setup.php
+++ b/ShoutBox/ShoutBox.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('ShoutBox', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
 
+$wgMessagesDirs['ShoutBox'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['ShoutBox'] = __DIR__ . 
'/languages/ShoutBox.i18n.php';
 $wgExtensionMessagesFiles['ShoutBoxMagic'] = __DIR__ . 
'/languages/ShoutBox.i18n.magic.php';
 
@@ -14,16 +16,17 @@
'scripts' = 'bluespice.shoutBox.js',
'dependencies' = 'ext.bluespice',
'messages' = array(
-   'bs-shoutbox-confirm_text',
-   'bs-shoutbox-confirm_title',
-   'bs-shoutbox-enterMessage',
-   'bs-shoutbox-too-early'
+   'bs-shoutbox-confirm-text',
+   'bs-shoutbox-confirm-title',
+   'bs-shoutbox-entermessage',
+   'bs-shoutbox-too-early',
+   'bs-shoutbox-charactersleft'
),
'position' = 'bottom'
 ) + $aResourceModuleTemplate;
 
 $wgResourceModules['ext.bluespice.shoutbox.styles'] = array(
-   'styles'  = 'bluespice.shoutBox.css',
+   'styles' = 'bluespice.shoutBox.css',
 ) + $aResourceModuleTemplate;
 
 unset( $aResourceModuleTemplate );
diff --git a/ShoutBox/i18n/de-formal.json b/ShoutBox/i18n/de-formal.json
new file mode 100644
index 000..d4d1853
--- /dev/null
+++ b/ShoutBox/i18n/de-formal.json
@@ -0,0 +1,11 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-shoutbox-archive-failure: Beim Löschen des Eintrags ist ein Fehler 
aufgetreten, bitte versuchen Sie es erneut.,
+bs-shoutbox-confirm-text: Möchten Sie diesen Eintrag wirklich löschen?,
+bs-shoutbox-entermessage: Bitte geben Sie eine Nachricht ein.,
+bs-shoutbox-too-early: Bitte warten Sie ein paar Sekunden, bevor Sie 
den nächsten Eintrag abschicken.
+}
diff --git a/ShoutBox/i18n/de.json b/ShoutBox/i18n/de.json
new file mode 100644
index 000..7c44e6a
--- /dev/null
+++ b/ShoutBox/i18n/de.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-shoutbox-desc: Stellt eine Shoutbox unterhalb jeder Seite bereit,
+prefs-shoutbox: Shoutbox,
+bs-shoutbox-title: Shoutbox,
+bs-shoutbox-message: Mitteilung,
+bs-shoutbox-shout: Schicken,
+bs-shoutbox-no-entries: Bisher wurden keine Mitteilungen gesendet.,
+bs-shoutbox-loading: Lade...,
+bs-shoutbox-pref-committimeinterval: Zeit zwischen zwei Eintragungen 
(Sekunden):,
+bs-shoutbox-pref-maxmessagelength: Maximale Länge der Mittelungen,
+bs-shoutbox-pref-numberofshouts: Anzahl der dargestellten Mitteilungen,
+bs-shoutbox-pref-showage: Alter der Mitteilung anzeigen,
+bs-shoutbox-pref-showuser: Sender der Mitteilung anzeigen,
+bs-shoutbox-pref-allowarchive: Benutzer können ihre eigenen Einträge 
löschen,
+bs-shoutbox-archive-success: Eintrag wurde erfolgreich gelöscht.,
+bs-shoutbox-archive-failure: Beim Löschen des Eintrags ist ein Fehler 
aufgetreten, bitte versuche es erneut.,
+bs-shoutbox-archive-failure-user: Einträge können nur von deren Autor 
gelöscht werden.,
+bs-shoutbox-switch-description: Shoutbox wird auf dieser Seite nicht 
angezeigt,
+bs-shoutbox-pref-show: Shoutbox anzeigen,
+bs-shoutbox-charactersleft: $1 Zeichen übrig,
+bs-shoutbox-confirm-text: Möchtest du diesen Eintrag wirklich löschen?,
+bs-shoutbox-confirm-title: Bestätigen,
+bs-shoutbox-entermessage: Bitte gib eine Nachricht ein.,
+bs-shoutbox-too-early: Bitte warte ein paar Sekunden, bevor du den 
nächsten Eintrag abschickst.
+}
diff --git a/ShoutBox/i18n/en.json b/ShoutBox/i18n/en.json
new file mode 100644
index 000..acbbb84
--- /dev/null
+++ b/ShoutBox/i18n/en.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-shoutbox-desc: Adds a shoutbox after the content of a page,
+prefs-shoutbox: Shoutbox,
+bs-shoutbox-title: Shoutbox,
+bs-shoutbox-message: Message,
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-14 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

* Removed trailing dot

Change-Id: I31bb92d6a008a37475b0807e062f69470a99f941
---
A InsertLink/i18n/de.json
A InsertLink/i18n/en.json
A InsertLink/i18n/qqq.json
M InsertLink/languages/InsertLink.i18n.php
4 files changed, 102 insertions(+), 68 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/InsertLink/i18n/de.json b/InsertLink/i18n/de.json
new file mode 100644
index 000..682bcdd
--- /dev/null
+++ b/InsertLink/i18n/de.json
@@ -0,0 +1,25 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz,
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertlink-desc: Über ein Dialogfeld werden Links, z.B. zu 
bestehenden Seiten, eingebunden,
+   bs-insertlink: Link einfügen,
+   bs-insertlink-button-title: Link einfügen/bearbeiten,
+   bs-insertlink-dialog-title: Link einfügen,
+   bs-insertlink-tab-wiki-page: Wiki-Seite,
+   bs-insertlink-tab-ext-link: Externer Link,
+   bs-insertlink-tab-email: E-Mail-Link,
+   bs-insertlink-tab-ext-file: Link auf Datei,
+   bs-insertlink-label-page: Seite,
+   bs-insertlink-label-link: Link,
+   bs-insertlink-label-mail: E-Mail Adresse,
+   bs-insertlink-label-description: Beschreibung,
+   bs-insertlink-label-file: Datei,
+   bs-insertlink-label-searchfile: Durchsuchen ...,
+   bs-insertlink-select-a-page: Ziel wählen ...,
+   bs-insertlink-select-a-namespace: (Seiten),
+   bs-insertlink-empty-field-text: Um einen Link einzufügen muss ein 
Ziel angegeben werden.
+}
diff --git a/InsertLink/i18n/en.json b/InsertLink/i18n/en.json
new file mode 100644
index 000..37c3aac
--- /dev/null
+++ b/InsertLink/i18n/en.json
@@ -0,0 +1,25 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz,
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertlink-desc: Dialogbox to enter a link,
+   bs-insertlink: Insert link,
+   bs-insertlink-button-title: Insert/edit link,
+   bs-insertlink-dialog-title: Insert link,
+   bs-insertlink-tab-wiki-page: Wiki page,
+   bs-insertlink-tab-ext-link: External link,
+   bs-insertlink-tab-email: Email-link,
+   bs-insertlink-tab-ext-file: Link to file,
+   bs-insertlink-label-page: Page,
+   bs-insertlink-label-link: Link,
+   bs-insertlink-label-mail: Email address,
+   bs-insertlink-label-description: Description,
+   bs-insertlink-label-file: File,
+   bs-insertlink-label-searchfile: Search ...,
+   bs-insertlink-select-a-page: Choose target ...,
+   bs-insertlink-select-a-namespace: (Pages),
+   bs-insertlink-empty-field-text: To insert a link you need to state a 
destination.
+}
diff --git a/InsertLink/i18n/qqq.json b/InsertLink/i18n/qqq.json
new file mode 100644
index 000..c298706
--- /dev/null
+++ b/InsertLink/i18n/qqq.json
@@ -0,0 +1,25 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertlink-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of insert link 
extension,
+   bs-insertlink: Insert link,
+   bs-insertlink-button-title: The title of the button that opens the 
dialog. It is shown on mouse over,
+   bs-insertlink-dialog-title: The title of the dialog window,
+   bs-insertlink-tab-wiki-page: The title of the tab containing the 
controls of a wiki page link,
+   bs-insertlink-tab-ext-link: The title of the tab containing the 
controls of an external link,
+   bs-insertlink-tab-email: The title of the tab containing the 
controls of an e-mail link,
+   bs-insertlink-tab-ext-file: The title of the tab containing the 
controls of external filesystem link,
+   bs-insertlink-label-page: The label of the page drop down field,
+   bs-insertlink-label-link: The label of the link textfield,
+   bs-insertlink-label-mail: The label of the mail textfield,
+   bs-insertlink-label-description: The label of the description 
textfield,
+   bs-insertlink-label-file: The label of the file input field,
+   bs-insertlink-label-searchfile: The text of the search file button,
+   bs-insertlink-select-a-page: The empty message for the page drop 
down field,
+   bs-insertlink-select-a-namespace: The empty message for the 
namespace drop down field. Attention: this shows the mainspace lable as 
default,
+   bs-insertlink-empty-field-text: The error message when the link 
field was empty.
+}
diff --git

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-10 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

* Removed trailing dot

Change-Id: I8373ae748dfe9f80c8885cd9c27d2a423b09edb6
---
A ExtensionInfo/i18n/de.json
A ExtensionInfo/i18n/en.json
A ExtensionInfo/i18n/qqq.json
M ExtensionInfo/languages/ExtensionInfo.i18n.php
4 files changed, 81 insertions(+), 50 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/ExtensionInfo/i18n/de.json b/ExtensionInfo/i18n/de.json
new file mode 100644
index 000..01eaef8
--- /dev/null
+++ b/ExtensionInfo/i18n/de.json
@@ -0,0 +1,18 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-extensioninfo-desc: Informationsliste über den eingebundenen 
Erweiterungen,
+   bs-extensioninfo-label: Erweiterungen,
+   bs-extensioninfo-version: Version,
+   bs-extensioninfo-software: Software,
+   extensioninfo: Erweiterungen,
+   bs-extensioninfo-headerextname: Name der Erweiterung,
+   bs-extensioninfo-headerversion: Version,
+   bs-extensioninfo-headerdesc: Beschreibung,
+   bs-extensioninfo-headerstatus: Status,
+   bs-extensioninfo-headerpackage: Paket,
+   bs-extensioninfo-groupingtemplateviewtext: 
{{PLURAL:$1|Element|Elemente}}
+}
diff --git a/ExtensionInfo/i18n/en.json b/ExtensionInfo/i18n/en.json
new file mode 100644
index 000..ebecc8b
--- /dev/null
+++ b/ExtensionInfo/i18n/en.json
@@ -0,0 +1,18 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-extensioninfo-desc: Information list about the loaded extensions,
+   bs-extensioninfo-label: Extensions,
+   bs-extensioninfo-software: Software,
+   bs-extensioninfo-version: Version,
+   extensioninfo: Extensions,
+   bs-extensioninfo-headerextname: Extension name,
+   bs-extensioninfo-headerversion: Version,
+   bs-extensioninfo-headerdesc: Description,
+   bs-extensioninfo-headerstatus: Status,
+   bs-extensioninfo-headerpackage: Package,
+   bs-extensioninfo-groupingtemplateviewtext: 
{{PLURAL:$1|element|elements}}
+}
diff --git a/ExtensionInfo/i18n/qqq.json b/ExtensionInfo/i18n/qqq.json
new file mode 100644
index 000..e8e9005
--- /dev/null
+++ b/ExtensionInfo/i18n/qqq.json
@@ -0,0 +1,18 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-extensioninfo-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of extension info 
extension,
+   bs-extensioninfo-label: Anchor text in admin tab for extensions\\n 
{{Identical|Extensions}},
+   bs-extensioninfo-software: Table header for software,
+   bs-extensioninfo-version: Table header for version,
+   extensioninfo: Special page name for extensions,
+   bs-extensioninfo-headerextname: Label for extension name,
+   bs-extensioninfo-headerversion: Label for version,
+   bs-extensioninfo-headerdesc: Label for description,
+   bs-extensioninfo-headerstatus: Label for status,
+   bs-extensioninfo-headerpackage: Label for package,
+   bs-extensioninfo-groupingtemplateviewtext: Text for 
element/elements, $1 is the number of elements for PLURAL distinction
+}
diff --git a/ExtensionInfo/languages/ExtensionInfo.i18n.php 
b/ExtensionInfo/languages/ExtensionInfo.i18n.php
index ebb23b5..a7b5ce3 100644
--- a/ExtensionInfo/languages/ExtensionInfo.i18n.php
+++ b/ExtensionInfo/languages/ExtensionInfo.i18n.php
@@ -1,58 +1,35 @@
 ?php
 /**
- * Internationalisation file for ExtensionInfo
+ * 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 mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage ExtensionInfo
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://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( 'wfJsonI18nShim7194908c26f154ed' ) ) {
+   function wfJsonI18nShim7194908c26f154ed( $cache, $code, $cachedData ) {
+   $codeSequence = array_merge( array( $code ),

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-04 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

* Removed trailing dot
* Seperated messages to make easier for translators

Change-Id: Idee19ee240226004ef0b960f46d2ec7d1100cb79
---
A ExtendedEditBar/i18n/de.json
A ExtendedEditBar/i18n/en.json
A ExtendedEditBar/i18n/qqq.json
M ExtendedEditBar/languages/ExtendedEditBar.i18n.php
4 files changed, 117 insertions(+), 64 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/ExtendedEditBar/i18n/de.json b/ExtendedEditBar/i18n/de.json
new file mode 100644
index 000..251cb0e
--- /dev/null
+++ b/ExtendedEditBar/i18n/de.json
@@ -0,0 +1,30 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-extendededitbar-desc: Stellt zusätzliche Funktionen im 
WikiCode-Editor zur Verfügung,
+   bs-extendededitbar-redirecttip: Umleiten,
+   bs-extendededitbar-redirectsample: Ziel eingeben,
+   bs-extendededitbar-striketip: Durchstreichen,
+   bs-extendededitbar-strikesample: Durchgestrichener Text,
+   bs-extendededitbar-entertip: Zeilenumbruch,
+   bs-extendededitbar-uppertip: Hochgestellt,
+   bs-extendededitbar-uppersample: Hochgestellter Text,
+   bs-extendededitbar-lowertip: Tiefgestellt,
+   bs-extendededitbar-lowersample: Tiefgestellter Text,
+   bs-extendededitbar-smalltip: Klein,
+   bs-extendededitbar-smallsample: Kleiner Text,
+   bs-extendededitbar-commenttip: Versteckter Kommentar,
+   bs-extendededitbar-commentsample: Kommentar,
+   bs-extendededitbar-gallerytip: Bildergalerie,
+   bs-extendededitbar-gallerysamplepicture: Bild,
+   bs-extendededitbar-gallerysamplecaption: Überschrift,
+   bs-extendededitbar-quotetip: Zitat einfügen,
+   bs-extendededitbar-quotesample: Zitat,
+   bs-extendededitbar-tabletip: Tabelle einfügen,
+   bs-extendededitbar-tablesampleheader: Überschrift,
+   bs-extendededitbar-tablesamplerow: Zeile,
+   bs-extendededitbar-tablesamplecell: Zelle
+}
diff --git a/ExtendedEditBar/i18n/en.json b/ExtendedEditBar/i18n/en.json
new file mode 100644
index 000..61b05cf
--- /dev/null
+++ b/ExtendedEditBar/i18n/en.json
@@ -0,0 +1,30 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-extendededitbar-desc: Provides additional buttons to the wiki 
edit field,
+   bs-extendededitbar-redirecttip: Redirect,
+   bs-extendededitbar-redirectsample: Insert text,
+   bs-extendededitbar-striketip: Strike,
+   bs-extendededitbar-strikesample: Strike-through text,
+   bs-extendededitbar-entertip: Line break,
+   bs-extendededitbar-uppertip: Superscript,
+   bs-extendededitbar-uppersample: Superscript text,
+   bs-extendededitbar-lowertip: Subscript,
+   bs-extendededitbar-lowersample: Subscript text,
+   bs-extendededitbar-smalltip: Small,
+   bs-extendededitbar-smallsample: Small text,
+   bs-extendededitbar-commenttip: Insert hidden comment,
+   bs-extendededitbar-commentsample: Comment,
+   bs-extendededitbar-gallerytip: Insert a picture gallery,
+   bs-extendededitbar-gallerysamplepicture: Picture,
+   bs-extendededitbar-gallerysamplecaption: Caption,
+   bs-extendededitbar-quotetip: Insert a block of quoted text,
+   bs-extendededitbar-quotesample: Block quote,
+   bs-extendededitbar-tabletip: Insert a table,
+   bs-extendededitbar-tablesampleheader: Header,
+   bs-extendededitbar-tablesamplerow: Row,
+   bs-extendededitbar-tablesamplecell: Cell
+}
diff --git a/ExtendedEditBar/i18n/qqq.json b/ExtendedEditBar/i18n/qqq.json
new file mode 100644
index 000..46c0283
--- /dev/null
+++ b/ExtendedEditBar/i18n/qqq.json
@@ -0,0 +1,30 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-extendededitbar-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of extended edit bar 
extension,
+   bs-extendededitbar-redirecttip: Text for redirect,
+   bs-extendededitbar-redirectsample: Text for insert text,
+   bs-extendededitbar-striketip: Text for strike,
+   bs-extendededitbar-strikesample: Text for strike-through text,
+   bs-extendededitbar-entertip: Text for line break,
+   bs-extendededitbar-uppertip: Text for superscript,
+   bs-extendededitbar-uppersample: Text for superscript text,
+   bs-extendededitbar-lowertip: Text for subscript,
+   bs-extendededitbar-lowersample: Text for subscript text,
+   bs-extendededitbar-smalltip: Text for small,
+   bs-extendededitbar-smallsample: Text for small text,
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-04 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

* Removed trailing dot

Change-Id: I2e0ddc35f925654b6d637232f818e5cdd12d7ec6
---
A InsertCategory/i18n/de-formal.json
A InsertCategory/i18n/de.json
A InsertCategory/i18n/en.json
A InsertCategory/i18n/qqq.json
M InsertCategory/languages/InsertCategory.i18n.php
5 files changed, 86 insertions(+), 69 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/InsertCategory/i18n/de-formal.json 
b/InsertCategory/i18n/de-formal.json
new file mode 100644
index 000..c1717b2
--- /dev/null
+++ b/InsertCategory/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertcategory-hint: Hinweis: Um eine Kategorie hinzuzufügen, 
müssen Sie Enter drücken oder die Eingabe mit einem Komma beenden.
+}
diff --git a/InsertCategory/i18n/de.json b/InsertCategory/i18n/de.json
new file mode 100644
index 000..78f00f6
--- /dev/null
+++ b/InsertCategory/i18n/de.json
@@ -0,0 +1,17 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertcategory-desc: Über ein Dialogfeld lassen sich Kategorien 
in eine Wikiseite einfügen,
+   bs-insertcategory-insertcat: Kategorie einfügen,
+   prefs-insertcategory: Kategorie einfügen,
+   bs-insertcategory-pref-WithParents: Füge Kategorien inklusive ihrer 
Elternkategorien ein,
+   bs-insertcategory-title: Kategorie einfügen,
+   bs-insertcategory-cat-label: Zugewiesen:,
+   bs-insertcategory-success: Kategorie erfolgreich hinzugefügt,
+   bs-insertcategory-failure: Fehler,
+   bs-insertcategory-hint: Hinweis: Um eine Kategorie hinzuzufügen, 
musst Du Enter drücken oder die Eingabe mit einem Komma beenden.,
+   bs-insertcategory-panel-title: Kategorien
+}
diff --git a/InsertCategory/i18n/en.json b/InsertCategory/i18n/en.json
new file mode 100644
index 000..2b4acec
--- /dev/null
+++ b/InsertCategory/i18n/en.json
@@ -0,0 +1,17 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertcategory-desc: Dialog to enter a category link,
+   bs-insertcategory-insertcat: Insert category,
+   prefs-insertcategory: Insert category,
+   bs-insertcategory-pref-withparents: Insert category with its 
parents,
+   bs-insertcategory-title: Insert category,
+   bs-insertcategory-cat-label: Assigned:,
+   bs-insertcategory-success: Add category successful,
+   bs-insertcategory-failure: Error,
+   bs-insertcategory-hint: Note: to add a category, you have to press 
enter or terminate your entry with a comma.,
+   bs-insertcategory-panel-title: Categories
+}
diff --git a/InsertCategory/i18n/qqq.json b/InsertCategory/i18n/qqq.json
new file mode 100644
index 000..505ef89
--- /dev/null
+++ b/InsertCategory/i18n/qqq.json
@@ -0,0 +1,17 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertcategory-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of insert category 
extension,
+   bs-insertcategory-insertcat: Text for insert category\\n 
{{Identical|Insert category}},
+   prefs-insertcategory: Used in 
[[Special:Wiki_Adminmode=Preferences]], headline for insert category 
section.\\n{{Identical|Insert category}},
+   bs-insertcategory-pref-withparents: Option in 
[[Special:Wiki_Adminmode=Preferences]], checkbox label for insert category 
with its parents,
+   bs-insertcategory-title: Window title for insert category,
+   bs-insertcategory-cat-label: Label for assigned:,
+   bs-insertcategory-success: Text for add category successful,
+   bs-insertcategory-failure: Text for error,
+   bs-insertcategory-hint: Text for note: to add a category, you have 
to press enter or terminate your entry with a comma.,
+   bs-insertcategory-panel-title: Title for categories
+}
diff --git a/InsertCategory/languages/InsertCategory.i18n.php 
b/InsertCategory/languages/InsertCategory.i18n.php
index 9bccb4e..e5e5483 100644
--- a/InsertCategory/languages/InsertCategory.i18n.php
+++ b/InsertCategory/languages/InsertCategory.i18n.php
@@ -1,77 +1,35 @@
 ?php
 /**
- * Internationalisation file for InsertCategory
+ * 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

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-04 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

* Removed trailing dot

Change-Id: Icb53ef286ac8ca4c13bf7f790c704bef4f566c12
---
D PageAccess/PageAccess.i18n.php
A PageAccess/i18n/de-formal.json
A PageAccess/i18n/de.json
A PageAccess/i18n/en.json
A PageAccess/i18n/qqq.json
A PageAccess/languages/PageAccess.i18n.php
6 files changed, 89 insertions(+), 46 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/PageAccess/PageAccess.i18n.php b/PageAccess/PageAccess.i18n.php
deleted file mode 100644
index 371c960..000
--- a/PageAccess/PageAccess.i18n.php
+++ /dev/null
@@ -1,46 +0,0 @@
-?php
-/**
- * Internationalisation file for PageAccess
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Marc Reymann reym...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage CountThings
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['de'] = array(
-   'bs-pageaccess-extension-description'  = 'Regelt den 
Zugriff auf Seitenebene.',
-   'PageAccess'   = 'PageAccess',
-   'bs-pageaccess-error-no-groups-given'  = 'Es wurden keine 
Gruppen angegeben. Verwende das Tag wie folgt: bs:pageaccess groups=sysop 
/',
-   'bs-pageaccess-error-not-member-of-given-groups'   = 'Du bist nicht 
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Du dich aus der Seite 
aussperrst, wurde das Speichern deaktiviert.',
-   'bs-pageaccess-error-included-forbidden-template'  = 'Du hast das 
Template $1 eingebunden, auf das du keine Leseberechtigung hast. Um zu 
verhindern, dass Du dich aus der Seite aussperrst, wurde das Speichern 
deaktiviert.',
-   'bs-pageaccess-tag-groups-desc'= 'Gib die Gruppen 
an, die exklusiven Zugriff auf die Seite erhalten sollen. Mehrere Gruppen 
können durch Kommata getrennt werden.',
-   'pageaccess'   = 'Durch PageAccess 
geschützte Seiten'
-);
-
-$messages['de-formal'] = array(
-   'bs-pageaccess-error-no-groups-given'  = 'Es wurden keine 
Gruppen angegeben. Verwenden Sie das Tag wie folgt: bs:pageaccess 
groups=sysop /',
-   'bs-pageaccess-error-not-member-of-given-groups'   = 'Sie sind nicht 
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Sie sich aus der Seite 
aussperren, wurde das Speichern deaktiviert.',
-   'bs-pageaccess-error-included-forbidden-template'  = 'Sie haben das 
Template $1 eingebunden, auf das Sie keine Leseberechtigung haben. Um zu 
verhindern, dass Sie sich aus der Seite aussperren, wurde das Speichern 
deaktiviert.',
-   'bs-pageaccess-tag-groups-desc'= 'Geben Sie die 
Gruppen an, die exklusiven Zugriff auf die Seite erhalten sollen. Mehrere 
Gruppen können durch Kommata getrennt werden.',
-   'pageaccess'   = 'Durch PageAccess 
geschützte Seiten'
-);
-
-$messages['en'] = array(
-   'bs-pageaccess-extension-description'  = 'Controls access 
on page level.',
-   'PageAccess'   = 'PageAccess',
-   'bs-pageaccess-error-no-groups-given'  = 'No groups were 
specified. Use the tag as follows: bs:pageaccess groups=sysop /',
-   'bs-pageaccess-error-not-member-of-given-groups'   = 'You\'re not a 
member of the given groups. In order to prevent you from locking yourself out, 
saving was disabled.',
-   'bs-pageaccess-error-included-forbidden-template'  = 'You\'ve tried to 
use the template $1 to which you don\'t have read access. In order to prevent 
you from locking yourself out, saving was disabled.',
-   'bs-pageaccess-tag-groups-desc'= 'Specify the 
groups that should have exclusive access to this page. Multiple groups can be 
separated by commas.',
-   'pageaccess'   = 'Pages secured by 
PageAccess'
-);
-
-$messages['qqq'] = array();
diff --git a/PageAccess/i18n/de-formal.json b/PageAccess/i18n/de-formal.json
new file mode 100644
index 000..2f1a37f
--- /dev/null
+++ b/PageAccess/i18n/de-formal.json
@@ -0,0 +1,12 @@
+{
+   @metadata: {
+   authors: [
+   Marc Reymann reym...@hallowelt.biz,
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-pageaccess-error-not-member-of-given-groups: Sie sind nicht 
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Sie sich aus der Seite 
aussperren, wurde das Speichern deaktiviert.,
+   bs-pageaccess-error-included-forbidden-template: Sie haben das

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-03 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

* Removed trailing dot
* Added new description for better consistency

Change-Id: I6cd3fef316cfcf2e2745f5a78ae6c615c925a6ec
---
D HideTitle/HideTitle.i18n.php
A HideTitle/i18n/de.json
A HideTitle/i18n/en.json
A HideTitle/i18n/qqq.json
R HideTitle/languages/HideTitle.i18n.magic.php
A HideTitle/languages/HideTitle.i18n.php
6 files changed, 59 insertions(+), 30 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/HideTitle/HideTitle.i18n.php b/HideTitle/HideTitle.i18n.php
deleted file mode 100644
index 8dcd977..000
--- a/HideTitle/HideTitle.i18n.php
+++ /dev/null
@@ -1,30 +0,0 @@
-?php
-/**
- * Internationalisation file for HideTitle
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage HideTitle
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['en'] = array(
-   'bs-hidetitle-extension-description' = 'Tag to hide the title of an 
article.',
-   'HideTitle'  = 'HideTitle'
-);
-
-$messages['de'] = array(
-   'bs-hidetitle-extension-description' = 'Tag um den Artikeltitel zu 
verstecken.',
-   'HideTitle'  = 'HideTitle'
-);
-
-$messages['de-formal'] = array();
-
-$messages['qqq'] = array();
\ No newline at end of file
diff --git a/HideTitle/i18n/de.json b/HideTitle/i18n/de.json
new file mode 100644
index 000..c3e6f36
--- /dev/null
+++ b/HideTitle/i18n/de.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-hidetitle-desc: Fügt den Tag 
codenowiki__HIDETITLE__/nowiki/code hinzu, um einen Seitentitel zu 
verstecken
+}
diff --git a/HideTitle/i18n/en.json b/HideTitle/i18n/en.json
new file mode 100644
index 000..3b29413
--- /dev/null
+++ b/HideTitle/i18n/en.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-hidetitle-desc: Adds the tag 
codenowiki__HIDETITLE__/nowiki/code to hide the title of the page
+}
diff --git a/HideTitle/i18n/qqq.json b/HideTitle/i18n/qqq.json
new file mode 100644
index 000..ec8eefb
--- /dev/null
+++ b/HideTitle/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-hidetitle-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of hide title extension
+}
diff --git a/HideTitle/HideTitle.i18n.magic.php 
b/HideTitle/languages/HideTitle.i18n.magic.php
similarity index 100%
rename from HideTitle/HideTitle.i18n.magic.php
rename to HideTitle/languages/HideTitle.i18n.magic.php
diff --git a/HideTitle/languages/HideTitle.i18n.php 
b/HideTitle/languages/HideTitle.i18n.php
new file mode 100644
index 000..d08d35d
--- /dev/null
+++ b/HideTitle/languages/HideTitle.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( 'wfJsonI18nShimd928f300b1a99499' ) ) {
+   function wfJsonI18nShimd928f300b1a99499( $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'] );
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-06-02 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Implemented changes for translatewiki
..


Implemented changes for translatewiki

* Fixed path to i18n folder
* Removed trailing dot

Change-Id: I7cec46852a4779b246d49796feb4d21b8f62008b
---
A Avatars/i18n/de-formal.json
A Avatars/i18n/de.json
A Avatars/i18n/en.json
A Avatars/i18n/qqq.json
M Avatars/languages/Avatars.i18n.php
5 files changed, 114 insertions(+), 58 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/Avatars/i18n/de-formal.json b/Avatars/i18n/de-formal.json
new file mode 100644
index 000..8639e77
--- /dev/null
+++ b/Avatars/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+   @metadata: {
+   authors: [
+   Marc Reymann reym...@hallowelt.biz,
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-avatars-warning-text: Sie haben bereits ein Bild in Ihren 
Einstellungen hinterlegt. Wenn Sie Avatare benutzen, wird diese Einstellung 
zurückgesetzt. Möchten Sie fortfahren?
+}
diff --git a/Avatars/i18n/de.json b/Avatars/i18n/de.json
new file mode 100644
index 000..d7483e2
--- /dev/null
+++ b/Avatars/i18n/de.json
@@ -0,0 +1,25 @@
+   {
+   @metadata: {
+   authors: [
+   Marc Reymann reym...@hallowelt.biz,
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   prefs-avatars: Benutzerbilder,
+   bs-avatars-desc: Stellt individuelle und generische Benutzerbilder 
bereit,
+   bs-avatars-pref-generator: Generator:,
+   bs-avatars-pref-defaultsize: Standardgröße in Pixel:,
+   bs-avatars-upload-complete: Das Bild wurde erfolgreich hochgeladen.,
+   bs-avatars-generate-complete: Es wurde ein neuer Avatar generiert.,
+   bs-avatars-upload-title: Profilbild ändern,
+   bs-avatars-upload-label: Bild,
+   bs-avatars-generate-new-label: Neuen Avatar generieren,
+   bs-avatars-warning-title: Warnung,
+   bs-avatars-warning-text: Du hast bereits ein Bild in deinen 
Einstellungen hinterlegt. Wenn du Avatare benutzen, wird diese Einstellung 
zurückgesetzt. Möchtest du fortfahren?,
+   bs-avatars-userimage-title: Wiki-Bild oder Bild-URL,
+   bs-avatars-userimage-help: Z.B. Picture.jpg oder 
http://localhost/Picture.gif;,
+   bs-avatars-set-userimage-failed: Keine gültige URL oder Wiki-Bild.,
+   bs-avatars-set-userimage-saved: Benutzerbild wurde gespeichert.,
+   bs-avatars-file-upload-fieldset-title: Bild hochladen,
+   bs-avatars-auto-generate-fieldset-title: Avatar automatisch 
generieren
+   }
diff --git a/Avatars/i18n/en.json b/Avatars/i18n/en.json
new file mode 100644
index 000..8c2dc4a
--- /dev/null
+++ b/Avatars/i18n/en.json
@@ -0,0 +1,25 @@
+{
+   @metadata: {
+   authors: [
+   Marc Reymann reym...@hallowelt.biz,
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   prefs-avatars: Avatars,
+   bs-avatars-desc: Provides generic and individual user pictures,
+   bs-avatars-pref-generator: Generator:,
+   bs-avatars-pref-defaultsize: Default size in pixel:,
+   bs-avatars-upload-complete: The picture was uploaded successfully.,
+   bs-avatars-generate-complete: A new avatar was generated.,
+   bs-avatars-upload-title: Change profile picture,
+   bs-avatars-upload-label: Picture,
+   bs-avatars-generate-new-label: Generate new avatar,
+   bs-avatars-warning-title: Warning,
+   bs-avatars-warning-text: You have set a user picture in your 
preferences. Using avatars will clear this setting. Do you want to proceed?,
+   bs-avatars-userimage-title: Picture from wiki or picture URL,
+   bs-avatars-userimage-help: e. g. Picture.jpg or 
http://localhost/Picture.gif;,
+   bs-avatars-set-userimage-failed: Not a valid URL or picture from 
wiki.,
+   bs-avatars-set-userimage-saved: User picture successfully saved.,
+   bs-avatars-file-upload-fieldset-title: Picture upload,
+   bs-avatars-auto-generate-fieldset-title: Auto generate avatar
+}
diff --git a/Avatars/i18n/qqq.json b/Avatars/i18n/qqq.json
new file mode 100644
index 000..f7fc885
--- /dev/null
+++ b/Avatars/i18n/qqq.json
@@ -0,0 +1,24 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   prefs-avatars: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for avatars section in preferences.\\n{{Identical|Avatars}},
+   bs-avatars-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]], 
description of avatars extension,
+   bs-avatars-pref-generator: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for avatar generator:,
+   bs-avatars-pref-defaultsize: Option in

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-20 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: I8373ae748dfe9f80c8885cd9c27d2a423b09edb6
---
A ExtensionInfo/i18n/de.json
A ExtensionInfo/i18n/en.json
A ExtensionInfo/i18n/qqq.json
M ExtensionInfo/languages/ExtensionInfo.i18n.php
4 files changed, 81 insertions(+), 50 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/08/134308/1

diff --git a/ExtensionInfo/i18n/de.json b/ExtensionInfo/i18n/de.json
new file mode 100644
index 000..30961cf
--- /dev/null
+++ b/ExtensionInfo/i18n/de.json
@@ -0,0 +1,18 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extensioninfo-desc: Informationsliste über den eingebundenen 
Erweiterungen.,
+bs-extensioninfo-label: Erweiterungen,
+bs-extensioninfo-version: Version,
+bs-extensioninfo-software: Software,
+extensioninfo: Erweiterungen,
+bs-extensioninfo-headerextname: Name der Erweiterung,
+bs-extensioninfo-headerversion: Version,
+bs-extensioninfo-headerdesc: Beschreibung,
+bs-extensioninfo-headerstatus: Status,
+bs-extensioninfo-headerpackage: Paket,
+bs-extensioninfo-groupingtemplateviewtext: 
{{PLURAL:$1|Element|Elemente}}
+}
diff --git a/ExtensionInfo/i18n/en.json b/ExtensionInfo/i18n/en.json
new file mode 100644
index 000..9a53976
--- /dev/null
+++ b/ExtensionInfo/i18n/en.json
@@ -0,0 +1,18 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extensioninfo-desc: Information list about the loaded extensions.,
+bs-extensioninfo-label: Extensions,
+bs-extensioninfo-software: Software,
+bs-extensioninfo-version: Version,
+extensioninfo: Extensions,
+bs-extensioninfo-headerextname: Extension name,
+bs-extensioninfo-headerversion: Version,
+bs-extensioninfo-headerdesc: Description,
+bs-extensioninfo-headerstatus: Status,
+bs-extensioninfo-headerpackage: Package,
+bs-extensioninfo-groupingtemplateviewtext: 
{{PLURAL:$1|element|elements}}
+}
diff --git a/ExtensionInfo/i18n/qqq.json b/ExtensionInfo/i18n/qqq.json
new file mode 100644
index 000..803cfd0
--- /dev/null
+++ b/ExtensionInfo/i18n/qqq.json
@@ -0,0 +1,18 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extensioninfo-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of extension info 
extension.,
+bs-extensioninfo-label: Anchor text in admin tab for extensions\\n 
{{Identical|Extensions}},
+bs-extensioninfo-software: Table header for software,
+bs-extensioninfo-version: Table header for version,
+extensioninfo: Special page name for extensions,
+bs-extensioninfo-headerextname: Label for extension name,
+bs-extensioninfo-headerversion: Label for version,
+bs-extensioninfo-headerdesc: Label for description,
+bs-extensioninfo-headerstatus: Label for status,
+bs-extensioninfo-headerpackage: Label for package,
+bs-extensioninfo-groupingtemplateviewtext: Text for element/elements, 
$1 is the number of elements for PLURAL distinction
+}
diff --git a/ExtensionInfo/languages/ExtensionInfo.i18n.php 
b/ExtensionInfo/languages/ExtensionInfo.i18n.php
index ebb23b5..a7b5ce3 100644
--- a/ExtensionInfo/languages/ExtensionInfo.i18n.php
+++ b/ExtensionInfo/languages/ExtensionInfo.i18n.php
@@ -1,58 +1,35 @@
 ?php
 /**
- * Internationalisation file for ExtensionInfo
+ * 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 mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage ExtensionInfo
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://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( 'wfJsonI18nShim7194908c26f154ed' ) ) {
+   function wfJsonI18nShim7194908c26f154ed( $cache, $code, $cachedData ) {
+   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
+   foreach ( $codeSequence as $csCode ) {
+   $fileName = dirname( __FILE__ ) .

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-20 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: I6cd3fef316cfcf2e2745f5a78ae6c615c925a6ec
---
D HideTitle/HideTitle.i18n.php
A HideTitle/i18n/de.json
A HideTitle/i18n/en.json
A HideTitle/i18n/qqq.json
R HideTitle/languages/HideTitle.i18n.magic.php
A HideTitle/languages/HideTitle.i18n.php
6 files changed, 59 insertions(+), 30 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/09/134309/1

diff --git a/HideTitle/HideTitle.i18n.php b/HideTitle/HideTitle.i18n.php
deleted file mode 100644
index 8dcd977..000
--- a/HideTitle/HideTitle.i18n.php
+++ /dev/null
@@ -1,30 +0,0 @@
-?php
-/**
- * Internationalisation file for HideTitle
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage HideTitle
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['en'] = array(
-   'bs-hidetitle-extension-description' = 'Tag to hide the title of an 
article.',
-   'HideTitle'  = 'HideTitle'
-);
-
-$messages['de'] = array(
-   'bs-hidetitle-extension-description' = 'Tag um den Artikeltitel zu 
verstecken.',
-   'HideTitle'  = 'HideTitle'
-);
-
-$messages['de-formal'] = array();
-
-$messages['qqq'] = array();
\ No newline at end of file
diff --git a/HideTitle/i18n/de.json b/HideTitle/i18n/de.json
new file mode 100644
index 000..a2b462e
--- /dev/null
+++ b/HideTitle/i18n/de.json
@@ -0,0 +1,8 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-hidetitle-desc: Tag um den Seitentitel zu verstecken.
+}
diff --git a/HideTitle/i18n/en.json b/HideTitle/i18n/en.json
new file mode 100644
index 000..96b0ee0
--- /dev/null
+++ b/HideTitle/i18n/en.json
@@ -0,0 +1,8 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-hidetitle-desc: Tag to hide the title of a page.
+}
diff --git a/HideTitle/i18n/qqq.json b/HideTitle/i18n/qqq.json
new file mode 100644
index 000..52e382d
--- /dev/null
+++ b/HideTitle/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-hidetitle-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]], 
description of hide title extension.
+}
diff --git a/HideTitle/HideTitle.i18n.magic.php 
b/HideTitle/languages/HideTitle.i18n.magic.php
similarity index 100%
rename from HideTitle/HideTitle.i18n.magic.php
rename to HideTitle/languages/HideTitle.i18n.magic.php
diff --git a/HideTitle/languages/HideTitle.i18n.php 
b/HideTitle/languages/HideTitle.i18n.php
new file mode 100644
index 000..d08d35d
--- /dev/null
+++ b/HideTitle/languages/HideTitle.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( 'wfJsonI18nShimd928f300b1a99499' ) ) {
+   function wfJsonI18nShimd928f300b1a99499( $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'][] =

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-20 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: I2e0ddc35f925654b6d637232f818e5cdd12d7ec6
---
A InsertCategory/i18n/de-formal.json
A InsertCategory/i18n/de.json
A InsertCategory/i18n/en.json
A InsertCategory/i18n/qqq.json
M InsertCategory/languages/InsertCategory.i18n.php
5 files changed, 86 insertions(+), 69 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/10/134310/1

diff --git a/InsertCategory/i18n/de-formal.json 
b/InsertCategory/i18n/de-formal.json
new file mode 100644
index 000..a58f08a
--- /dev/null
+++ b/InsertCategory/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-insertcategory-hint: Hinweis: Um eine Kategorie hinzuzufügen, müssen 
Sie Enter drücken oder die Eingabe mit einem Komma beenden.
+}
diff --git a/InsertCategory/i18n/de.json b/InsertCategory/i18n/de.json
new file mode 100644
index 000..3dacfa3
--- /dev/null
+++ b/InsertCategory/i18n/de.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-insertcategory-desc: Über ein Dialogfeld lassen sich Kategorien in 
eine Wikiseite einfügen.,
+bs-insertcategory-insertcat: Kategorie einfügen,
+prefs-insertcategory: Kategorie einfügen,
+bs-insertcategory-pref-WithParents: Füge Kategorien inklusive ihrer 
Elternkategorien ein,
+bs-insertcategory-title: Kategorie einfügen,
+bs-insertcategory-cat-label: Zugewiesen:,
+bs-insertcategory-success: Kategorie erfolgreich hinzugefügt,
+bs-insertcategory-failure: Fehler,
+bs-insertcategory-hint: Hinweis: Um eine Kategorie hinzuzufügen, musst 
Du Enter drücken oder die Eingabe mit einem Komma beenden.,
+bs-insertcategory-panel-title: Kategorien
+}
diff --git a/InsertCategory/i18n/en.json b/InsertCategory/i18n/en.json
new file mode 100644
index 000..25d6093
--- /dev/null
+++ b/InsertCategory/i18n/en.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-insertcategory-desc: Dialog to enter a category link.,
+bs-insertcategory-insertcat: Insert category,
+prefs-insertcategory: Insert category,
+bs-insertcategory-pref-withparents: Insert category with its parents,
+bs-insertcategory-title: Insert category,
+bs-insertcategory-cat-label: Assigned:,
+bs-insertcategory-success: Add category successful,
+bs-insertcategory-failure: Error,
+bs-insertcategory-hint: Note: to add a category, you have to press 
enter or terminate your entry with a comma.,
+bs-insertcategory-panel-title: Categories
+}
diff --git a/InsertCategory/i18n/qqq.json b/InsertCategory/i18n/qqq.json
new file mode 100644
index 000..ced67ae
--- /dev/null
+++ b/InsertCategory/i18n/qqq.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-insertcategory-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of insert category 
extension.,
+bs-insertcategory-insertcat: Text for insert category\\n 
{{Identical|Insert category}},
+prefs-insertcategory: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for insert category section.\\n{{Identical|Insert category}},
+bs-insertcategory-pref-withparents: Option in 
[[Special:Wiki_Adminmode=Preferences]], checkbox label for insert category 
with its parents,
+bs-insertcategory-title: Window title for insert category,
+bs-insertcategory-cat-label: Label for assigned:,
+bs-insertcategory-success: Text for add category successful,
+bs-insertcategory-failure: Text for error,
+bs-insertcategory-hint: Text for note: to add a category, you have to 
press enter or terminate your entry with a comma.,
+bs-insertcategory-panel-title: Title for categories
+}
diff --git a/InsertCategory/languages/InsertCategory.i18n.php 
b/InsertCategory/languages/InsertCategory.i18n.php
index 9bccb4e..e5e5483 100644
--- a/InsertCategory/languages/InsertCategory.i18n.php
+++ b/InsertCategory/languages/InsertCategory.i18n.php
@@ -1,77 +1,35 @@
 ?php
 /**
- * Internationalisation file for InsertCategory
+ * 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:
+ *

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-20 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: I31bb92d6a008a37475b0807e062f69470a99f941
---
A InsertLink/i18n/de.json
A InsertLink/i18n/en.json
A InsertLink/i18n/qqq.json
M InsertLink/languages/InsertLink.i18n.php
4 files changed, 102 insertions(+), 68 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/19/134319/1

diff --git a/InsertLink/i18n/de.json b/InsertLink/i18n/de.json
new file mode 100644
index 000..e1540bb
--- /dev/null
+++ b/InsertLink/i18n/de.json
@@ -0,0 +1,25 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz,
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertlink-desc: Über ein Dialogfeld werden Links, z.B. zu 
bestehenden Seiten, eingebunden.,
+   bs-insertlink: Link einfügen,
+   bs-insertlink-button-title: Link einfügen/bearbeiten,
+   bs-insertlink-dialog-title: Link einfügen,
+   bs-insertlink-tab-wiki-page: Wiki-Seite,
+   bs-insertlink-tab-ext-link: Externer Link,
+   bs-insertlink-tab-email: E-Mail-Link,
+   bs-insertlink-tab-ext-file: Link auf Datei,
+   bs-insertlink-label-page: Seite,
+   bs-insertlink-label-link: Link,
+   bs-insertlink-label-mail: E-Mail Adresse,
+   bs-insertlink-label-description: Beschreibung,
+   bs-insertlink-label-file: Datei,
+   bs-insertlink-label-searchfile: Durchsuchen ...,
+   bs-insertlink-select-a-page: Ziel wählen ...,
+   bs-insertlink-select-a-namespace: (Seiten),
+   bs-insertlink-empty-field-text: Um einen Link einzufügen muss ein 
Ziel angegeben werden.
+}
diff --git a/InsertLink/i18n/en.json b/InsertLink/i18n/en.json
new file mode 100644
index 000..babde4c
--- /dev/null
+++ b/InsertLink/i18n/en.json
@@ -0,0 +1,25 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz,
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertlink-desc: Dialogbox to enter a link.,
+   bs-insertlink: Insert link,
+   bs-insertlink-button-title: Insert/edit link,
+   bs-insertlink-dialog-title: Insert link,
+   bs-insertlink-tab-wiki-page: Wiki page,
+   bs-insertlink-tab-ext-link: External link,
+   bs-insertlink-tab-email: Email-link,
+   bs-insertlink-tab-ext-file: Link to file,
+   bs-insertlink-label-page: Page,
+   bs-insertlink-label-link: Link,
+   bs-insertlink-label-mail: Email address,
+   bs-insertlink-label-description: Description,
+   bs-insertlink-label-file: File,
+   bs-insertlink-label-searchfile: Search ...,
+   bs-insertlink-select-a-page: Choose target ...,
+   bs-insertlink-select-a-namespace: (Pages),
+   bs-insertlink-empty-field-text: To insert a link you need to state a 
destination.
+}
diff --git a/InsertLink/i18n/qqq.json b/InsertLink/i18n/qqq.json
new file mode 100644
index 000..3a3dd41
--- /dev/null
+++ b/InsertLink/i18n/qqq.json
@@ -0,0 +1,25 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-insertlink-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of insert link 
extension.,
+   bs-insertlink: Insert link,
+   bs-insertlink-button-title: The title of the button that opens the 
dialog. It is shown on mouse over,
+   bs-insertlink-dialog-title: The title of the dialog window,
+   bs-insertlink-tab-wiki-page: The title of the tab containing the 
controls of a wiki page link,
+   bs-insertlink-tab-ext-link: The title of the tab containing the 
controls of an external link,
+   bs-insertlink-tab-email: The title of the tab containing the 
controls of an e-mail link,
+   bs-insertlink-tab-ext-file: The title of the tab containing the 
controls of external filesystem link,
+   bs-insertlink-label-page: The label of the page drop down field,
+   bs-insertlink-label-link: The label of the link textfield,
+   bs-insertlink-label-mail: The label of the mail textfield,
+   bs-insertlink-label-description: The label of the description 
textfield,
+   bs-insertlink-label-file: The label of the file input field,
+   bs-insertlink-label-searchfile: The text of the search file button,
+   bs-insertlink-select-a-page: The empty message for the page drop 
down field,
+   bs-insertlink-select-a-namespace: The empty message for the 
namespace drop down field. Attention: this shows the mainspace lable as 
default,
+   bs-insertlink-empty-field-text: The error message when the

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-20 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: I33f93df6cb722b7fa370a28de84f4af3334da49a
---
A InterWikiLinks/i18n/de-formal.json
A InterWikiLinks/i18n/de.json
A InterWikiLinks/i18n/en.json
A InterWikiLinks/i18n/qqq.json
M InterWikiLinks/languages/InterWikiLinks.i18n.php
5 files changed, 130 insertions(+), 144 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/23/134323/1

diff --git a/InterWikiLinks/i18n/de-formal.json 
b/InterWikiLinks/i18n/de-formal.json
new file mode 100644
index 000..08e96b4
--- /dev/null
+++ b/InterWikiLinks/i18n/de-formal.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-interwikilinks-invalid-pfx-spc: Das Präfix ist ungültig. 
Verwenden Sie keine Leerzeichen und Sonderzeichen.,
+   bs-interwikilinks-invalid-url-spc: Die URL ist ungültig. Verwenden 
Sie keine Leerzeichen.,
+   bs-interwikilinks-nopfx: Bitte geben Sie einen Präfix ein.,
+   bs-interwikilinks-nourl: Bitte geben Sie eine URL ein.,
+   bs-interwikilinks-pfxtoolong: Das Präfix ist zu lang. Geben Sie 
maximal 32 Zeichen an.,
+   bs-interwikilinks-confirmdeleteinterwikilink: Sind Sie sicher, dass 
Sie diesen Interwiki-Link löschen wollen?
+}
diff --git a/InterWikiLinks/i18n/de.json b/InterWikiLinks/i18n/de.json
new file mode 100644
index 000..a9af738
--- /dev/null
+++ b/InterWikiLinks/i18n/de.json
@@ -0,0 +1,30 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-interwikilinks-desc: Administrationsinterface, um Links zwischen 
Wikis hinzuzufügen, zu bearbeiten und zu löschen.,
+   bs-interwikilinks-invalid-pfx-spc: Das Präfix ist ungültig. Verwende 
keine Leerzeichen und keine Sonderzeichen.,
+   bs-interwikilinks-invalid-url-spc: Die URL ist ungültig. Verwende 
keine Leerzeichen.,
+   bs-interwikilinks-label: Interwikilinks,
+   bs-interwikilinks-link-created: Der Interwiki Link wurde erstellt.,
+   bs-interwikilinks-link-added: Der Interwiki Link wurde geändert.,
+   bs-interwikilinks-link-deleted: Der Interwiki Link wurde gelöscht.,
+   bs-interwikilinks-nooldpfx: Das ursprüngliche Präfix wurde nicht 
gefunden.,
+   bs-interwikilinks-nopfx: Bitte gib einen Präfix ein.,
+   bs-interwikilinks-nourl: Bitte gib eine URL ein.,
+   bs-interwikilinks-pfxtoolong: Das Präfix ist zu lang. Gib maximal 32 
Zeichen an.,
+   bs-interwikilinks-pfxexists: Das Präfix ist bereits vorhanden.,
+   bs-interwikilinks-headerprefix: Präfix,
+   bs-interwikilinks-headerurl: Url,
+   bs-interwikilinks-titleaddinterwikilink: Interwiki-Link hinzufügen,
+   bs-interwikilinks-titleeditinterwikilink: Interwiki-Link bearbeiten,
+   bs-interwikilinks-labelprefix: Präfix,
+   bs-interwikilinks-labelurl: Url,
+   bs-interwikilinks-titledeleteinterwikilink: Interwiki-Link löschen,
+   bs-interwikilinks-confirmdeleteinterwikilink: Bist du sicher, dass 
du diesen Interwiki-Link löschen willst?,
+   bs-interwikilinks-insertlink-tabtitle: Link in anderes Wiki,
+   bs-interwikilinks-insertlink-labelprefix: Präfix,
+   bs-interwikilink-select-a-prefix: Präfix auswählen
+}
diff --git a/InterWikiLinks/i18n/en.json b/InterWikiLinks/i18n/en.json
new file mode 100644
index 000..ab41f45
--- /dev/null
+++ b/InterWikiLinks/i18n/en.json
@@ -0,0 +1,30 @@
+{
+   @metadata: {
+   authors: [
+   Stephan Muggli mug...@hallowelt.biz
+   ]
+   },
+   bs-interwikilinks-desc: Administration interface for adding, editing 
and deleting interwiki links.,
+   bs-interwikilinks-invalid-pfx-spc: The prefix is invalid. Please do 
not use spaces.,
+   bs-interwikilinks-invalid-url-spc: The URL is invalid. Please do not 
use spaces.,
+   bs-interwikilinks-label: Interwiki links,
+   bs-interwikilinks-link-created: The interwiki link has been 
created.,
+   bs-interwikilinks-link-added: The interwiki link has been added.,
+   bs-interwikilinks-link-deleted: The interwiki link has been 
deleted.,
+   bs-interwikilinks-nooldpfx: The previous prefix was not found.,
+   bs-interwikilinks-nopfx: Please supply a prefix.,
+   bs-interwikilinks-nourl: Please supply a URL.,
+   bs-interwikilinks-pfxtoolong: The prefix is too long. Please use a 
maximum of 32 characters.,
+   bs-interwikilinks-pfxexists: This prefix already exists.,
+   bs-interwikilinks-headerprefix: Prefix,
+   bs-interwikilinks-headerurl: Url,
+   bs-interwikilinks-titleaddinterwikilink: Add interwiki

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-20 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: Icb53ef286ac8ca4c13bf7f790c704bef4f566c12
---
D PageAccess/PageAccess.i18n.php
A PageAccess/i18n/de-formal.json
A PageAccess/i18n/de.json
A PageAccess/i18n/en.json
A PageAccess/i18n/qqq.json
A PageAccess/languages/PageAccess.i18n.php
6 files changed, 89 insertions(+), 46 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/30/134330/1

diff --git a/PageAccess/PageAccess.i18n.php b/PageAccess/PageAccess.i18n.php
deleted file mode 100644
index 371c960..000
--- a/PageAccess/PageAccess.i18n.php
+++ /dev/null
@@ -1,46 +0,0 @@
-?php
-/**
- * Internationalisation file for PageAccess
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Marc Reymann reym...@hallowelt.biz
-
- * @packageBlueSpice_Extensions
- * @subpackage CountThings
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['de'] = array(
-   'bs-pageaccess-extension-description'  = 'Regelt den 
Zugriff auf Seitenebene.',
-   'PageAccess'   = 'PageAccess',
-   'bs-pageaccess-error-no-groups-given'  = 'Es wurden keine 
Gruppen angegeben. Verwende das Tag wie folgt: bs:pageaccess groups=sysop 
/',
-   'bs-pageaccess-error-not-member-of-given-groups'   = 'Du bist nicht 
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Du dich aus der Seite 
aussperrst, wurde das Speichern deaktiviert.',
-   'bs-pageaccess-error-included-forbidden-template'  = 'Du hast das 
Template $1 eingebunden, auf das du keine Leseberechtigung hast. Um zu 
verhindern, dass Du dich aus der Seite aussperrst, wurde das Speichern 
deaktiviert.',
-   'bs-pageaccess-tag-groups-desc'= 'Gib die Gruppen 
an, die exklusiven Zugriff auf die Seite erhalten sollen. Mehrere Gruppen 
können durch Kommata getrennt werden.',
-   'pageaccess'   = 'Durch PageAccess 
geschützte Seiten'
-);
-
-$messages['de-formal'] = array(
-   'bs-pageaccess-error-no-groups-given'  = 'Es wurden keine 
Gruppen angegeben. Verwenden Sie das Tag wie folgt: bs:pageaccess 
groups=sysop /',
-   'bs-pageaccess-error-not-member-of-given-groups'   = 'Sie sind nicht 
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Sie sich aus der Seite 
aussperren, wurde das Speichern deaktiviert.',
-   'bs-pageaccess-error-included-forbidden-template'  = 'Sie haben das 
Template $1 eingebunden, auf das Sie keine Leseberechtigung haben. Um zu 
verhindern, dass Sie sich aus der Seite aussperren, wurde das Speichern 
deaktiviert.',
-   'bs-pageaccess-tag-groups-desc'= 'Geben Sie die 
Gruppen an, die exklusiven Zugriff auf die Seite erhalten sollen. Mehrere 
Gruppen können durch Kommata getrennt werden.',
-   'pageaccess'   = 'Durch PageAccess 
geschützte Seiten'
-);
-
-$messages['en'] = array(
-   'bs-pageaccess-extension-description'  = 'Controls access 
on page level.',
-   'PageAccess'   = 'PageAccess',
-   'bs-pageaccess-error-no-groups-given'  = 'No groups were 
specified. Use the tag as follows: bs:pageaccess groups=sysop /',
-   'bs-pageaccess-error-not-member-of-given-groups'   = 'You\'re not a 
member of the given groups. In order to prevent you from locking yourself out, 
saving was disabled.',
-   'bs-pageaccess-error-included-forbidden-template'  = 'You\'ve tried to 
use the template $1 to which you don\'t have read access. In order to prevent 
you from locking yourself out, saving was disabled.',
-   'bs-pageaccess-tag-groups-desc'= 'Specify the 
groups that should have exclusive access to this page. Multiple groups can be 
separated by commas.',
-   'pageaccess'   = 'Pages secured by 
PageAccess'
-);
-
-$messages['qqq'] = array();
diff --git a/PageAccess/i18n/de-formal.json b/PageAccess/i18n/de-formal.json
new file mode 100644
index 000..4c130aa
--- /dev/null
+++ b/PageAccess/i18n/de-formal.json
@@ -0,0 +1,12 @@
+{
+@metadata: {
+authors: [
+Marc Reymann reym...@hallowelt.biz,
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-pageaccess-error-not-member-of-given-groups: Sie sind nicht Mitglied 
der angegebenen Gruppen. Um zu verhindern, dass Sie sich aus der Seite 
aussperren, wurde das Speichern deaktiviert.,
+bs-pageaccess-error-included-forbidden-template: Sie haben das

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-19 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: I7cec46852a4779b246d49796feb4d21b8f62008b
---
A Avatars/i18n/de-formal.json
A Avatars/i18n/de.json
A Avatars/i18n/en.json
A Avatars/i18n/qqq.json
M Avatars/languages/Avatars.i18n.php
5 files changed, 114 insertions(+), 58 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/68/134068/1

diff --git a/Avatars/i18n/de-formal.json b/Avatars/i18n/de-formal.json
new file mode 100644
index 000..2823208
--- /dev/null
+++ b/Avatars/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+@metadata: {
+authors: [
+Marc Reymann reym...@hallowelt.biz,
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-avatars-warning-text: Sie haben bereits ein Bild in Ihren 
Einstellungen hinterlegt. Wenn Sie Avatare benutzen, wird diese Einstellung 
zurückgesetzt. Möchten Sie fortfahren?
+}
diff --git a/Avatars/i18n/de.json b/Avatars/i18n/de.json
new file mode 100644
index 000..23d8a8a
--- /dev/null
+++ b/Avatars/i18n/de.json
@@ -0,0 +1,25 @@
+{
+@metadata: {
+authors: [
+Marc Reymann reym...@hallowelt.biz,
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+prefs-avatars: Benutzerbilder,
+bs-avatars-desc: Stellt individuelle und generische Benutzerbilder 
bereit.,
+bs-avatars-pref-generator: Generator:,
+bs-avatars-pref-defaultsize: Standardgröße in Pixel:,
+bs-avatars-upload-complete: Das Bild wurde erfolgreich hochgeladen.,
+bs-avatars-generate-complete: Es wurde ein neuer Avatar generiert.,
+bs-avatars-upload-title: Profilbild ändern,
+bs-avatars-upload-label: Bild,
+bs-avatars-generate-new-label: Neuen Avatar generieren,
+bs-avatars-warning-title: Warnung,
+bs-avatars-warning-text: Du hast bereits ein Bild in deinen 
Einstellungen hinterlegt. Wenn du Avatare benutzen, wird diese Einstellung 
zurückgesetzt. Möchtest du fortfahren?,
+bs-avatars-userimage-title: Wiki-Bild oder Bild-URL,
+bs-avatars-userimage-help: Z.B. Picture.jpg oder 
http://localhost/Picture.gif;,
+bs-avatars-set-userimage-failed: Keine gültige URL oder Wiki-Bild.,
+bs-avatars-set-userimage-saved: Benutzerbild wurde gespeichert.,
+bs-avatars-file-upload-fieldset-title: Bild hochladen,
+bs-avatars-auto-generate-fieldset-title: Avatar automatisch generieren
+}
diff --git a/Avatars/i18n/en.json b/Avatars/i18n/en.json
new file mode 100644
index 000..cdd5d76
--- /dev/null
+++ b/Avatars/i18n/en.json
@@ -0,0 +1,25 @@
+{
+@metadata: {
+authors: [
+Marc Reymann reym...@hallowelt.biz,
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+prefs-avatars: Avatars,
+bs-avatars-desc: Provides generic and individual user pictures.,
+bs-avatars-pref-generator: Generator:,
+bs-avatars-pref-defaultsize: Default size in pixel:,
+bs-avatars-upload-complete: The picture was uploaded successfully.,
+bs-avatars-generate-complete: A new avatar was generated.,
+bs-avatars-upload-title: Change profile picture,
+bs-avatars-upload-label: Picture,
+bs-avatars-generate-new-label: Generate new avatar,
+bs-avatars-warning-title: Warning,
+bs-avatars-warning-text: You have set a user picture in your 
preferences. Using avatars will clear this setting. Do you want to proceed?,
+bs-avatars-userimage-title: Picture from wiki or picture URL,
+bs-avatars-userimage-help: e. g. Picture.jpg or 
http://localhost/Picture.gif;,
+bs-avatars-set-userimage-failed: Not a valid URL or picture from wiki.,
+bs-avatars-set-userimage-saved: User picture successfully saved.,
+bs-avatars-file-upload-fieldset-title: Picture upload,
+bs-avatars-auto-generate-fieldset-title: Auto generate avatar
+}
diff --git a/Avatars/i18n/qqq.json b/Avatars/i18n/qqq.json
new file mode 100644
index 000..54968c0
--- /dev/null
+++ b/Avatars/i18n/qqq.json
@@ -0,0 +1,24 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+prefs-avatars: Used in [[Special:Wiki_Adminmode=Preferences]], 
headline for avatars section in preferences.\\n{{Identical|Avatars}},
+bs-avatars-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]], 
description of avatars extension.,
+bs-avatars-pref-generator: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for avatar generator:,
+bs-avatars-pref-defaultsize: Option in 
[[Special:Wiki_Adminmode=Preferences]], label for default size of avatar in 
pixel:,
+bs-avatars-upload-complete: Text for the picture was uploaded 
successfully.,
+bs-avatars-generate-complete: Text for a new avatar was generated.,
+bs-avatars-upload-title: Window title for

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-19 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: Ib96f3810d3cd57cd0c9b8e63c69585204d0bf0f4
---
A Blog/i18n/de.json
A Blog/i18n/en.json
A Blog/i18n/qqq.json
M Blog/languages/Blog.i18n.php
4 files changed, 117 insertions(+), 76 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/72/134072/1

diff --git a/Blog/i18n/de.json b/Blog/i18n/de.json
new file mode 100644
index 000..029349f
--- /dev/null
+++ b/Blog/i18n/de.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz\r
+]
+},
+bs-blog-desc: Seiten werden in chronologischer Reihenfolge als 
Blog-Einträge dargestellt.,
+bs-blog-no-entries: Es sind keine Blog-Einträge vorhanden.,
+bs-blog-comments: Kommentare,
+bs-blog-read-more: Weiterlesen,
+bs-blog-trackback: Trackback,
+bs-blog-permalink: Permalink,
+bs-blog-show-all: Alle Beiträge anzeigen,
+bs-blog-form-inline-text: Titel...,
+bs-blog-form-title-text: Neuen Blogeintrag verfassen,
+bs-blog-form-button-text: Erstellen,
+bs-blog-blog: Blog,
+prefs-blog: Blog,
+bs-blog-pref-moreinnewwindow: Bei Klick auf weiterlesen ein neues 
Fenster öffnen,
+bs-blog-pref-newentryfieldposition: Position des Formulars für neue 
Einträge:,
+bs-blog-pref-showall: Link alle anzeigen darstellen,
+bs-blog-pref-showinfo: Informationen über den Blogeintrag anzeigen,
+bs-blog-pref-showlimit: Anzahl der dargestellten Blogeinträge:,
+bs-blog-pref-shownewentryfield: Formular für neue Einträge anzeigen,
+bs-blog-pref-showpermalink: Link Permalink anzeigen,
+bs-blog-pref-sortby: Sortierung:,
+bs-blog-pref-imagerendermode: Bilder anzeigen als:,
+bs-blog-pref-maxentrycharacters: Anzahl darzustellender Wörter:,
+bs-blog-tag-blog-desc: Zeigt Blog-Einträge auf jeder beliebigen Seite 
an.
+}
diff --git a/Blog/i18n/en.json b/Blog/i18n/en.json
new file mode 100644
index 000..fb6f37c
--- /dev/null
+++ b/Blog/i18n/en.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz\r
+]
+},
+bs-blog-desc: Display a blog style list of pages.,
+bs-blog-no-entries: There are no blog entries.,
+bs-blog-comments: Comments,
+bs-blog-read-more: Read more,
+bs-blog-trackback: Trackback,
+bs-blog-permalink: Permalink,
+bs-blog-show-all: Show all entries,
+bs-blog-form-inline-text: Title...,
+bs-blog-form-title-text: Create new blog entry,
+bs-blog-form-button-text: Create,
+bs-blog-blog: Blog,
+prefs-blog: Blog,
+bs-blog-pref-moreinnewwindow: Open new window for read more,
+bs-blog-pref-newentryfieldposition: Position for the new blog entry 
form:,
+bs-blog-pref-showall: Show all entries link,
+bs-blog-pref-showinfo: Show information about the entry,
+bs-blog-pref-showlimit: Number of displayed entries:,
+bs-blog-pref-shownewentryfield: Show new blog entry form,
+bs-blog-pref-showpermalink: Show permalink link,
+bs-blog-pref-sortby: Sort by:,
+bs-blog-pref-imagerendermode: Display pictures as:,
+bs-blog-pref-maxentrycharacters: Number of displayed words:,
+bs-blog-tag-blog-desc: Display blog entries on every page.
+}
diff --git a/Blog/i18n/qqq.json b/Blog/i18n/qqq.json
new file mode 100644
index 000..53a70fa
--- /dev/null
+++ b/Blog/i18n/qqq.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz\r
+]
+},
+bs-blog-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]], 
description of blog extension.,
+bs-blog-no-entries: Text for there are no blog entries.,
+bs-blog-comments: Anchor title for comments,
+bs-blog-read-more: Anchor title for read more,
+bs-blog-trackback: Anchor title for trackback,
+bs-blog-permalink: Anchor title for permalink,
+bs-blog-show-all: Anchor title for show all entries,
+bs-blog-form-inline-text: input field default text for title...,
+bs-blog-form-title-text: Headline for create new blog entry,
+bs-blog-form-button-text: Button label for create,
+bs-blog-blog: Text for blog,
+prefs-blog: Used in [[Special:Wiki_Adminmode=Preferences]], headline 
for blog section in preferences. \\n {{Identical|Blog}},
+bs-blog-pref-moreinnewwindow: Option in 
[[Special:Wiki_Adminmode=Preferences]], checkbox label for open new window for 
read more,
+bs-blog-pref-newentryfieldposition:  Option in 
[[Special:Wiki_Adminmode=Preferences]], label for position for the new blog 
entry form:,
+bs-blog-pref-showall: Option in 
[[Special:Wiki_Adminmode=Preferences]], checkbox label for show all entries 
link,
+bs-blog-pref-showinfo:

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-19 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

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(+), 43 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/84/134084/1

diff --git a/Dashboards/i18n/de.json b/Dashboards/i18n/de.json
new file mode 100644
index 000..f03c4be
--- /dev/null
+++ b/Dashboards/i18n/de.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+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 000..be492d5
--- /dev/null
+++ b/Dashboards/i18n/en.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+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
+}
diff --git a/Dashboards/i18n/qqq.json b/Dashboards/i18n/qqq.json
new file mode 100644
index 000..2bb838b
--- /dev/null
+++ b/Dashboards/i18n/qqq.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-dashboards-desc: Used in [[Special:Wiki_Adminmode=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_Adminmode=Preferences]], 
headline of dashboards section.\\n {{Identical|Dashboard}},
+bs-dashboards-pref-userdashboardonlogo: Option in 
[[Special:Wiki_Adminmode=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
+}
diff --git a/Dashboards/languages/Dashboards.i18n.php 
b/Dashboards/languages/Dashboards.i18n.php
index 03d1520..87bf724 100644
--- a/Dashboards/languages/Dashboards.i18n.php
+++ b/Dashboards/languages/Dashboards.i18n.php
@@ -1,47 +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] === '@' ) {
+

[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)

2014-05-19 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Implemented changes for translatewiki
..

Implemented changes for translatewiki

Change-Id: Idee19ee240226004ef0b960f46d2ec7d1100cb79
---
A ExtendedEditBar/i18n/de.json
A ExtendedEditBar/i18n/en.json
A ExtendedEditBar/i18n/qqq.json
M ExtendedEditBar/languages/ExtendedEditBar.i18n.php
4 files changed, 108 insertions(+), 64 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/87/134087/1

diff --git a/ExtendedEditBar/i18n/de.json b/ExtendedEditBar/i18n/de.json
new file mode 100644
index 000..6c12ce9
--- /dev/null
+++ b/ExtendedEditBar/i18n/de.json
@@ -0,0 +1,27 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extendededitbar-desc: Stellt zusätzliche Funktionen im 
WikiCode-Editor zur Verfügung.,
+bs-extendededitbar-redirecttip: Umleiten,
+bs-extendededitbar-redirectsample: Ziel eingeben,
+bs-extendededitbar-striketip: Durchstreichen,
+bs-extendededitbar-strikesample: Durchgestrichener Text,
+bs-extendededitbar-entertip: Zeilenumbruch,
+bs-extendededitbar-uppertip: Hochgestellt,
+bs-extendededitbar-uppersample: Hochgestellter Text,
+bs-extendededitbar-lowertip: Tiefgestellt,
+bs-extendededitbar-lowersample: Tiefgestellter Text,
+bs-extendededitbar-smalltip: Klein,
+bs-extendededitbar-smallsample: Kleiner Text,
+bs-extendededitbar-commenttip: Versteckter Kommentar,
+bs-extendededitbar-commentsample: Kommentar,
+bs-extendededitbar-gallerytip: Bildergalerie,
+bs-extendededitbar-gallerysample: 
Image:Bild1.jpg|Überschrift1\\nImage:Bild2.jpg|Überschrift2,
+bs-extendededitbar-quotetip: Zitat einfügen,
+bs-extendededitbar-quotesample: Zitat,
+bs-extendededitbar-tabletip: Tabelle einfügen,
+bs-extendededitbar-tablesample: ! Überschrift 1\n! Überschrift 2\n! 
Überschrift 3\n|-\n| Zeile 1, Zelle 1\n| Zeile 1, Zelle 2\n| Zeile 1, Zelle 
3\n|-\n| Zeile 2, Zelle 1\n| Zeile 2, Zelle 2\n| Zeile 2, Zelle 3
+}
diff --git a/ExtendedEditBar/i18n/en.json b/ExtendedEditBar/i18n/en.json
new file mode 100644
index 000..7bd0e6e
--- /dev/null
+++ b/ExtendedEditBar/i18n/en.json
@@ -0,0 +1,27 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extendededitbar-desc: Provides additional buttons to the wiki edit 
field.,
+bs-extendededitbar-redirecttip: Redirect,
+bs-extendededitbar-redirectsample: Insert text,
+bs-extendededitbar-striketip: Strike,
+bs-extendededitbar-strikesample: Strike-through text,
+bs-extendededitbar-entertip: Line break,
+bs-extendededitbar-uppertip: Superscript,
+bs-extendededitbar-uppersample: Superscript text,
+bs-extendededitbar-lowertip: Subscript,
+bs-extendededitbar-lowersample: Subscript text,
+bs-extendededitbar-smalltip: Small,
+bs-extendededitbar-smallsample: Small text,
+bs-extendededitbar-commenttip: Insert hidden comment,
+bs-extendededitbar-commentsample: Comment,
+bs-extendededitbar-gallerytip: Insert a picture gallery,
+bs-extendededitbar-gallerysample: 
Image:Example.jpg|Caption1\\nImage:Example.jpg|Caption2,
+bs-extendededitbar-quotetip: Insert a block of quoted text,
+bs-extendededitbar-quotesample: Block quote,
+bs-extendededitbar-tabletip: Insert a table,
+bs-extendededitbar-tablesample: ! header 1\n! header 2\n! header 
3\n|-\n| row 1, cell 1\n| row 1, cell 2\n| row 1, cell 3\n|-\n| row 2, cell 
1\n| row 2, cell 2\n| row 2, cell 3
+}
diff --git a/ExtendedEditBar/i18n/qqq.json b/ExtendedEditBar/i18n/qqq.json
new file mode 100644
index 000..43c21e2
--- /dev/null
+++ b/ExtendedEditBar/i18n/qqq.json
@@ -0,0 +1,27 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extendededitbar-desc: Used in 
[[Special:Wiki_Adminmode=ExtensionInfo]], description of extended edit bar 
extension.,
+bs-extendededitbar-redirecttip: Text for redirect,
+bs-extendededitbar-redirectsample: Text for insert text,
+bs-extendededitbar-striketip: Text for strike,
+bs-extendededitbar-strikesample: Text for strike-through text,
+bs-extendededitbar-entertip: Text for line break,
+bs-extendededitbar-uppertip: Text for superscript,
+bs-extendededitbar-uppersample: Text for superscript text,
+bs-extendededitbar-lowertip: Text for subscript,
+bs-extendededitbar-lowersample: Text for subscript text,
+bs-extendededitbar-smalltip: Text for small,
+bs-extendededitbar-smallsample: Text for small text,
+bs-extendededitbar-commenttip: Text for insert hidden comment,
+bs-extendededitbar-commentsample: Text for comment,
+bs-extendededitbar-gallerytip: Text for insert a picture gallery,
+

84 matches

Mail list logo