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 0000000..81b033f
--- /dev/null
+++ b/RSSFeeder/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "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 0000000..f907bd6
--- /dev/null
+++ b/RSSFeeder/i18n/de.json
@@ -0,0 +1,16 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "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 0000000..0ad5368
--- /dev/null
+++ b/RSSFeeder/i18n/en.json
@@ -0,0 +1,16 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "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 0000000..fe46181
--- /dev/null
+++ b/RSSFeeder/i18n/qqq.json
@@ -0,0 +1,16 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "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 @@
$label = new ViewFormElementLabel();
$label->useAutoWidth();
- $label->setText(wfMessage( 'bs-rssfeeder-pagetext' )->plain());
+ $label->setText( '<h3>' . wfMessage( 'bs-rssfeeder-pagetext'
)->plain() . '</h3>' );
$form->addItem($label);
@@ -54,7 +53,6 @@
}
$this->getOutput()->addHTML(
- '<script type="text/javascript">var page_label
= "'. wfMessage( 'bs-rssfeeder-page_label' )->plain().'";</script>'.
$form->execute()
);
}
diff --git a/RSSFeeder/languages/RSSFeeder.i18n.php
b/RSSFeeder/languages/RSSFeeder.i18n.php
index 3e6d663..cc9c535 100644
--- a/RSSFeeder/languages/RSSFeeder.i18n.php
+++ b/RSSFeeder/languages/RSSFeeder.i18n.php
@@ -1,72 +1,35 @@
<?php
/**
- * Internationalisation file for RSSFeeder
+ * 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 RSSFeeder
- * @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( 'wfJsonI18nShimdd8644b6eedb3e63' ) ) {
+ function wfJsonI18nShimdd8644b6eedb3e63( $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(
- 'rssfeeder' => 'RSSFeeder',
- 'feeder-desc' => '',
- 'bs-rssfeeder-extension-description' => 'A extension to put out
valid RSS for every extension, which has a buildRss-function.',
- 'bs-rssfeeder-pagetext' => '<p><b>RSS (Rich Site
Summary)</b> is a web feed format used to publish frequently updated works. It
includes a headline and a short summary.</p>
-<p>To subscribe to an RSS feed, click on the Show-button, copy the according
link URL and add it to your favourite RSS feed reader.</p>
-<p>You can subscribe to the following RSS feeds:</p>',
- 'bs-rssfeeder-recent_changes' => 'Recent changes',
- 'bs-rssfeeder-recent_changes_text' => 'An overview of recent
changes in the Wiki',
- 'bs-rssfeeder-pages' => 'Page',
- 'bs-rssfeeder-page_label' => 'Pagename',
- 'bs-rssfeeder-pages_text' => 'Please choose a page.',
- 'bs-rssfeeder-followOwn' => 'Contributions',
- 'bs-rssfeeder-followOwn_text' => 'An overview of your own
contributions to the Wiki',
- 'bs-rssfeeder-submit_title' => 'Show',
- 'bs-rssfeeder-field_title_ns' => 'Namespace',
- 'bs-rssfeeder-rss' => 'RSS-Feed',
- 'bs-dashboards-rss-desc' => 'Create your own RSS-Feed',
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
- //Javascript
- 'bs-extjs-rssfeeder-rss-title' => 'RSS-Url'
-);
-
-$messages['de'] = array(
- 'rssfeeder' => 'RSS Feeder',
- 'rssfeeder-desc' => '',
- 'bs-rssfeeder-extension-description' => 'Zeigt RSS-Feeds, die
über den RSS-Standard bereitgestellt werden.',
- 'bs-rssfeeder-pagetext' => '<p><b>RSS (Rich Site
Summary)</b> ist ein abonnierbarer Ticker, der von entsprechenden Programmen in
regelmäßigen Abständen abgerufen wird und neben einer Überschrift einen kurzen
Textanriss liefert.</p>
-<p>Um einen RSS-Feed zu abonnieren, klicke auf den Anzeigen-Button und
übertrage die URL aus der Adresszeile in Ihr RSS-Programm.</p>
-<p>Folgende RSS-Feeds stehen zur Verfügung:</p>',
- 'bs-rssfeeder-recent_changes' => 'Letzte Änderungen',
- 'bs-rssfeeder-recent_changes_text' => 'Überblick über die
letzten Änderungen des Wikis',
- 'bs-rssfeeder-pages' => 'Seite',
- 'bs-rssfeeder-page_label' => 'Seitenname',
- 'bs-rssfeeder-pages_text' => 'Bitte wähle eine
Seite.',
- 'bs-rssfeeder-followOwn' => 'Eigene Beiträge',
- 'bs-rssfeeder-followOwn_text' => 'Überblick über
Änderungen in eigenen Beiträgen',
- 'bs-rssfeeder-submit_title' => 'Anzeigen',
- 'bs-rssfeeder-field_title_ns' => 'Namensraum',
- 'bs-rssfeeder-rss' => 'RSS-Feed',
- 'bs-dashboards-rss-desc' => 'Erstelle deinen eigenen RSS-Feed',
-
- //Javascript
- 'bs-extjs-rssfeeder-rss-title' => 'RSS-Url'
-);
-
-$messages['de-formal'] = array(
- 'bs-rssfeeder-pagetext' => '<p><b>RSS (Rich Site
Summary)</b> ist ein abonnierbarer Ticker, der von entsprechenden Programmen in
regelmäßigen Abständen abgerufen wird und neben einer Überschrift einen kurzen
Textanriss liefert.</p>
-<p>Um einen RSS-Feed zu abonnieren, klicken Sie auf den Anzeigen-Button und
übertragen Sie die URL aus der Adresszeile in Ihr RSS-Programm.</p>
-<p>Folgende RSS-Feeds stehen zur Verfügung:</p>',
- 'bs-rssfeeder-pages_text' => 'Bitte wählen Sie eine
Seite.',
- 'bs-dashboards-rss-desc' => 'Erstellen Sie Ihren eigenen RSS-Feed',
-);
-
-$messages['qqq'] = array();
\ No newline at end of file
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShimdd8644b6eedb3e63';
+}
--
To view, visit https://gerrit.wikimedia.org/r/148975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4831bf2d5fe3e71f5a28644317ac07eb1c386bd
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
