Citations button

2020-11-04 15:27:13 +00:00 · 2020-11-04 15:27:13 +00:00 · 4a6c2dee03
parent 0986bab067
commit 4a6c2dee03
17 changed files with 59 additions and 19 deletions
--- 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()
--- 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": "اختر العناصر الإخبارية المشار إليها في مقالتك"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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 आइटम चुनें"
 }
--- 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"
 }
--- 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": "あなたの記事で参照されているニュースワイヤーアイテムを選択してください"
 }
--- 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"
 }
--- 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"
 }
--- 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": "Выберите элементы ленты новостей, на которые есть ссылки в вашей статье"
 }
--- 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": "选择文章中引用的新闻专栏文章"
 }
--- 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 += \
        '      <input type="submit" name="submitPost" value="' + \
        translate['Submit'] + '">\n'
+
+    # for a new blog if newswire items exist then add a citations button
+    if newswire and path.endswith('/newblog'):
+        newPostForm += \
+            '      <input type="submit" name="submitCitations" value="' + \
+            translate['Citations'] + '">\n'
+
    newPostForm += '    </center></div>\n'

    newPostForm += replyStr