From 2bbd39fcd902136ff2e12fafa954e952380d78b9 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 28 Sep 2020 11:54:41 +0100 Subject: [PATCH] Extra translations --- daemon.py | 2 +- outbox.py | 3 +-- translations/ar.json | 3 ++- translations/ca.json | 3 ++- translations/cy.json | 3 ++- translations/de.json | 3 ++- translations/en.json | 3 ++- translations/es.json | 3 ++- translations/fr.json | 3 ++- translations/ga.json | 3 ++- translations/hi.json | 3 ++- translations/it.json | 3 ++- translations/ja.json | 3 ++- translations/oc.json | 3 ++- translations/pt.json | 3 ++- translations/ru.json | 3 ++- translations/zh.json | 3 ++- webinterface.py | 4 +++- 18 files changed, 35 insertions(+), 19 deletions(-) diff --git a/daemon.py b/daemon.py index 5b9eab209..2eb044dcc 100644 --- a/daemon.py +++ b/daemon.py @@ -152,7 +152,7 @@ from webinterface import rssHashtagSearch from webinterface import htmlModerationInfo from webinterface import htmlSearchSharedItems from webinterface import htmlHashtagBlocked -from webinterface import htmlSendingPost +# from webinterface import htmlSendingPost from shares import getSharesFeedForPerson from shares import addShare from shares import removeShare diff --git a/outbox.py b/outbox.py index 4254bb101..56016b683 100644 --- a/outbox.py +++ b/outbox.py @@ -39,8 +39,7 @@ from shares import outboxUndoShareUpload def postMessageToOutbox(messageJson: {}, postToNickname: str, server, baseDir: str, httpPrefix: str, domain: str, domainFull: str, - onionDomain: str, i2pDomain: str, - port: int, + onionDomain: str, i2pDomain: str, port: int, recentPostsCache: {}, followersThreads: [], federationList: [], sendThreads: [], postLog: [], cachedWebfingers: {}, diff --git a/translations/ar.json b/translations/ar.json index a27a5c6d2..b519fa594 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -286,5 +286,6 @@ "Don't show the Like button": "لا تظهر زر أعجبني", "Autogenerated Hashtags": "علامات التجزئة المُنشأة تلقائيًا", "Autogenerated Content Warnings": "تحذيرات المحتوى المُنشأ تلقائيًا", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag محظور" } diff --git a/translations/ca.json b/translations/ca.json index b24e0a819..62736ad2d 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -286,5 +286,6 @@ "Don't show the Like button": "No mostreu el botó M'agrada", "Autogenerated Hashtags": "Hashtags autogenerats", "Autogenerated Content Warnings": "Advertiments de contingut autogenerats", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag bloquejat" } diff --git a/translations/cy.json b/translations/cy.json index 65d011d4b..89f52d7ee 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -286,5 +286,6 @@ "Don't show the Like button": "Peidiwch â dangos y botwm Hoffi", "Autogenerated Hashtags": "Hashtags awtogeneiddiedig", "Autogenerated Content Warnings": "Rhybuddion Cynnwys Autogenerated", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag wedi'i Blocio" } diff --git a/translations/de.json b/translations/de.json index 3ca9eee82..e3bc529b6 100644 --- a/translations/de.json +++ b/translations/de.json @@ -286,5 +286,6 @@ "Don't show the Like button": "Zeigen Sie nicht die Schaltfläche \"Gefällt mir\" an", "Autogenerated Hashtags": "Automatisch generierte Hashtags", "Autogenerated Content Warnings": "Warnungen vor automatisch generierten Inhalten", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag blockiert" } diff --git a/translations/en.json b/translations/en.json index b93dfd158..c85bbfe85 100644 --- a/translations/en.json +++ b/translations/en.json @@ -286,5 +286,6 @@ "Don't show the Like button": "Don't show the Like button", "Autogenerated Hashtags": "Autogenerated Hashtags", "Autogenerated Content Warnings": "Autogenerated Content Warnings", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag Blocked" } diff --git a/translations/es.json b/translations/es.json index 150aed26f..6fe9c141b 100644 --- a/translations/es.json +++ b/translations/es.json @@ -286,5 +286,6 @@ "Don't show the Like button": "No mostrar el botón Me gusta", "Autogenerated Hashtags": "Hashtags autogenerados", "Autogenerated Content Warnings": "Advertencias de contenido generado automáticamente", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag bloqueada" } diff --git a/translations/fr.json b/translations/fr.json index 09be80db8..4a1fb6cb0 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -286,5 +286,6 @@ "Don't show the Like button": "Ne pas afficher le bouton J'aime", "Autogenerated Hashtags": "Hashtags générés automatiquement", "Autogenerated Content Warnings": "Avertissements de contenu générés automatiquement", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag bloqué" } diff --git a/translations/ga.json b/translations/ga.json index 7434193c1..1c1266bae 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -286,5 +286,6 @@ "Don't show the Like button": "Ná taispeáin an cnaipe Cosúil", "Autogenerated Hashtags": "Hashtags uathghinte", "Autogenerated Content Warnings": "Rabhaidh Ábhar Uathghinte", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag Blocáilte" } diff --git a/translations/hi.json b/translations/hi.json index 59a9a1efd..bff59966f 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -286,5 +286,6 @@ "Don't show the Like button": "लाइक बटन न दिखाएं", "Autogenerated Hashtags": "ऑटोजेनरेटेड हैशटैग", "Autogenerated Content Warnings": "स्वतः प्राप्त सामग्री चेतावनी", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "हैशटैग अवरुद्ध" } diff --git a/translations/it.json b/translations/it.json index 7bc918965..08ff2618c 100644 --- a/translations/it.json +++ b/translations/it.json @@ -286,5 +286,6 @@ "Don't show the Like button": "Non mostrare il pulsante Mi piace", "Autogenerated Hashtags": "Hashtag generati automaticamente", "Autogenerated Content Warnings": "Avvisi sui contenuti generati automaticamente", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag bloccato" } diff --git a/translations/ja.json b/translations/ja.json index 98f47d53e..382b43cc3 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -286,5 +286,6 @@ "Don't show the Like button": "「いいね！」ボタンを表示しない", "Autogenerated Hashtags": "自動生成されたハッシュタグ", "Autogenerated Content Warnings": "自動生成されたコンテンツの警告", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "ハッシュタグがブロックされました" } diff --git a/translations/oc.json b/translations/oc.json index aeeeac9b8..9a0cf46e9 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -282,5 +282,6 @@ "Don't show the Like button": "Don't show the Like button", "Autogenerated Hashtags": "Autogenerated Hashtags", "Autogenerated Content Warnings": "Autogenerated Content Warnings", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag Blocked" } diff --git a/translations/pt.json b/translations/pt.json index c8167d622..72314d67e 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -286,5 +286,6 @@ "Don't show the Like button": "Não mostrar o botão Curtir", "Autogenerated Hashtags": "Hashtags autogeradas", "Autogenerated Content Warnings": "Avisos de conteúdo gerado automaticamente", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Hashtag bloqueada" } diff --git a/translations/ru.json b/translations/ru.json index daa47b268..cb7a0b211 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -286,5 +286,6 @@ "Don't show the Like button": "Не показывать кнопку \"Нравится\"", "Autogenerated Hashtags": "Автоматически сгенерированные хештеги", "Autogenerated Content Warnings": "Автоматические предупреждения о содержании", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "Хештег заблокирован" } diff --git a/translations/zh.json b/translations/zh.json index d43831e42..a171135f0 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -286,5 +286,6 @@ "Don't show the Like button": "不显示“赞”按钮", "Autogenerated Hashtags": "自动生成的标签", "Autogenerated Content Warnings": "自动生成的内容警告", - "Indymedia": "Indymedia" + "Indymedia": "Indymedia", + "Hashtag Blocked": "标签被阻止" } diff --git a/webinterface.py b/webinterface.py index 2f814981d..cee91edf3 100644 --- a/webinterface.py +++ b/webinterface.py @@ -1995,7 +1995,9 @@ def htmlHashtagBlocked(baseDir: str, translate: {}) -> str: blockedHashtagCSS = cssFile.read() blockedHashtagForm = htmlHeader(cssFilename, blockedHashtagCSS) blockedHashtagForm += '
\n' - blockedHashtagForm += '

Hashtag Blocked

\n' + blockedHashtagForm += \ + '

' + \ + translate['Hashtag Blocked'] + '

\n' blockedHashtagForm += \ '

See Terms of Service

\n' blockedHashtagForm += '
\n'