From f46f7e4480de0a3497190db4dc3127fc4569e9bb Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 6 Oct 2020 22:28:40 +0100 Subject: [PATCH] No slash --- newswire.py | 5 ++++- 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 | 11 +++++++---- 17 files changed, 56 insertions(+), 20 deletions(-) diff --git a/newswire.py b/newswire.py index 7b720b69..f5d9eaa4 100644 --- a/newswire.py +++ b/newswire.py @@ -17,7 +17,6 @@ from utils import locatePost from utils import loadJson from utils import saveJson from utils import isSuspended -# from utils import getConfigParam def rss2Header(httpPrefix: str, @@ -263,6 +262,10 @@ def addBlogsToNewswire(baseDir: str, newswire: {}, if isSuspended(baseDir, nickname): continue + if os.path.isfile(baseDir + '/accounts/' + handle + + '/.nonewswire'): + continue + # is there a blogs timeline for this account? accountDir = os.path.join(baseDir + '/accounts', handle) blogsIndex = accountDir + '/tlblogs.index' diff --git a/translations/ar.json b/translations/ar.json index ac05265f..0b9ffa55 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "الألقاب التي تظهر إدخالات المدونة الخاصة بها على موقع الأخبار.", "Posts to be approved": "الوظائف المطلوب الموافقة عليها", "Discuss": "مناقشة", - "Moderator Discussion": "مناقشة المنسق" + "Moderator Discussion": "مناقشة المنسق", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/ca.json b/translations/ca.json index 78fbff61..7d1daca4 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Sobrenoms les entrades del bloc apareixen a newswire.", "Posts to be approved": "Missatges per aprovar", "Discuss": "Discuteix", - "Moderator Discussion": "Discussió sobre moderadors" + "Moderator Discussion": "Discussió sobre moderadors", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/cy.json b/translations/cy.json index c4ed63de..67522c00 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Llysenwau y mae eu cofnodion blog yn ymddangos ar y we newyddion.", "Posts to be approved": "Swyddi i'w cymeradwyo", "Discuss": "Trafodwch", - "Moderator Discussion": "Trafodaeth Cymedrolwr" + "Moderator Discussion": "Trafodaeth Cymedrolwr", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/de.json b/translations/de.json index a5f935f9..0f1819f6 100644 --- a/translations/de.json +++ b/translations/de.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Spitznamen, deren Blogeinträge im Newswire erscheinen.", "Posts to be approved": "Zu genehmigende Beiträge", "Discuss": "Diskutieren", - "Moderator Discussion": "Moderatorendiskussion" + "Moderator Discussion": "Moderatorendiskussion", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/en.json b/translations/en.json index 3f61e336..a5a9a06b 100644 --- a/translations/en.json +++ b/translations/en.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Nicknames whose blog entries appear on the newswire.", "Posts to be approved": "Posts to be approved", "Discuss": "Discuss", - "Moderator Discussion": "Moderator Discussion" + "Moderator Discussion": "Moderator Discussion", + "Vote": "Vote", + "Remove Vote": "Remove Vote" } diff --git a/translations/es.json b/translations/es.json index 1eaf0876..ec0d739f 100644 --- a/translations/es.json +++ b/translations/es.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Apodos cuyas entradas de blog aparecen en el newswire.", "Posts to be approved": "Publicaciones a aprobar", "Discuss": "Discutir", - "Moderator Discussion": "Discusión del moderador" + "Moderator Discussion": "Discusión del moderador", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/fr.json b/translations/fr.json index 4fa45c87..ed75d08c 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Surnoms dont les entrées de blog apparaissent sur le fil de presse.", "Posts to be approved": "Postes à approuver", "Discuss": "Discuter", - "Moderator Discussion": "Discussion du modérateur" + "Moderator Discussion": "Discussion du modérateur", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/ga.json b/translations/ga.json index 4bd8edfb..23049898 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Leasainmneacha a bhfuil a n-iontrálacha blag le feiceáil ar an sreang nuachta.", "Posts to be approved": "Poist le ceadú", "Discuss": "Pléigh", - "Moderator Discussion": "Plé Modhnóir" + "Moderator Discussion": "Plé Modhnóir", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/hi.json b/translations/hi.json index 1df55af6..e11084c3 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "उपनाम जिनकी ब्लॉग प्रविष्टियाँ न्यूज़वायर पर दिखाई देती हैं।", "Posts to be approved": "स्वीकृत किए जाने वाले पद", "Discuss": "चर्चा करें", - "Moderator Discussion": "मॉडरेटर चर्चा" + "Moderator Discussion": "मॉडरेटर चर्चा", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/it.json b/translations/it.json index 390e7fce..ff891a91 100644 --- a/translations/it.json +++ b/translations/it.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Soprannomi le cui voci di blog compaiono nel newswire.", "Posts to be approved": "Post da approvare", "Discuss": "Discutere", - "Moderator Discussion": "Discussione del moderatore" + "Moderator Discussion": "Discussione del moderatore", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/ja.json b/translations/ja.json index 34e7afbb..c79ceaf4 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "ブログエントリがニュースワイヤーに表示されるニックネーム。", "Posts to be approved": "承認される投稿", "Discuss": "議論する", - "Moderator Discussion": "モデレーターディスカッション" + "Moderator Discussion": "モデレーターディスカッション", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/oc.json b/translations/oc.json index 14e8e388..a2304146 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -296,5 +296,7 @@ "Nicknames whose blog entries appear on the newswire.": "Nicknames whose blog entries appear on the newswire.", "Posts to be approved": "Posts to be approved", "Discuss": "Discuss", - "Moderator Discussion": "Moderator Discussion" + "Moderator Discussion": "Moderator Discussion", + "Vote": "Vote", + "Remove Vote": "Remove Vote" } diff --git a/translations/pt.json b/translations/pt.json index d4d23a91..2c8dc07b 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Apelidos cujas entradas de blog aparecem nos jornais.", "Posts to be approved": "Postagens a serem aprovadas", "Discuss": "Discutir", - "Moderator Discussion": "Discussão do moderador" + "Moderator Discussion": "Discussão do moderador", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/ru.json b/translations/ru.json index f41695c6..e9465e88 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "Псевдонимы, чьи записи блога появляются в ленте новостей.", "Posts to be approved": "Посты на утверждение", "Discuss": "Обсудить", - "Moderator Discussion": "Обсуждение модератором" + "Moderator Discussion": "Обсуждение модератором", + "Vote": "", + "Remove Vote": "" } diff --git a/translations/zh.json b/translations/zh.json index 30417890..9da0fbfe 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -300,5 +300,7 @@ "Nicknames whose blog entries appear on the newswire.": "博客条目出现在新闻专线上的昵称。", "Posts to be approved": "职位待批准", "Discuss": "讨论", - "Moderator Discussion": "主持人讨论" + "Moderator Discussion": "主持人讨论", + "Vote": "", + "Remove Vote": "" } diff --git a/webinterface.py b/webinterface.py index a235a409..ea0c18fc 100644 --- a/webinterface.py +++ b/webinterface.py @@ -5339,7 +5339,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str, return htmlStr -def htmlNewswire(newswire: str, nickname: str, moderator: bool) -> str: +def htmlNewswire(newswire: str, nickname: str, moderator: bool, + translate: {}) -> str: """Converts a newswire dict into html """ htmlStr = '' @@ -5364,7 +5365,8 @@ def htmlNewswire(newswire: str, nickname: str, moderator: bool) -> str: htmlStr += \ ' ' + \ '' + \ + '/newswireunvote=' + dateStrLink + '" ' + \ + 'title="' + translate['Remove Vote'] + '">' + \ '

' else: @@ -5388,7 +5390,8 @@ def htmlNewswire(newswire: str, nickname: str, moderator: bool) -> str: htmlStr += \ ' ' + \ '' + \ + '/newswirevote=' + dateStrLink + '" ' + \ + 'title="' + translate['Vote'] + '">' + \ '

' else: @@ -5472,7 +5475,7 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str, else: htmlStr += '
\n' - htmlStr += htmlNewswire(newswire, nickname, moderator) + htmlStr += htmlNewswire(newswire, nickname, moderator, translate) return htmlStr