diff --git a/daemon.py b/daemon.py index c59fb3314..22132280e 100644 --- a/daemon.py +++ b/daemon.py @@ -2299,10 +2299,11 @@ class PubServer(BaseHTTPRequestHandler): self.server.signing_priv_key_pem) else: msg = \ - html_moderation_info(self.server.css_cache, - self.server.translate, - base_dir, http_prefix, - nickname) + html_moderation_info(self.server.translate, + base_dir, nickname, + self.server.domain, + self.server.theme_name, + self.server.access_keys) if msg: msg = msg.encode('utf-8') msglen = len(msg) diff --git a/translations/ar.json b/translations/ar.json index eab7fc3de..d9eba6153 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -560,5 +560,6 @@ "Start Time": "وقت البدء", "End Time": "وقت النهاية", "Switch to calendar view": "قم بالتبديل إلى عرض التقويم", - "Save": "يحفظ" + "Save": "يحفظ", + "Switch to moderation view": "قم بالتبديل إلى عرض الاعتدال" } diff --git a/translations/ca.json b/translations/ca.json index 8ee00349a..a0dd4e5e5 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -560,5 +560,6 @@ "Start Time": "L'hora d'inici", "End Time": "Temps esgotat", "Switch to calendar view": "Canvia a la vista del calendari", - "Save": "Desa" + "Save": "Desa", + "Switch to moderation view": "Canvia a la visualització de moderació" } diff --git a/translations/cy.json b/translations/cy.json index 33bfdb9dc..fda72e732 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -560,5 +560,6 @@ "Start Time": "Amser Dechrau", "End Time": "Amser Gorffen", "Switch to calendar view": "Newid i wedd calendr", - "Save": "Arbed" + "Save": "Arbed", + "Switch to moderation view": "Newid i wedd safoni" } diff --git a/translations/de.json b/translations/de.json index 3176cb216..5af79506d 100644 --- a/translations/de.json +++ b/translations/de.json @@ -560,5 +560,6 @@ "Start Time": "Startzeit", "End Time": "Endzeit", "Switch to calendar view": "Zur Kalenderansicht wechseln", - "Save": "Speichern" + "Save": "Speichern", + "Switch to moderation view": "Wechseln Sie zur Moderationsansicht" } diff --git a/translations/el.json b/translations/el.json index f092b158c..312ff2382 100644 --- a/translations/el.json +++ b/translations/el.json @@ -560,5 +560,6 @@ "Start Time": "Ωρα έναρξης", "End Time": "Τέλος χρόνου", "Switch to calendar view": "Μετάβαση σε προβολή ημερολογίου", - "Save": "Αποθηκεύσετε" + "Save": "Αποθηκεύσετε", + "Switch to moderation view": "Μετάβαση σε προβολή εποπτείας" } diff --git a/translations/en.json b/translations/en.json index c1e0a48c3..b88f7ff77 100644 --- a/translations/en.json +++ b/translations/en.json @@ -560,5 +560,6 @@ "Start Time": "Start Time", "End Time": "End Time", "Switch to calendar view": "Switch to calendar view", - "Save": "Save" + "Save": "Save", + "Switch to moderation view": "Switch to moderation view" } diff --git a/translations/es.json b/translations/es.json index a62875563..90c109d80 100644 --- a/translations/es.json +++ b/translations/es.json @@ -560,5 +560,6 @@ "Start Time": "Hora de inicio", "End Time": "Hora de finalización", "Switch to calendar view": "Cambiar a vista de calendario", - "Save": "Ahorrar" + "Save": "Ahorrar", + "Switch to moderation view": "Cambiar a la vista de moderación" } diff --git a/translations/fr.json b/translations/fr.json index ad94c026c..acae4066e 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -560,5 +560,6 @@ "Start Time": "Heure de début", "End Time": "Heure de fin", "Switch to calendar view": "Basculer vers la vue calendrier", - "Save": "Sauvegarder" + "Save": "Sauvegarder", + "Switch to moderation view": "Passer en mode modération" } diff --git a/translations/ga.json b/translations/ga.json index 37e0c5102..d1fe4ea13 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -560,5 +560,6 @@ "Start Time": "Am Tosaigh", "End Time": "Am Deiridh", "Switch to calendar view": "Athraigh go hamharc féilire", - "Save": "Sábháil" + "Save": "Sábháil", + "Switch to moderation view": "Athraigh go dtí an t-amharc modhnóireachta" } diff --git a/translations/hi.json b/translations/hi.json index 39412e6da..1d6303212 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -560,5 +560,6 @@ "Start Time": "समय शुरू", "End Time": "अंत समय", "Switch to calendar view": "कैलेंडर दृश्य पर स्विच करें", - "Save": "बचाना" + "Save": "बचाना", + "Switch to moderation view": "मॉडरेशन दृश्य पर स्विच करें" } diff --git a/translations/it.json b/translations/it.json index 59fd55516..ea0e1532f 100644 --- a/translations/it.json +++ b/translations/it.json @@ -560,5 +560,6 @@ "Start Time": "Ora di inizio", "End Time": "Tempo scaduto", "Switch to calendar view": "Passa alla visualizzazione del calendario", - "Save": "Salva" + "Save": "Salva", + "Switch to moderation view": "Passa alla visualizzazione moderazione" } diff --git a/translations/ja.json b/translations/ja.json index 360d832db..c7434a3a2 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -560,5 +560,6 @@ "Start Time": "始まる時間", "End Time": "終了時間", "Switch to calendar view": "カレンダービューに切り替えます", - "Save": "保存" + "Save": "保存", + "Switch to moderation view": "モデレートビューに切り替えます" } diff --git a/translations/ko.json b/translations/ko.json index 91bb80905..47c655238 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -560,5 +560,6 @@ "Start Time": "시작 시간", "End Time": "종료 시간", "Switch to calendar view": "캘린더 보기로 전환", - "Save": "구하다" + "Save": "구하다", + "Switch to moderation view": "검토 보기로 전환" } diff --git a/translations/ku.json b/translations/ku.json index 5d51d35a8..fe7e33879 100644 --- a/translations/ku.json +++ b/translations/ku.json @@ -560,5 +560,6 @@ "Start Time": "Demjimêra Destpêkê", "End Time": "Dema Dawî", "Switch to calendar view": "Biguherîne bo dîtina salnameyê", - "Save": "Rizgarkirin" + "Save": "Rizgarkirin", + "Switch to moderation view": "Biguherîne bo dîtina moderatoriyê" } diff --git a/translations/nl.json b/translations/nl.json index a63e7bce3..f78a8adff 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -560,5 +560,6 @@ "Start Time": "Starttijd", "End Time": "Eindtijd", "Switch to calendar view": "Overschakelen naar kalenderweergave", - "Save": "Opslaan" + "Save": "Opslaan", + "Switch to moderation view": "Overschakelen naar moderatieweergave" } diff --git a/translations/oc.json b/translations/oc.json index e029d3446..defa5a32d 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -556,5 +556,6 @@ "Start Time": "Start Time", "End Time": "End Time", "Switch to calendar view": "Switch to calendar view", - "Save": "Save" + "Save": "Save", + "Switch to moderation view": "Switch to moderation view" } diff --git a/translations/pl.json b/translations/pl.json index e57234439..96b95dc41 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -560,5 +560,6 @@ "Start Time": "Czas rozpoczęcia", "End Time": "Koniec czasu", "Switch to calendar view": "Przełącz na widok kalendarza", - "Save": "Ratować" + "Save": "Ratować", + "Switch to moderation view": "Przełącz na widok moderacji" } diff --git a/translations/pt.json b/translations/pt.json index 25782ec07..37ba05e0b 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -560,5 +560,6 @@ "Start Time": "Hora de início", "End Time": "Fim do tempo", "Switch to calendar view": "Mudar para a vista de calendário", - "Save": "Salvar" + "Save": "Salvar", + "Switch to moderation view": "Mudar para a visualização de moderação" } diff --git a/translations/ru.json b/translations/ru.json index c73011d32..a9b81b0ff 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -560,5 +560,6 @@ "Start Time": "Время начала", "End Time": "Время окончания", "Switch to calendar view": "Переключиться на представление календаря", - "Save": "Сохранять" + "Save": "Сохранять", + "Switch to moderation view": "Перейти в режим модерации" } diff --git a/translations/sw.json b/translations/sw.json index 1e768159c..c9bd0c550 100644 --- a/translations/sw.json +++ b/translations/sw.json @@ -560,5 +560,6 @@ "Start Time": "Wakati wa Kuanza", "End Time": "Wakati wa Mwisho", "Switch to calendar view": "Badili hadi mwonekano wa kalenda", - "Save": "Hifadhi" + "Save": "Hifadhi", + "Switch to moderation view": "Badili hadi mwonekano wa udhibiti" } diff --git a/translations/tr.json b/translations/tr.json index 6aaac19cf..951706c26 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -560,5 +560,6 @@ "Start Time": "Başlangıç ​​saati", "End Time": "Bitiş zamanı", "Switch to calendar view": "Takvim görünümüne geç", - "Save": "Kaydetmek" + "Save": "Kaydetmek", + "Switch to moderation view": "Denetleme görünümüne geç" } diff --git a/translations/uk.json b/translations/uk.json index ef8fc4914..7b2bdc26a 100644 --- a/translations/uk.json +++ b/translations/uk.json @@ -560,5 +560,6 @@ "Start Time": "Час початку", "End Time": "Час закінчення", "Switch to calendar view": "Перейти до перегляду календаря", - "Save": "Зберегти" + "Save": "Зберегти", + "Switch to moderation view": "Перейти до режиму модерації" } diff --git a/translations/yi.json b/translations/yi.json index 08cc3d87a..e82da19ef 100644 --- a/translations/yi.json +++ b/translations/yi.json @@ -560,5 +560,6 @@ "Start Time": "אָנהייב צייט", "End Time": "סוף צייט", "Switch to calendar view": "באַשטימען צו די קאַלענדאַר מיינונג", - "Save": "היט" + "Save": "היט", + "Switch to moderation view": "באַשטימען צו מאַדעריישאַן מיינונג" } diff --git a/translations/zh.json b/translations/zh.json index acbad3009..5b3d7294a 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -560,5 +560,6 @@ "Start Time": "开始时间", "End Time": "时间结束", "Switch to calendar view": "切换到日历视图", - "Save": "节省" + "Save": "节省", + "Switch to moderation view": "切换到审核视图" } diff --git a/webapp_moderation.py b/webapp_moderation.py index f30357d2f..05ae31525 100644 --- a/webapp_moderation.py +++ b/webapp_moderation.py @@ -22,6 +22,7 @@ from posts import get_public_post_info from posts import is_moderator from webapp_timeline import html_timeline # from webapp_utils import get_person_avatar_url +from webapp_utils import get_banner_file from webapp_utils import get_content_warning_button from webapp_utils import html_header_with_external_style from webapp_utils import html_footer @@ -292,9 +293,9 @@ def html_account_info(css_cache: {}, translate: {}, return info_form -def html_moderation_info(css_cache: {}, translate: {}, - base_dir: str, http_prefix: str, - nickname: str) -> str: +def html_moderation_info(translate: {}, base_dir: str, + nickname: str, domain: str, theme: str, + access_keys: {}) -> str: msg_str1 = \ 'These are globally blocked for all accounts on this instance' msg_str2 = \ @@ -310,8 +311,23 @@ def html_moderation_info(css_cache: {}, translate: {}, info_form = html_header_with_external_style(css_filename, instance_title, None) + # show banner + banner_file, _ = \ + get_banner_file(base_dir, nickname, domain, theme) + moderation_link = '/users/' + nickname + '/moderation' info_form += \ - '

' + \ + '
\n\n' + info_form += \ + '\n' + \ + '
\n
\n' + + info_form += \ + '

' + \ translate['Moderation Information'] + \ '


'