indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Differing titles for left column rss feed

merge-requests/30/head
Bob Mottram 2020-11-08 13:54:47 +00:00
parent 1b69ea8bda
commit 46b3729506
16 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
translations/ar.json
View File

@ -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": "اختر العناصر الإخبارية المشار إليها في مقالتك",
"RSS feed for your blog": "تغذية RSS لمدونتك"
} }

3
translations/ca.json
View File

@ -327,5 +327,6 @@
"Create an article": "Creeu un article", "Create an article": "Creeu un article",
"Settings": "Configuració", "Settings": "Configuració",
"Citations": "Cites", "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"
} }

3
translations/cy.json
View File

@ -327,5 +327,6 @@
"Create an article": "Creu erthygl", "Create an article": "Creu erthygl",
"Settings": "Gosodiadau", "Settings": "Gosodiadau",
"Citations": "Dyfyniadau", "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"
} }

3
translations/de.json
View File

@ -327,5 +327,6 @@
"Create an article": "Erstellen Sie einen Artikel", "Create an article": "Erstellen Sie einen Artikel",
"Settings": "Einstellungen", "Settings": "Einstellungen",
"Citations": "Zitate", "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"
} }

3
translations/en.json
View File

@ -327,5 +327,6 @@
"Create an article": "Create an article", "Create an article": "Create an article",
"Settings": "Settings", "Settings": "Settings",
"Citations": "Citations", "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"
} }

3
translations/es.json
View File

@ -327,5 +327,6 @@
"Create an article": "Crea un articulo", "Create an article": "Crea un articulo",
"Settings": "Configuraciones", "Settings": "Configuraciones",
"Citations": "Citas", "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"
} }

3
translations/fr.json
View File

@ -327,5 +327,6 @@
"Create an article": "Créer un article", "Create an article": "Créer un article",
"Settings": "Réglages", "Settings": "Réglages",
"Citations": "Citations", "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"
} }

3
translations/ga.json
View File

@ -327,5 +327,6 @@
"Create an article": "Cruthaigh alt", "Create an article": "Cruthaigh alt",
"Settings": "Socruithe", "Settings": "Socruithe",
"Citations": "Citations", "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"
} }

3
translations/hi.json
View File

@ -327,5 +327,6 @@
"Create an article": "एक लेख बनाएँ", "Create an article": "एक लेख बनाएँ",
"Settings": "समायोजन", "Settings": "समायोजन",
"Citations": "उद्धरण", "Citations": "उद्धरण",
"Choose newswire items referenced in your article": "अपने लेख में संदर्भित newswire आइटम चुनें" "Choose newswire items referenced in your article": "अपने लेख में संदर्भित newswire आइटम चुनें",
"RSS feed for your blog": "RSS आपके ब्लॉग के लिए फ़ीड करता है"
} }

3
translations/it.json
View File

@ -327,5 +327,6 @@
"Create an article": "Crea un articolo", "Create an article": "Crea un articolo",
"Settings": "impostazioni", "Settings": "impostazioni",
"Citations": "Citazioni", "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"
} }

3
translations/ja.json
View File

@ -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": "あなたの記事で参照されているニュースワイヤーアイテムを選択してください",
"RSS feed for your blog": "ブログのRSSフィード"
} }

3
translations/oc.json
View File

@ -323,5 +323,6 @@
"Create an article": "Create an article", "Create an article": "Create an article",
"Settings": "Settings", "Settings": "Settings",
"Citations": "Citations", "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"
} }

3
translations/pt.json
View File

@ -327,5 +327,6 @@
"Create an article": "Crie um artigo", "Create an article": "Crie um artigo",
"Settings": "Definições", "Settings": "Definições",
"Citations": "Citaçõ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"
} }

3
translations/ru.json
View File

@ -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": "Выберите элементы ленты новостей, на которые есть ссылки в вашей статье",
"RSS feed for your blog": "RSS-канал для вашего блога"
} }

3
translations/zh.json
View File

@ -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": "选择文章中引用的新闻专栏文章",
"RSS feed for your blog": "您博客的RSS供稿"
} }

19
webinterface.py
View File

@ -3642,7 +3642,8 @@ def htmlProfile(rssIconAtTop: bool,
getLeftColumnContent(baseDir, 'news', domainFull, getLeftColumnContent(baseDir, 'news', domainFull,
httpPrefix, translate, httpPrefix, translate,
iconsDir, False, iconsDir, False,
False, None, rssIconAtTop, True) False, None, rssIconAtTop, True,
True)
profileHeaderStr += ' </td>\n' profileHeaderStr += ' </td>\n'
profileHeaderStr += ' <td valign="top" class="col-center">\n' profileHeaderStr += ' <td valign="top" class="col-center">\n'
else: else:
@ -5681,7 +5682,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
httpPrefix: str, translate: {}, httpPrefix: str, translate: {},
iconsDir: str, editor: bool, iconsDir: str, editor: bool,
showBackButton: bool, timelinePath: str, showBackButton: bool, timelinePath: str,
rssIconAtTop: bool, showHeaderImage: bool) -> str: rssIconAtTop: bool, showHeaderImage: bool,
frontPage: bool) -> str:
"""Returns html content for the left column """Returns html content for the left column
""" """
htmlStr = '' htmlStr = ''
@ -5756,12 +5758,15 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
else: else:
# rss feed for all accounts on the instance # rss feed for all accounts on the instance
rssUrl = httpPrefix + '://' + domainFull + '/blog/rss.xml' 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 = \ rssIconStr = \
' <a href="' + rssUrl + '">' + \ ' <a href="' + rssUrl + '">' + \
'<img class="' + editImageClass + \ '<img class="' + editImageClass + \
'" loading="lazy" alt="' + \ '" loading="lazy" alt="' + rssTitle + \
translate['RSS feed for this site'] + \ '" title="' + rssTitle + \
'" title="' + translate['RSS feed for this site'] + \
'" src="/' + iconsDir + '/logorss.png" /></a>\n' '" src="/' + iconsDir + '/logorss.png" /></a>\n'
if rssIconAtTop: if rssIconAtTop:
htmlStr += rssIconStr htmlStr += rssIconStr
@ -6234,7 +6239,7 @@ def htmlLinksMobile(cssCache: {}, baseDir: str,
httpPrefix, translate, httpPrefix, translate,
iconsDir, editor, iconsDir, editor,
False, timelinePath, False, timelinePath,
rssIconAtTop, False) rssIconAtTop, False, False)
htmlStr += '</div>\n' + htmlFooter() htmlStr += '</div>\n' + htmlFooter()
return htmlStr return htmlStr
@ -7124,7 +7129,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
getLeftColumnContent(baseDir, nickname, domainFull, getLeftColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, iconsDir, httpPrefix, translate, iconsDir,
editor, False, None, rssIconAtTop, editor, False, None, rssIconAtTop,
True) True, False)
tlStr += ' <td valign="top" class="col-left">' + \ tlStr += ' <td valign="top" class="col-left">' + \
leftColumnStr + ' </td>\n' leftColumnStr + ' </td>\n'
# center column containing posts # center column containing posts