From 4a6c2dee03fd731cbc847f3baf237d7826e926b5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 4 Nov 2020 15:27:13 +0000 Subject: [PATCH] Citations button --- daemon.py | 9 ++++++--- translations/ar.json | 4 +++- translations/ca.json | 4 +++- translations/cy.json | 4 +++- translations/de.json | 4 +++- translations/en.json | 4 +++- translations/es.json | 4 +++- translations/fr.json | 4 +++- translations/ga.json | 4 +++- translations/hi.json | 4 +++- translations/it.json | 4 +++- translations/ja.json | 4 +++- translations/oc.json | 4 +++- translations/pt.json | 4 +++- translations/ru.json | 4 +++- translations/zh.json | 4 +++- webinterface.py | 9 ++++++++- 17 files changed, 59 insertions(+), 19 deletions(-) diff --git a/daemon.py b/daemon.py index 7587f7005..436dca832 100644 --- a/daemon.py +++ b/daemon.py @@ -1830,7 +1830,8 @@ class PubServer(BaseHTTPRequestHandler): chooserNickname, domain, domainFull, - self.server.defaultTimeline).encode('utf-8') + self.server.defaultTimeline, + self.server.newswire).encode('utf-8') self._set_headers('text/html', len(msg), cookie, callingDomain) self._write(msg) @@ -1897,7 +1898,8 @@ class PubServer(BaseHTTPRequestHandler): chooserNickname, domain, domainFull, - self.server.defaultTimeline).encode('utf-8') + self.server.defaultTimeline, + self.server.newswire).encode('utf-8') self._set_headers('text/html', len(msg), cookie, callingDomain) self._write(msg) @@ -8494,7 +8496,8 @@ class PubServer(BaseHTTPRequestHandler): replyPageNumber, nickname, domain, domainFull, - self.server.defaultTimeline).encode('utf-8') + self.server.defaultTimeline, + self.server.newswire).encode('utf-8') if not msg: print('Error replying to ' + inReplyToUrl) self._404() diff --git a/translations/ar.json b/translations/ar.json index d0c16cab4..8eca59b4f 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -325,5 +325,7 @@ "Features" : "ميزات", "Article": "مقال إخباري", "Create an article": "قم بإنشاء مقال", - "Settings": "إعدادات" + "Settings": "إعدادات", + "Citations": "اقتباسات", + "Choose newswire items referenced in your article": "اختر العناصر الإخبارية المشار إليها في مقالتك" } diff --git a/translations/ca.json b/translations/ca.json index 7bb30de20..869000dd5 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -325,5 +325,7 @@ "Features" : "Article", "Article": "Reportatge", "Create an article": "Creeu un article", - "Settings": "Configuració" + "Settings": "Configuració", + "Citations": "Cites", + "Choose newswire items referenced in your article": "Trieu articles de newswire als quals faci referència el vostre article" } diff --git a/translations/cy.json b/translations/cy.json index d3c964222..5a0dc204d 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -325,5 +325,7 @@ "Features" : "Nodweddion", "Article": "Erthygl", "Create an article": "Creu erthygl", - "Settings": "Gosodiadau" + "Settings": "Gosodiadau", + "Citations": "Dyfyniadau", + "Choose newswire items referenced in your article": "Dewiswch eitemau newyddion y cyfeirir atynt yn eich erthygl" } diff --git a/translations/de.json b/translations/de.json index e2e373907..1c5f9b858 100644 --- a/translations/de.json +++ b/translations/de.json @@ -325,5 +325,7 @@ "Features" : "Eigenschaften", "Article": "Artikel", "Create an article": "Erstellen Sie einen Artikel", - "Settings": "Einstellungen" + "Settings": "Einstellungen", + "Citations": "Zitate", + "Choose newswire items referenced in your article": "Wählen Sie Newswire-Artikel aus, auf die in Ihrem Artikel verwiesen wird" } diff --git a/translations/en.json b/translations/en.json index c3d6d80ea..ed5ccb34e 100644 --- a/translations/en.json +++ b/translations/en.json @@ -325,5 +325,7 @@ "Features" : "Features", "Article": "Article", "Create an article": "Create an article", - "Settings": "Settings" + "Settings": "Settings", + "Citations": "Citations", + "Choose newswire items referenced in your article": "Choose newswire items referenced in your article" } diff --git a/translations/es.json b/translations/es.json index 547e1fb11..c9294aaad 100644 --- a/translations/es.json +++ b/translations/es.json @@ -325,5 +325,7 @@ "Features" : "Caracteristicas", "Article": "Artículo", "Create an article": "Crea un articulo", - "Settings": "Configuraciones" + "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" } diff --git a/translations/fr.json b/translations/fr.json index 4d03a9ef9..546f92773 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -325,5 +325,7 @@ "Features" : "Traits", "Article": "Article", "Create an article": "Créer un article", - "Settings": "Réglages" + "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" } diff --git a/translations/ga.json b/translations/ga.json index 1f683ad04..8a1af9ba5 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -325,5 +325,7 @@ "Features" : "Gnéithe", "Article": "Airteagal", "Create an article": "Cruthaigh alt", - "Settings": "Socruithe" + "Settings": "Socruithe", + "Citations": "Citations", + "Choose newswire items referenced in your article": "Roghnaigh míreanna sreanga nuachta dá dtagraítear i d’alt" } diff --git a/translations/hi.json b/translations/hi.json index c181d5b72..387485692 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -325,5 +325,7 @@ "Features" : "विशेषताएं", "Article": "लेख", "Create an article": "एक लेख बनाएँ", - "Settings": "समायोजन" + "Settings": "समायोजन", + "Citations": "उद्धरण", + "Choose newswire items referenced in your article": "अपने लेख में संदर्भित newswire आइटम चुनें" } diff --git a/translations/it.json b/translations/it.json index 0a968746b..f4c88bdf5 100644 --- a/translations/it.json +++ b/translations/it.json @@ -325,5 +325,7 @@ "Features" : "Caratteristiche", "Article": "Articolo", "Create an article": "Crea un articolo", - "Settings": "impostazioni" + "Settings": "impostazioni", + "Citations": "Citazioni", + "Choose newswire items referenced in your article": "Scegli gli articoli del newswire a cui fa riferimento il tuo articolo" } diff --git a/translations/ja.json b/translations/ja.json index 6db9ca798..214348ce5 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -325,5 +325,7 @@ "Features" : "特徴", "Article": "論文", "Create an article": "記事を作成する", - "Settings": "設定" + "Settings": "設定", + "Citations": "引用", + "Choose newswire items referenced in your article": "あなたの記事で参照されているニュースワイヤーアイテムを選択してください" } diff --git a/translations/oc.json b/translations/oc.json index f8de1d224..63c4b2fb5 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -321,5 +321,7 @@ "Features" : "Features", "Article": "Article", "Create an article": "Create an article", - "Settings": "Settings" + "Settings": "Settings", + "Citations": "Citations", + "Choose newswire items referenced in your article": "Choose newswire items referenced in your article" } diff --git a/translations/pt.json b/translations/pt.json index 87519778c..a2529ce67 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -325,5 +325,7 @@ "Features" : "Recursos", "Article": "Artigo", "Create an article": "Crie um artigo", - "Settings": "Definições" + "Settings": "Definições", + "Citations": "Citações", + "Choose newswire items referenced in your article": "Escolha os itens de notícias mencionados em seu artigo" } diff --git a/translations/ru.json b/translations/ru.json index faeceb3a9..6861aa081 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -325,5 +325,7 @@ "Features" : "особенности", "Article": "Статья", "Create an article": "Создать статью", - "Settings": "Настройки" + "Settings": "Настройки", + "Citations": "Цитаты", + "Choose newswire items referenced in your article": "Выберите элементы ленты новостей, на которые есть ссылки в вашей статье" } diff --git a/translations/zh.json b/translations/zh.json index 8ed04b18f..2a8494d61 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -325,5 +325,7 @@ "Features" : "特征", "Article": "文章", "Create an article": "建立文章", - "Settings": "设定值" + "Settings": "设定值", + "Citations": "引文", + "Choose newswire items referenced in your article": "选择文章中引用的新闻专栏文章" } diff --git a/webinterface.py b/webinterface.py index 899243fee..4f31d5265 100644 --- a/webinterface.py +++ b/webinterface.py @@ -2525,7 +2525,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, reportUrl: str, pageNumber: int, nickname: str, domain: str, domainFull: str, - defaultTimeline: str) -> str: + defaultTimeline: str, newswire: {}) -> str: """New post screen """ iconsDir = getIconsDir(baseDir) @@ -2996,6 +2996,13 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, newPostForm += \ ' \n' + + # for a new blog if newswire items exist then add a citations button + if newswire and path.endswith('/newblog'): + newPostForm += \ + ' \n' + newPostForm += ' \n' newPostForm += replyStr