jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356335 )
Change subject: Add blog rss feed description message
......................................................................
Add blog rss feed description message
Description message used in Blog RSS feed was wrong
Change-Id: I69db4b60c5907f1ca186565bd74695671a572f19
ERM: #6407
---
M Blog/Blog.class.php
M Blog/i18n/de.json
M Blog/i18n/en.json
M Blog/i18n/qqq.json
4 files changed, 7 insertions(+), 4 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 0d66d5d..46052de 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -826,7 +826,7 @@
$oChannel = RSSCreator::createChannel(
RSSCreator::xmlEncode( $wgSitename . ' - ' . $sPageName
),
- 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'],
wfMessage( 'bs-rssstandards-description_page' )->plain()
+ 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'],
wfMessage( 'bs-blog-rss-desc-blog' )->plain()
);
$oTitle = Title::makeTitle( $iNSid , 'Blog' );
diff --git a/Blog/i18n/de.json b/Blog/i18n/de.json
index 806ae15..9865cce 100644
--- a/Blog/i18n/de.json
+++ b/Blog/i18n/de.json
@@ -32,5 +32,6 @@
"bs-blog-tag-blog-desc": "Schließt einen Weblog von Artikel-,
Diskussions- und Dateiseiten ein. Kann durch verschiedene Parameter angegeben
werden. Dies kann in beliebiger Reihenfolge kombiniert werden.",
"bs-blog-tag-blogmore-desc": "Definiert die Länge des Teasers für den
Blogbeitrag. Innerhalb des Beitrags am Ende des beabsichtigten Teasers
festgelegt. Dadurch erscheint der Link „{{int:bs-blog-read-more}}“, der auf den
ganzen Blogartikel verweist.",
"bs-blog-tag-blogtime-desc": "Fügt einen selbstdefinierten Zeitstempel
zur Anzeige und Sortierung in Blogbeiträgen ein. Das Format ist JJJJMMTTSSmm.",
- "bs-blog-tag-blogtime-err": "Das Format ist YYYYMMDDHHmm, d. h. für den
12. Jan. 2013 15:43 muss der Zeitstempel wie folgt angegeben sein: 201301121543"
+ "bs-blog-tag-blogtime-err": "Das Format ist YYYYMMDDHHmm, d. h. für den
12. Jan. 2013 15:43 muss der Zeitstempel wie folgt angegeben sein:
201301121543",
+ "bs-blog-rss-desc-blog": "Überblick über die Blogeinträge"
}
diff --git a/Blog/i18n/en.json b/Blog/i18n/en.json
index cb400f7..23b55f4 100644
--- a/Blog/i18n/en.json
+++ b/Blog/i18n/en.json
@@ -30,5 +30,6 @@
"bs-blog-tag-blog-desc": "Includes a weblog of article, discussion and
file pages. Can be specified by various parameters. These can be combined in
any order.",
"bs-blog-tag-blogmore-desc": "Defines length of teaser for blog post.
Set within the post at the end of the intended teaser. As a result, the link
\"{{int:bs-blog-read-more}}\" appears, which links to the whole blog article.",
"bs-blog-tag-blogtime-desc": "Inserts a self defined time stamp for
display and sorting in blog posts. The format is YYYYMMDDHHmm.",
- "bs-blog-tag-blogtime-err": "The format has to be YYYYMMDDHHmm i.e. for
12. Jan. 2013 15:43 the timestamps looks like: 201301121543"
+ "bs-blog-tag-blogtime-err": "The format has to be YYYYMMDDHHmm i.e. for
12. Jan. 2013 15:43 the timestamps looks like: 201301121543",
+ "bs-blog-rss-desc-blog": "Feed with an overview over the blog entries"
}
diff --git a/Blog/i18n/qqq.json b/Blog/i18n/qqq.json
index d3cd01f..0eb74df 100644
--- a/Blog/i18n/qqq.json
+++ b/Blog/i18n/qqq.json
@@ -33,5 +33,6 @@
"bs-blog-tag-blog-desc": "Used in InsertMagic extension, tag
description for display blog entries on every page.\n{{Related|Bs-tag-desc}}",
"bs-blog-tag-blogmore-desc": "Used in InsertMagic extension, tag
description for setting teaser boundary on every
page.\n{{Related|Bs-tag-desc}}",
"bs-blog-tag-blogtime-desc": "Used in InsertMagic extension, tag
description for setting blog timestamp on every page.\n{{Related|Bs-tag-desc}}",
- "bs-blog-tag-blogtime-err": "Error message on bs:blog:time tag when
there is a wrong timestamp format.\nShould be YYYYMMDDHHmm (YmdHi)."
+ "bs-blog-tag-blogtime-err": "Error message on bs:blog:time tag when
there is a wrong timestamp format.\nShould be YYYYMMDDHHmm (YmdHi).",
+ "bs-blog-rss-desc-blog": "Description of blog entry RSS feed"
}
--
To view, visit https://gerrit.wikimedia.org/r/356335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69db4b60c5907f1ca186565bd74695671a572f19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: ItSpiderman <d.savulje...@gmail.com>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
