From 8f21dafc6b9789625c9be28dea9c1f65f0980b9d Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 20 Dec 2020 11:51:23 +0000 Subject: [PATCH] If there are more than ten accounts then make them into a dropdown --- 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 ++- webapp_moderation.py | 22 ++++++++++++++-------- 16 files changed, 44 insertions(+), 23 deletions(-) diff --git a/translations/ar.json b/translations/ar.json index fabcebfb7..630067626 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -346,5 +346,6 @@ "Filter": "منقي", "Filter out words": "تصفية الكلمات", "Unfilter": "غير مرشح", - "Unfilter words": "الكلمات غير المصفاة" + "Unfilter words": "الكلمات غير المصفاة", + "Show Accounts": "إظهار الحسابات" } diff --git a/translations/ca.json b/translations/ca.json index 0953924e3..853f94914 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -346,5 +346,6 @@ "Filter": "Filtre", "Filter out words": "Filtra les paraules", "Unfilter": "Sense filtre", - "Unfilter words": "Paraules sense filtre" + "Unfilter words": "Paraules sense filtre", + "Show Accounts": "Mostra comptes" } diff --git a/translations/cy.json b/translations/cy.json index c387dc777..eafc25d65 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -346,5 +346,6 @@ "Filter": "Hidlo", "Filter out words": "Hidlo geiriau", "Unfilter": "Di-hid", - "Unfilter words": "Geiriau di-hid" + "Unfilter words": "Geiriau di-hid", + "Show Accounts": "Dangos Cyfrifon" } diff --git a/translations/de.json b/translations/de.json index 67658593e..6749671f9 100644 --- a/translations/de.json +++ b/translations/de.json @@ -346,5 +346,6 @@ "Filter": "Filter", "Filter out words": "Wörter herausfiltern", "Unfilter": "Filter entfernen", - "Unfilter words": "Wörter herausfiltern" + "Unfilter words": "Wörter herausfiltern", + "Show Accounts": "Konten anzeigen" } diff --git a/translations/en.json b/translations/en.json index 4d950d2d4..7dd037eb0 100644 --- a/translations/en.json +++ b/translations/en.json @@ -346,5 +346,6 @@ "Filter": "Filter", "Filter out words": "Filter out words", "Unfilter": "Unfilter", - "Unfilter words": "Unfilter words" + "Unfilter words": "Unfilter words", + "Show Accounts": "Show Accounts" } diff --git a/translations/es.json b/translations/es.json index 2f8c55025..dcf167a97 100644 --- a/translations/es.json +++ b/translations/es.json @@ -346,5 +346,6 @@ "Filter": "Filtrar", "Filter out words": "Filtrar palabras", "Unfilter": "Unfilter", - "Unfilter words": "Palabras sin filtrar" + "Unfilter words": "Palabras sin filtrar", + "Show Accounts": "Mostrar cuentas" } diff --git a/translations/fr.json b/translations/fr.json index 3a6db801f..3d8dc2b55 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -346,5 +346,6 @@ "Filter": "Filtre", "Filter out words": "Filtrer les mots", "Unfilter": "Non filtrer", - "Unfilter words": "Mots non filtrés" + "Unfilter words": "Mots non filtrés", + "Show Accounts": "Afficher les comptes" } diff --git a/translations/ga.json b/translations/ga.json index e35e11f71..a4e46b1f0 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -346,5 +346,6 @@ "Filter": "Scagaire", "Filter out words": "Scag focail amach", "Unfilter": "Neamhleithleach", - "Unfilter words": "Focail neamhleithleacha" + "Unfilter words": "Focail neamhleithleacha", + "Show Accounts": "Taispeáin Cuntais" } diff --git a/translations/hi.json b/translations/hi.json index 865de4a64..49f6d60e2 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -346,5 +346,6 @@ "Filter": "फ़िल्टर", "Filter out words": "शब्दों को फ़िल्टर करें", "Unfilter": "Unfilter", - "Unfilter words": "अनफ़िल्टर शब्द" + "Unfilter words": "अनफ़िल्टर शब्द", + "Show Accounts": "खाते दिखाएं" } diff --git a/translations/it.json b/translations/it.json index 27d3f500e..bd4b3db9c 100644 --- a/translations/it.json +++ b/translations/it.json @@ -346,5 +346,6 @@ "Filter": "Filtro", "Filter out words": "Filtra le parole", "Unfilter": "Unfilter", - "Unfilter words": "Parole non filtrate" + "Unfilter words": "Parole non filtrate", + "Show Accounts": "Mostra account" } diff --git a/translations/ja.json b/translations/ja.json index 1e290df23..e2029f181 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -346,5 +346,6 @@ "Filter": "フィルタ", "Filter out words": "単語を除外する", "Unfilter": "フィルタリング解除", - "Unfilter words": "単語のフィルタリングを解除する" + "Unfilter words": "単語のフィルタリングを解除する", + "Show Accounts": "アカウントを表示する" } diff --git a/translations/oc.json b/translations/oc.json index 1940d1b2c..dc474d00d 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -342,5 +342,6 @@ "Filter": "Filter", "Filter out words": "Filter out words", "Unfilter": "Unfilter", - "Unfilter words": "Unfilter words" + "Unfilter words": "Unfilter words", + "Show Accounts": "Show Accounts" } diff --git a/translations/pt.json b/translations/pt.json index f87b44705..b4cb1996a 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -346,5 +346,6 @@ "Filter": "Filtro", "Filter out words": "Filtrar palavras", "Unfilter": "Unfilter", - "Unfilter words": "Palavras sem filtro" + "Unfilter words": "Palavras sem filtro", + "Show Accounts": "Mostrar contas" } diff --git a/translations/ru.json b/translations/ru.json index a29f41750..a95083395 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -346,5 +346,6 @@ "Filter": "Фильтр", "Filter out words": "Отфильтровать слова", "Unfilter": "Нефильтровать", - "Unfilter words": "Не фильтровать слова" + "Unfilter words": "Не фильтровать слова", + "Show Accounts": "Показать счета" } diff --git a/translations/zh.json b/translations/zh.json index c2796f6e4..36ea2b053 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -346,5 +346,6 @@ "Filter": "过滤", "Filter out words": "过滤掉单词", "Unfilter": "取消过滤", - "Unfilter words": "未过滤字词" + "Unfilter words": "未过滤字词", + "Show Accounts": "显示帐户" } diff --git a/webapp_moderation.py b/webapp_moderation.py index 45401d380..2ac9298f1 100644 --- a/webapp_moderation.py +++ b/webapp_moderation.py @@ -155,14 +155,6 @@ def htmlModerationInfo(cssCache: {}, translate: {}, infoShown = False - cols = 5 - infoForm += '
\n' - infoForm += '\n' - infoForm += ' \n' - for col in range(cols): - infoForm += ' \n' - infoForm += ' \n' - infoForm += '\n' accounts = [] for subdir, dirs, files in os.walk(baseDir + '/accounts'): for acct in dirs: @@ -174,6 +166,18 @@ def htmlModerationInfo(cssCache: {}, translate: {}, break accounts.sort() + cols = 5 + if len(accounts) > 10: + infoForm += '
' + translate['Show Accounts'] + infoForm += '\n' + infoForm += '
\n' + infoForm += '
\n' + infoForm += ' \n' + for col in range(cols): + infoForm += ' \n' + infoForm += ' \n' + infoForm += '\n' + col = 0 for acct in accounts: acctNickname = acct.split('@')[0] @@ -200,6 +204,8 @@ def htmlModerationInfo(cssCache: {}, translate: {}, infoForm += '\n\n' infoForm += '\n
\n' infoForm += '
\n' + if len(accounts) > 10: + infoForm += '\n' suspendedFilename = baseDir + '/accounts/suspended.txt' if os.path.isfile(suspendedFilename):