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 <[email protected]>"
]
},
- "bs-dashboards-rss-desc": "Erstellen Sie Ihren eigenen RSS-Feed"
+ "bs-rssfeeder-rss-desc": "Erstellen Sie Ihren eigenen RSS-Feed"
}
diff --git a/RSSFeeder/i18n/de.json b/RSSFeeder/i18n/de.json
index f907bd6..164dd3a 100644
--- a/RSSFeeder/i18n/de.json
+++ b/RSSFeeder/i18n/de.json
@@ -4,13 +4,13 @@
"Stephan Muggli <[email protected]>"
]
},
- "bs-rssfeeder-desc": "Fügt RSS Funktionalität hinzu",
+ "bs-rssfeeder-desc": "Erstelle eigene RSS-Feeds",
"rssfeeder": "RSS Feeder",
- "bs-rssfeeder-pagetext": "Folgende RSS-Feeds stehen zur Verfügung",
+ "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-rssfeeder-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
index 0ad5368..b982fc1 100644
--- a/RSSFeeder/i18n/en.json
+++ b/RSSFeeder/i18n/en.json
@@ -4,13 +4,13 @@
"Stephan Muggli <[email protected]>"
]
},
- "bs-rssfeeder-desc": "Adds RSS functionality",
+ "bs-rssfeeder-desc": "Create your own RSS feed",
"rssfeeder": "RSS feeder",
- "bs-rssfeeder-pagetext": "You can subscribe to the following RSS feeds",
+ "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-rssfeeder-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
index fe46181..1346215 100644
--- a/RSSFeeder/i18n/qqq.json
+++ b/RSSFeeder/i18n/qqq.json
@@ -6,11 +6,11 @@
},
"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}}}"
+ "bs-rssfeeder-pagetext": "Headline on special page for RSS feeds
section:",
+ "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-rssfeeder-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 2d1b4e6..9392016 100644
--- a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
+++ b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
@@ -38,8 +38,8 @@
$this->getOutput()->addModuleStyles( 'ext.bluespice.rssFeeder'
);
$form = new ViewBaseForm();
- $form->setId('RSSFeederForm');
-
$form->setValidationUrl('index.php?&action=remote&mod=RSSFeeder&rf=validate');
+ $form->setId( 'RSSFeederForm' );
+ #$form->setValidationUrl(
'index.php?&action=remote&mod=RSSFeeder&rf=validate' );
$label = new ViewFormElementLabel();
$label->useAutoWidth();
diff --git a/RSSFeeder/languages/RSSFeeder.i18n.php
b/RSSFeeder/languages/RSSFeeder.i18n.php
index cc9c535..d3ee634 100644
--- a/RSSFeeder/languages/RSSFeeder.i18n.php
+++ b/RSSFeeder/languages/RSSFeeder.i18n.php
@@ -15,7 +15,7 @@
function wfJsonI18nShimdd8644b6eedb3e63( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) .
"/../i18n//$csCode.json";
+ $fileName = dirname( __FILE__ ) .
"/../i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents(
$fileName ), true );
foreach ( array_keys( $data ) as $key ) {
--
To view, visit https://gerrit.wikimedia.org/r/148976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c8319ca7ebf8add3b717a347f0f134dea1adf19
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
