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 0000000..d4d1853
--- /dev/null
+++ b/ShoutBox/i18n/de-formal.json
@@ -0,0 +1,11 @@
+{
+    "@metadata": {
+        "authors": [
+            "Stephan Muggli <[email protected]>"
+        ]
+    },
+    "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 0000000..7c44e6a
--- /dev/null
+++ b/ShoutBox/i18n/de.json
@@ -0,0 +1,30 @@
+{
+    "@metadata": {
+        "authors": [
+            "Stephan Muggli <[email protected]>"
+        ]
+    },
+    "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 0000000..acbbb84
--- /dev/null
+++ b/ShoutBox/i18n/en.json
@@ -0,0 +1,30 @@
+{
+    "@metadata": {
+        "authors": [
+            "Stephan Muggli <[email protected]>"
+        ]
+    },
+    "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 
(seconds):",
+    "bs-shoutbox-pref-maxmessagelength": "Maximum length of a message:",
+    "bs-shoutbox-pref-numberofshouts": "Number of messages shown:",
+    "bs-shoutbox-pref-showage": "Show creation date of a message",
+    "bs-shoutbox-pref-ShowUser": "Show author of a message",
+    "bs-shoutbox-pref-allowarchive": "User are able to delete their own 
entries",
+    "bs-shoutbox-pref-show": "Display Shoutbox",
+    "bs-shoutbox-archive-success": "Entry successfully deleted.",
+    "bs-shoutbox-archive-failure": "An error occurred while trying to delete 
the entry, please try again.",
+    "bs-shoutbox-archive-failure-user": "Entries can only be deleted by their 
author.",
+    "bs-shoutbox-switch-description": "Hides shoutbox on this page",
+    "bs-shoutbox-charactersleft": "$1 character{{PLURAL:$1||s}} left",
+    "bs-shoutbox-confirm-text": "Do you really want to delete this entry?",
+    "bs-shoutbox-confirm-title": "Confirm",
+    "bs-shoutbox-entermessage": "Please enter a message.",
+    "bs-shoutbox-too-early": "Please wait a few seconds before submitting the 
next entry."
+}
diff --git a/ShoutBox/i18n/qqq.json b/ShoutBox/i18n/qqq.json
new file mode 100644
index 0000000..e560e7c
--- /dev/null
+++ b/ShoutBox/i18n/qqq.json
@@ -0,0 +1,30 @@
+{
+    "@metadata": {
+        "authors": [
+            "Stephan Muggli <[email protected]>"
+        ]
+    },
+    "bs-shoutbox-desc": "Used in [[Special:Wiki_Admin&mode=ExtensionInfo]], 
description of shoutbox extension",
+    "prefs-shoutbox": "Used in [[Special:Wiki_Admin&mode=Preferences]], 
headline for shout box section in preferences. \\n {{Identical|Shoutbox}}",
+    "bs-shoutbox-title": "Fieldset legend for shoutbox",
+    "bs-shoutbox-message": "Default text in textarea for message",
+    "bs-shoutbox-shout": "Shout it",
+    "bs-shoutbox-no-entries": "Text for nothing here yet.",
+    "bs-shoutbox-loading": "Text for loading...",
+    "bs-shoutbox-pref-committimeinterval": "Used in 
[[Special:Wiki_Admin&mode=Preferences]], label for time between two messages 
(seconds):",
+    "bs-shoutbox-pref-maxmessagelength": "Used in 
[[Special:Wiki_Admin&mode=Preferences]], label for maximum length of a 
message:",
+    "bs-shoutbox-pref-numberofshouts": "Used in 
[[Special:Wiki_Admin&mode=Preferences]], label for number of messages shown:",
+    "bs-shoutbox-pref-showage": "Used in 
[[Special:Wiki_Admin&mode=Preferences]], checkbox label for show creation date 
of a message",
+    "bs-shoutbox-pref-ShowUser": "Used in 
[[Special:Wiki_Admin&mode=Preferences]], checkbox label for show author of a 
message",
+    "bs-shoutbox-pref-allowarchive": "Used in 
[[Special:Wiki_Admin&mode=Preferences]], checkbox label for user are able to 
delete their own entries",
+    "bs-shoutbox-pref-show": "Used in [[Special:Wiki_Admin&mode=Preferences]], 
checkbox label for display shoutbox",
+    "bs-shoutbox-archive-success": "Text for entry successfully deleted.",
+    "bs-shoutbox-archive-failure": "Text for an error occurred while trying to 
delete the entry, please try again.",
+    "bs-shoutbox-archive-failure-user": "Text for entries can only be deleted 
by their author.",
+    "bs-shoutbox-switch-description": "Used in InsertMagic extension, tag 
description for hides shoutbox on this page",
+    "bs-shoutbox-charactersleft": "Text for $1 character{{PLURAL:$1||s}} \\n 
$1 is the number of characters left, also use this for PLURAL distinction",
+    "bs-shoutbox-confirm-text": "Text for do you really want to delete this 
entry?",
+    "bs-shoutbox-confirm-title": "Window title for confirm",
+    "bs-shoutbox-entermessage": "Text for please enter a message.",
+    "bs-shoutbox-too-early": "Please wait a few seconds before submitting the 
next entry."
+}
diff --git a/ShoutBox/languages/ShoutBox.i18n.php 
b/ShoutBox/languages/ShoutBox.i18n.php
index 65aa19b..2287dfc 100644
--- a/ShoutBox/languages/ShoutBox.i18n.php
+++ b/ShoutBox/languages/ShoutBox.i18n.php
@@ -1,91 +1,35 @@
 <?php
 /**
- * Internationalisation file for Shoutbox
+ * This is a backwards-compatibility shim, generated by:
+ * 
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
  *
- * Part of BlueSpice for MediaWiki
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
  *
- * @author     Stephan Muggli <[email protected]>
-
- * @package    BlueSpice_Extensions
- * @subpackage Shoutbox
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @license    http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
+ * This shim maintains compatibility back to MediaWiki 1.17.
  */
-
 $messages = array();
+if ( !function_exists( 'wfJsonI18nShima9d7b38adaf9a3ce' ) ) {
+       function wfJsonI18nShima9d7b38adaf9a3ce( $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-shoutbox-extension-description'   => 'Adds a parser function for 
embedding your own shoutbox.',
-       'prefs-ShoutBox'                      => 'Shoutbox',
-       'bs-shoutbox-title'                   => 'Shoutbox',
-       'bs-shoutbox-latest_messages'         => 'Latest Messages',
-       'bs-shoutbox-message'                 => 'Message',
-       'bs-shoutbox-shout'                   => 'Shout it!',
-       'bs-shoutbox-date_format'             => 'Y-m-d H:i:s',
-       'bs-shoutbox-more'                    => 'more messages',
-       'bs-shoutbox-no-entries'              => 'No messages have been posted 
yet.',
-       'bs-shoutbox-loading'                 => 'Loading...',
-       'bs-shoutbox-ShoutBox'                => 'Shoutbox',
-       'bs-shoutbox-pref-CommitTimeInterval' => 'Time between two messages 
<i>(Spamprotection)</i> (<b>15</b>)',
-       'bs-shoutbox-pref-MaxMessageLength'   => 'Maximum length of a message',
-       'bs-shoutbox-pref-NumberOfShouts'     => 'Number of messages shown',
-       'bs-shoutbox-pref-ShowAge'            => 'Show age of a message',
-       'bs-shoutbox-pref-ShowUser'           => 'Show sender of a message',
-       'bs-shoutbox-pref-AllowArchive'       => 'User are able to delete their 
own entries',
-       'bs-shoutbox-archive-success'         => 'Shoutboxentry successfully 
deleted.',
-       'bs-shoutbox-archive-failure'         => 'An error occurred while 
trying to delete the shoutboxentry, please try again.',
-       'bs-shoutbox-archive-failure-user'    => 'Shoutboxentries may only be 
deleted by their creator.',
-       'bs-shoutbox-switch-description'      => 'Hides shoutbox on this page',
-       'bs-shoutbox-pref-show'               => 'Display Shoutbox',
-       'bs-shoutbox-charactersleft' => 'Characters left',
+                       $cachedData['deps'][] = new FileDependency( $fileName );
+               }
+               return true;
+       }
 
-       //JavaScript
-       'bs-shoutbox-confirm_text'   => 'Do you really want to delete that 
entry?',
-       'bs-shoutbox-confirm_title'  => 'Confirm',
-       'bs-shoutbox-enterMessage'   => 'Please enter a message.',
-       'bs-shoutbox-too-early'      => 'Please wait a few seconds before 
submitting the next entry.',
-);
-
-$messages['de'] = array(
-       'bs-shoutbox-extension-description'   => 'Unter den Wikiartikeln wird 
eine Shoutbox für unmittelbare Kommentare eingebunden.',
-       'prefs-ShoutBox'                      => 'Shoutbox',
-       'bs-shoutbox-title'                   => 'Shoutbox',
-       'bs-shoutbox-latest_messages'         => 'Letzte Nachrichten',
-       'bs-shoutbox-message'                 => 'Mitteilung',
-       'bs-shoutbox-shout'                   => 'Schicken',
-       'bs-shoutbox-date_format'             => 'd.m.Y H:i:s',
-       'bs-shoutbox-more'                    => 'Mehr Mitteilungen',
-       'bs-shoutbox-no-entries'              => 'Bisher wurden keine 
Mitteilungen gesendet.',
-       'bs-shoutbox-loading'                 => 'Lade...',
-       'bs-shoutbox-ShoutBox'                => 'Shoutbox',
-       'bs-shoutbox-pref-CommitTimeInterval' => 'Zeit zwischen zwei 
Eintragungen in Sekunden <i>(Spamschutz)</i> (<b>15</b>)',
-       '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'         => 'Shoutbox-Eintrag wurde 
erfolgreich gelöscht.',
-       'bs-shoutbox-archive-failure'         => 'Beim Löschen des 
Shoutbox-Eintrags ist ein Fehler aufgetreten, bitte versuche es erneut.',
-       'bs-shoutbox-archive-failure-user'    => 'Shoutbox-Einträge können nur 
von deren Ersteller gelöscht werden.',
-       'bs-shoutbox-switch-description'      => 'Shoutbox wird auf dieser 
Seite nicht angezeigt',
-       'bs-shoutbox-pref-show'               => 'Shoutbox anzeigen',
-       'bs-shoutbox-charactersleft'          => 'Übrige Zeichen',
-
-       //JavaScript
-       '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 Beitrag abschickst.',
-);
-
-$messages['de-formal'] = array(
-       'bs-shoutbox-archive-failure'         => 'Beim Löschen des 
Shoutbox-Eintrags ist ein Fehler aufgetreten, bitte versuchen Sie es erneut.',
-
-       //JavaScript
-       '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 Beitrag abschicken.'
-);
-
-$messages['qqq'] = array();
+       $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShima9d7b38adaf9a3ce';
+}
diff --git a/ShoutBox/resources/bluespice.shoutBox.js 
b/ShoutBox/resources/bluespice.shoutBox.js
index 7e71f90..0db5d5e 100644
--- a/ShoutBox/resources/bluespice.shoutBox.js
+++ b/ShoutBox/resources/bluespice.shoutBox.js
@@ -9,7 +9,7 @@
  * @author     Markus Glaser <[email protected]>
  * @author     Karl Waldmanstetter
  * @version    1.1.0
- 
+
  * @package    Bluespice_Extensions
  * @subpackage ShoutBox
  * @copyright  Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
@@ -37,7 +37,7 @@
        textField: null,
        /**
         * Default value of message field, taken from message input box
-        * @var string 
+        * @var string
         */
        defaultMessage: '',
        /**
@@ -47,17 +47,17 @@
        msgList: null,
        /**
         * Reference to the send button
-        * @var jQuery 
+        * @var jQuery
         */
        btnSend: null,
        /**
         * Reference to the ajax loader gif
-        * @var jQuery 
+        * @var jQuery
         */
        ajaxLoader: null,
        /**
         * Reference to the caracter counter
-        * @var jQuery 
+        * @var jQuery
         */
        characterCounter: null,
        /**
@@ -65,19 +65,18 @@
         * @param sblimit int Maximum number of shouts before more link is 
displayed
         */
        updateShoutbox: function(sblimit) {
-               if (typeof (sblimit) == 'undefined')
-                       sblimit = 0;
+               if ( typeof (sblimit) == 'undefined' ) sblimit = 0;
                BsShoutBox.ajaxLoader.fadeIn();
 
                this.msgList.load(
-                       bs.util.getAjaxDispatcherUrl('ShoutBox::getShouts', 
[wgArticleId, sblimit]),
+                       bs.util.getAjaxDispatcherUrl( 'ShoutBox::getShouts', [ 
wgArticleId, sblimit ] ),
                        function(data) {
                                BsShoutBox.msgList.slideDown();
                                
BsShoutBox.btnSend.blur().removeAttr('disabled'); //reactivate the send button
                                
BsShoutBox.textField.val(BsShoutBox.defaultMessage);
                                
BsShoutBox.textField.blur().removeAttr('disabled');
                                BsShoutBox.ajaxLoader.fadeOut();
-                               
BsShoutBox.characterCounter.text(BsShoutBox.textField.attr('maxlength'));
+                               BsShoutBox.characterCounter.text( mw.message( 
'bs-shoutbox-charactersleft', BsShoutBox.textField.attr( 'maxlength' ) ).text() 
);
                        }
                );
        },
@@ -118,8 +117,9 @@
        });
 
        BsShoutBox.textField.bind("input propertychange", function (e) {
-               var currCharLen = $(this).val() == BsShoutBox.defaultMessage ? 
$(this).attr('maxlength') : $(this).val().length
-               BsShoutBox.characterCounter.text($(this).attr('maxlength') - 
$(this).val().length);
+               var currCharLen = $( this ).attr( 'maxlength' ) - $( this 
).val().length;
+
+               BsShoutBox.characterCounter.text( mw.message( 
'bs-shoutbox-charactersleft', currCharLen ).text() );
        });
 
        $("#bs-sb-form").submit(function() {
@@ -128,7 +128,7 @@
                        bs.util.alert(
                                'bs-shoutbox-alert',
                                {
-                                       textMsg: 'bs-shoutbox-enterMessage'
+                                       textMsg: 'bs-shoutbox-entermessage'
                                }
                        );
                        return false;
@@ -163,8 +163,8 @@
                bs.util.confirm(
                        'bs-shoutbox-confirm',
                        {
-                               titleMsg: 'bs-shoutbox-confirm_title',
-                               textMsg: 'bs-shoutbox-confirm_text'
+                               titleMsg: 'bs-shoutbox-confirm-title',
+                               textMsg: 'bs-shoutbox-confirm-text'
                        },
                {
                        ok: function() {
diff --git a/ShoutBox/views/view.ShoutBox.php b/ShoutBox/views/view.ShoutBox.php
index 8138817..ecb4c18 100644
--- a/ShoutBox/views/view.ShoutBox.php
+++ b/ShoutBox/views/view.ShoutBox.php
@@ -18,7 +18,7 @@
 /**
  * This view renders the Shoutbox frame.
  * @package    BlueSpice_Extensions
- * @subpackage ShoutBox 
+ * @subpackage ShoutBox
  */
 class ViewShoutBox extends ViewBaseElement {
 
@@ -53,16 +53,13 @@
 
                $aOut = array();
                $aOut[] = '<form id="bs-sb-form" class="clearfix">';
-               $aOut[] =   '<textarea id="bs-sb-message" 
maxlength="'.BsConfig::get( 'MW::ShoutBox::MaxMessageLength' ).'">' . 
wfMessage( 'bs-shoutbox-message' )->plain() . '</textarea>';
-               $aOut[] = '  <br />';
-               $aOut[] = '  <img id="bs-sb-loading" 
src="'.$wgScriptPath.'/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-ajax-loader-bar-blue.gif"
 alt="Loading..."/>';
-               $aOut[] = '  <input id="bs-sb-send" type="submit" value="' . 
wfMessage( 'bs-shoutbox-shout' )->plain() . '" />';
-               $aOut[] =   '<p class="bs-sb-textarea-additionalinfo">';
-               $aOut[] =   wfMessage('bs-shoutbox-charactersleft')->plain().': 
';
-               $aOut[] =   '<span id="bs-sb-charactercounter">';
-               $aOut[] =     BsConfig::get( 'MW::ShoutBox::MaxMessageLength' );
-               $aOut[] =   '</span>';
-               $aOut[] =   '</p>';
+               $aOut[] = '<textarea id="bs-sb-message" 
maxlength="'.BsConfig::get( 'MW::ShoutBox::MaxMessageLength' ).'">' . 
wfMessage( 'bs-shoutbox-message' )->plain() . '</textarea>';
+               $aOut[] = '<br />';
+               $aOut[] = '<img id="bs-sb-loading" 
src="'.$wgScriptPath.'/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-ajax-loader-bar-blue.gif"
 alt="Loading..."/>';
+               $aOut[] = '<input id="bs-sb-send" type="submit" value="' . 
wfMessage( 'bs-shoutbox-shout' )->plain() . '" />';
+               $aOut[] = '<p class="bs-sb-textarea-additionalinfo">';
+               $aOut[] = '<span id="bs-sb-charactercounter"></span>';
+               $aOut[] = '</p>';
                $aOut[] = '</form>';
 
                return implode( "\n" , $aOut );
@@ -76,12 +73,11 @@
        protected function wrapAll( $innerText ) {
                $aOut = array();
                $aOut[] = '<div class="bs-sb">';
-               $aOut[] = '  <fieldset>';
-               $aOut[] = '    <legend>' . wfMessage( 'bs-shoutbox-title' 
)->plain() . '</legend>';
+               $aOut[] = '<fieldset>';
+               $aOut[] = '<legend>' . wfMessage( 'bs-shoutbox-title' 
)->plain() . '</legend>';
                $aOut[] = $innerText;
-               //$aOut[] = '    <div id="bs-sb-loading" 
style="display:none;"><img src="' . BsConfig::get('MW::ScriptPath') . 
'/extensions/BlueSpiceExtensions/ShoutBox/css/images/loading.gif" 
alt="'.wfMessage('loading').'" /></div>';
-               $aOut[] = '    <div id="bs-sb-content" 
style="display:none;"></div>';
-               $aOut[] = '  </fieldset>';
+               $aOut[] = '<div id="bs-sb-content" 
style="display:none;"></div>';
+               $aOut[] = '</fieldset>';
                $aOut[] = '</div>';
 
                return implode( "\n" , $aOut );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8407e91ee7751ae6116ab5befa634de683c8fbd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli <[email protected]>

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

Reply via email to