diff --git a/translations/ar.json b/translations/ar.json index 1118a56b1..f39a708a8 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -327,5 +327,6 @@ "Create an article": "قم بإنشاء مقال", "Settings": "إعدادات", "Citations": "اقتباسات", - "Choose newswire items referenced in your article": "اختر العناصر الإخبارية المشار إليها في مقالتك" + "Choose newswire items referenced in your article": "اختر العناصر الإخبارية المشار إليها في مقالتك", + "RSS feed for your blog": "تغذية RSS لمدونتك" } diff --git a/translations/ca.json b/translations/ca.json index 797ad5469..29c09497c 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -327,5 +327,6 @@ "Create an article": "Creeu un article", "Settings": "Configuració", "Citations": "Cites", - "Choose newswire items referenced in your article": "Trieu articles de newswire als quals faci referència el vostre article" + "Choose newswire items referenced in your article": "Trieu articles de newswire als quals faci referència el vostre article", + "RSS feed for your blog": "Feed RSS del vostre bloc" } diff --git a/translations/cy.json b/translations/cy.json index d5cdb532d..d6791b73b 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -327,5 +327,6 @@ "Create an article": "Creu erthygl", "Settings": "Gosodiadau", "Citations": "Dyfyniadau", - "Choose newswire items referenced in your article": "Dewiswch eitemau newyddion y cyfeirir atynt yn eich erthygl" + "Choose newswire items referenced in your article": "Dewiswch eitemau newyddion y cyfeirir atynt yn eich erthygl", + "RSS feed for your blog": "Porthiant RSS ar gyfer eich blog" } diff --git a/translations/de.json b/translations/de.json index b8eb64df8..b9a4fd7ec 100644 --- a/translations/de.json +++ b/translations/de.json @@ -327,5 +327,6 @@ "Create an article": "Erstellen Sie einen Artikel", "Settings": "Einstellungen", "Citations": "Zitate", - "Choose newswire items referenced in your article": "Wählen Sie Newswire-Artikel aus, auf die in Ihrem Artikel verwiesen wird" + "Choose newswire items referenced in your article": "Wählen Sie Newswire-Artikel aus, auf die in Ihrem Artikel verwiesen wird", + "RSS feed for your blog": "RSS-Feed für Ihr Blog" } diff --git a/translations/en.json b/translations/en.json index 0b7b9b3c3..f2c6a566d 100644 --- a/translations/en.json +++ b/translations/en.json @@ -327,5 +327,6 @@ "Create an article": "Create an article", "Settings": "Settings", "Citations": "Citations", - "Choose newswire items referenced in your article": "Choose newswire items referenced in your article" + "Choose newswire items referenced in your article": "Choose newswire items referenced in your article", + "RSS feed for your blog": "RSS feed for your blog" } diff --git a/translations/es.json b/translations/es.json index dac48137c..693590fb6 100644 --- a/translations/es.json +++ b/translations/es.json @@ -327,5 +327,6 @@ "Create an article": "Crea un articulo", "Settings": "Configuraciones", "Citations": "Citas", - "Choose newswire items referenced in your article": "Elija elementos de Newswire a los que se hace referencia en su artículo" + "Choose newswire items referenced in your article": "Elija elementos de Newswire a los que se hace referencia en su artículo", + "RSS feed for your blog": "Fuente RSS para tu blog" } diff --git a/translations/fr.json b/translations/fr.json index e1edeefb3..f5422ddbb 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -327,5 +327,6 @@ "Create an article": "Créer un article", "Settings": "Réglages", "Citations": "Citations", - "Choose newswire items referenced in your article": "Choisissez les éléments de fil d'actualité référencés dans votre article" + "Choose newswire items referenced in your article": "Choisissez les éléments de fil d'actualité référencés dans votre article", + "RSS feed for your blog": "Flux RSS pour votre blog" } diff --git a/translations/ga.json b/translations/ga.json index ba28b61e6..3836db30d 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -327,5 +327,6 @@ "Create an article": "Cruthaigh alt", "Settings": "Socruithe", "Citations": "Citations", - "Choose newswire items referenced in your article": "Roghnaigh míreanna sreanga nuachta dá dtagraítear i d’alt" + "Choose newswire items referenced in your article": "Roghnaigh míreanna sreanga nuachta dá dtagraítear i d’alt", + "RSS feed for your blog": "Fotha RSS do do bhlag" } diff --git a/translations/hi.json b/translations/hi.json index 11daf17df..31b486e7f 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -327,5 +327,6 @@ "Create an article": "एक लेख बनाएँ", "Settings": "समायोजन", "Citations": "उद्धरण", - "Choose newswire items referenced in your article": "अपने लेख में संदर्भित newswire आइटम चुनें" + "Choose newswire items referenced in your article": "अपने लेख में संदर्भित newswire आइटम चुनें", + "RSS feed for your blog": "RSS आपके ब्लॉग के लिए फ़ीड करता है" } diff --git a/translations/it.json b/translations/it.json index 2470fc5d9..f65e18c98 100644 --- a/translations/it.json +++ b/translations/it.json @@ -327,5 +327,6 @@ "Create an article": "Crea un articolo", "Settings": "impostazioni", "Citations": "Citazioni", - "Choose newswire items referenced in your article": "Scegli gli articoli del newswire a cui fa riferimento il tuo articolo" + "Choose newswire items referenced in your article": "Scegli gli articoli del newswire a cui fa riferimento il tuo articolo", + "RSS feed for your blog": "Feed RSS per il tuo blog" } diff --git a/translations/ja.json b/translations/ja.json index d6b71d6ca..bafa38784 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -327,5 +327,6 @@ "Create an article": "記事を作成する", "Settings": "設定", "Citations": "引用", - "Choose newswire items referenced in your article": "あなたの記事で参照されているニュースワイヤーアイテムを選択してください" + "Choose newswire items referenced in your article": "あなたの記事で参照されているニュースワイヤーアイテムを選択してください", + "RSS feed for your blog": "ブログのRSSフィード" } diff --git a/translations/oc.json b/translations/oc.json index efda869e1..250302075 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -323,5 +323,6 @@ "Create an article": "Create an article", "Settings": "Settings", "Citations": "Citations", - "Choose newswire items referenced in your article": "Choose newswire items referenced in your article" + "Choose newswire items referenced in your article": "Choose newswire items referenced in your article", + "RSS feed for your blog": "RSS feed for your blog" } diff --git a/translations/pt.json b/translations/pt.json index 316fdcf85..831c1d106 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -327,5 +327,6 @@ "Create an article": "Crie um artigo", "Settings": "Definições", "Citations": "Citações", - "Choose newswire items referenced in your article": "Escolha os itens de notícias mencionados em seu artigo" + "Choose newswire items referenced in your article": "Escolha os itens de notícias mencionados em seu artigo", + "RSS feed for your blog": "Feed RSS para o seu blog" } diff --git a/translations/ru.json b/translations/ru.json index 885238420..2665feb49 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -327,5 +327,6 @@ "Create an article": "Создать статью", "Settings": "Настройки", "Citations": "Цитаты", - "Choose newswire items referenced in your article": "Выберите элементы ленты новостей, на которые есть ссылки в вашей статье" + "Choose newswire items referenced in your article": "Выберите элементы ленты новостей, на которые есть ссылки в вашей статье", + "RSS feed for your blog": "RSS-канал для вашего блога" } diff --git a/translations/zh.json b/translations/zh.json index f7ba586ec..635ceeeff 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -327,5 +327,6 @@ "Create an article": "建立文章", "Settings": "设定值", "Citations": "引文", - "Choose newswire items referenced in your article": "选择文章中引用的新闻专栏文章" + "Choose newswire items referenced in your article": "选择文章中引用的新闻专栏文章", + "RSS feed for your blog": "您博客的RSS供稿" } diff --git a/webinterface.py b/webinterface.py index 0ce2d12a8..8f88455ce 100644 --- a/webinterface.py +++ b/webinterface.py @@ -3642,7 +3642,8 @@ def htmlProfile(rssIconAtTop: bool, getLeftColumnContent(baseDir, 'news', domainFull, httpPrefix, translate, iconsDir, False, - False, None, rssIconAtTop, True) + False, None, rssIconAtTop, True, + True) profileHeaderStr += ' \n' profileHeaderStr += ' \n' else: @@ -5681,7 +5682,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str, httpPrefix: str, translate: {}, iconsDir: str, editor: bool, showBackButton: bool, timelinePath: str, - rssIconAtTop: bool, showHeaderImage: bool) -> str: + rssIconAtTop: bool, showHeaderImage: bool, + frontPage: bool) -> str: """Returns html content for the left column """ htmlStr = '' @@ -5756,12 +5758,15 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str, else: # rss feed for all accounts on the instance rssUrl = httpPrefix + '://' + domainFull + '/blog/rss.xml' + if not frontPage: + rssTitle = translate['RSS feed for your blog'] + else: + rssTitle = translate['RSS feed for this site'] rssIconStr = \ ' ' + \ '' + \ - translate['RSS feed for this site'] + \ - '\n' if rssIconAtTop: htmlStr += rssIconStr @@ -6234,7 +6239,7 @@ def htmlLinksMobile(cssCache: {}, baseDir: str, httpPrefix, translate, iconsDir, editor, False, timelinePath, - rssIconAtTop, False) + rssIconAtTop, False, False) htmlStr += '\n' + htmlFooter() return htmlStr @@ -7124,7 +7129,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, getLeftColumnContent(baseDir, nickname, domainFull, httpPrefix, translate, iconsDir, editor, False, None, rssIconAtTop, - True) + True, False) tlStr += ' ' + \ leftColumnStr + ' \n' # center column containing posts