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

Change terminology for news instances

merge-requests/30/head
Bob Mottram 2021-02-05 11:35:25 +00:00
parent 668c96f6ea
commit 48e7d17d93
16 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
translations/ar.json
View File

@ -366,5 +366,6 @@
"Version": "الإصدار", "Version": "الإصدار",
"Skip to timeline": "تخطي إلى الجدول الزمني", "Skip to timeline": "تخطي إلى الجدول الزمني",
"Skip to Newswire": "انتقل إلى Newswire", "Skip to Newswire": "انتقل إلى Newswire",
"Skip to Links": "تخطي إلى روابط الويب" "Skip to Links": "تخطي إلى روابط الويب",
"Publish a blog article": "نشر مقال بلوق"
} }

3
translations/ca.json
View File

@ -366,5 +366,6 @@
"Version": "Versió", "Version": "Versió",
"Skip to timeline": "Ves a la cronologia", "Skip to timeline": "Ves a la cronologia",
"Skip to Newswire": "Vés a Newswire", "Skip to Newswire": "Vés a Newswire",
"Skip to Links": "Vés als enllaços web" "Skip to Links": "Vés als enllaços web",
"Publish a blog article": "Publicar un article del bloc"
} }

3
translations/cy.json
View File

@ -366,5 +366,6 @@
"Version": "Fersiwn", "Version": "Fersiwn",
"Skip to timeline": "Neidio i'r llinell amser", "Skip to timeline": "Neidio i'r llinell amser",
"Skip to Newswire": "Neidio i Newswire", "Skip to Newswire": "Neidio i Newswire",
"Skip to Links": "Neidio i Dolenni Gwe" "Skip to Links": "Neidio i Dolenni Gwe",
"Publish a blog article": "Cyhoeddi erthygl blog"
} }

3
translations/de.json
View File

@ -366,5 +366,6 @@
"Version": "Ausführung", "Version": "Ausführung",
"Skip to timeline": "Zur Zeitleiste springen", "Skip to timeline": "Zur Zeitleiste springen",
"Skip to Newswire": "Springe zu Newswire", "Skip to Newswire": "Springe zu Newswire",
"Skip to Links": "Springe zu Weblinks" "Skip to Links": "Springe zu Weblinks",
"Publish a blog article": "Veröffentlichen Sie einen Blog-Artikel"
} }

3
translations/en.json
View File

@ -366,5 +366,6 @@
"Version": "Version", "Version": "Version",
"Skip to timeline": "Skip to timeline", "Skip to timeline": "Skip to timeline",
"Skip to Newswire": "Skip to Newswire", "Skip to Newswire": "Skip to Newswire",
"Skip to Links": "Skip to Links" "Skip to Links": "Skip to Links",
"Publish a blog article": "Publish a blog article"
} }

3
translations/es.json
View File

@ -366,5 +366,6 @@
"Version": "Versión", "Version": "Versión",
"Skip to timeline": "Saltar a la línea de tiempo", "Skip to timeline": "Saltar a la línea de tiempo",
"Skip to Newswire": "Saltar a Newswire", "Skip to Newswire": "Saltar a Newswire",
"Skip to Links": "Saltar a enlaces web" "Skip to Links": "Saltar a enlaces web",
"Publish a blog article": "Publica un artículo de blog"
} }

3
translations/fr.json
View File

@ -366,5 +366,6 @@
"Version": "Version", "Version": "Version",
"Skip to timeline": "Passer à la chronologie", "Skip to timeline": "Passer à la chronologie",
"Skip to Newswire": "Passer à Newswire", "Skip to Newswire": "Passer à Newswire",
"Skip to Links": "Passer aux liens Web" "Skip to Links": "Passer aux liens Web",
"Publish a blog article": "Publier un article de blog"
} }

3
translations/ga.json
View File

@ -366,5 +366,6 @@
"Version": "Leagan", "Version": "Leagan",
"Skip to timeline": "Scipeáil chuig an amlíne", "Skip to timeline": "Scipeáil chuig an amlíne",
"Skip to Newswire": "Scipeáil chuig Newswire", "Skip to Newswire": "Scipeáil chuig Newswire",
"Skip to Links": "Scipeáil chuig Naisc Ghréasáin" "Skip to Links": "Scipeáil chuig Naisc Ghréasáin",
"Publish a blog article": "Foilsigh alt blagála"
} }

3
translations/hi.json
View File

@ -366,5 +366,6 @@
"Version": "संस्करण", "Version": "संस्करण",
"Skip to timeline": "टाइमलाइन पर जाएं", "Skip to timeline": "टाइमलाइन पर जाएं",
"Skip to Newswire": "Newswire पर जाएं", "Skip to Newswire": "Newswire पर जाएं",
"Skip to Links": "वेब लिंक पर जाएं" "Skip to Links": "वेब लिंक पर जाएं",
"Publish a blog article": "एक ब्लॉग लेख प्रकाशित करें"
} }

3
translations/it.json
View File

@ -366,5 +366,6 @@
"Version": "Versione", "Version": "Versione",
"Skip to timeline": "Passa alla sequenza temporale", "Skip to timeline": "Passa alla sequenza temporale",
"Skip to Newswire": "Passa a Newswire", "Skip to Newswire": "Passa a Newswire",
"Skip to Links": "Passa a collegamenti Web" "Skip to Links": "Passa a collegamenti Web",
"Publish a blog article": "Pubblica un articolo sul blog"
} }

3
translations/ja.json
View File

@ -366,5 +366,6 @@
"Version": "バージョン", "Version": "バージョン",
"Skip to timeline": "タイムラインにスキップ", "Skip to timeline": "タイムラインにスキップ",
"Skip to Newswire": "Newswireにスキップ", "Skip to Newswire": "Newswireにスキップ",
"Skip to Links": "Webリンクにスキップ" "Skip to Links": "Webリンクにスキップ",
"Publish a blog article": "ブログ記事を公開する"
} }

3
translations/oc.json
View File

@ -362,5 +362,6 @@
"Version": "Version", "Version": "Version",
"Skip to timeline": "Skip to timeline", "Skip to timeline": "Skip to timeline",
"Skip to Newswire": "Skip to Newswire", "Skip to Newswire": "Skip to Newswire",
"Skip to Links": "Skip to Links" "Skip to Links": "Skip to Links",
"Publish a blog article": "Publish a blog article"
} }

3
translations/pt.json
View File

@ -366,5 +366,6 @@
"Version": "Versão", "Version": "Versão",
"Skip to timeline": "Pular para a linha do tempo", "Skip to timeline": "Pular para a linha do tempo",
"Skip to Newswire": "Pular para Newswire", "Skip to Newswire": "Pular para Newswire",
"Skip to Links": "Pular para links da web" "Skip to Links": "Pular para links da web",
"Publish a blog article": "Publique um artigo de blog"
} }

3
translations/ru.json
View File

@ -366,5 +366,6 @@
"Version": "Версия", "Version": "Версия",
"Skip to timeline": "Перейти к временной шкале", "Skip to timeline": "Перейти к временной шкале",
"Skip to Newswire": "Перейти к ленте новостей", "Skip to Newswire": "Перейти к ленте новостей",
"Skip to Links": "Перейти к веб-ссылкам" "Skip to Links": "Перейти к веб-ссылкам",
"Publish a blog article": "Опубликовать статью в блоге"
} }

3
translations/zh.json
View File

@ -366,5 +366,6 @@
"Version": "版", "Version": "版",
"Skip to timeline": "跳到时间线", "Skip to timeline": "跳到时间线",
"Skip to Newswire": "跳到新闻专线", "Skip to Newswire": "跳到新闻专线",
"Skip to Links": "跳到网页链接" "Skip to Links": "跳到网页链接",
"Publish a blog article": "发布博客文章"
} }

18
webapp_column_right.py
View File

@ -50,7 +50,8 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, authorized: bool,
showHeaderImage: bool, showHeaderImage: bool,
theme: str) -> str: theme: str,
defaultTimeline: str) -> str:
"""Returns html content for the right column """Returns html content for the right column
""" """
htmlStr = '' htmlStr = ''
@ -62,10 +63,13 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
if authorized: if authorized:
# only show the publish button if logged in, otherwise replace it with # only show the publish button if logged in, otherwise replace it with
# a login button # a login button
titleStr = translate['Publish a blog article']
if defaultTimeline == 'tlfeatures':
titleStr = translate['Publish a news article']
publishButtonStr = \ publishButtonStr = \
' <a href="' + \ ' <a href="' + \
'/users/' + nickname + '/newblog" ' + \ '/users/' + nickname + '/newblog" ' + \
'title="' + translate['Publish a news article'] + '">' + \ 'title="' + titleStr + '">' + \
'<button class="publishbtn">' + \ '<button class="publishbtn">' + \
translate['Publish'] + '</button></a>\n' translate['Publish'] + '</button></a>\n'
else: else:
@ -158,13 +162,16 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
# show publish icon at top # show publish icon at top
if showPublishButton: if showPublishButton:
if showPublishAsIcon: if showPublishAsIcon:
titleStr = translate['Publish a blog article']
if defaultTimeline == 'tlfeatures':
titleStr = translate['Publish a news article']
htmlStr += \ htmlStr += \
' <a href="' + \ ' <a href="' + \
'/users/' + nickname + '/newblog">' + \ '/users/' + nickname + '/newblog">' + \
'<img class="' + editImageClass + \ '<img class="' + editImageClass + \
'" loading="lazy" alt="' + \ '" loading="lazy" alt="' + \
translate['Publish a news article'] + '" title="' + \ titleStr + '" title="' + \
translate['Publish a news article'] + '" src="/' + \ titleStr + '" src="/' + \
'icons/publish.png" /></a>\n' 'icons/publish.png" /></a>\n'
if editImageClass == 'rightColEdit': if editImageClass == 'rightColEdit':
@ -485,7 +492,8 @@ def htmlNewswireMobile(cssCache: {}, baseDir: str, nickname: str,
newswire, positiveVoting, newswire, positiveVoting,
False, timelinePath, showPublishButton, False, timelinePath, showPublishButton,
showPublishAsIcon, rssIconAtTop, False, showPublishAsIcon, rssIconAtTop, False,
authorized, False, theme) authorized, False, theme,
defaultTimeline)
else: else:
if editor: if editor:
htmlStr += '<br><br><br>\n' htmlStr += '<br><br><br>\n'