From e2a475102780ddd6e5fb66d48d2716a6a0f1ab0b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 6 Mar 2021 15:13:56 +0000 Subject: [PATCH] Collapsible sections on edit profile screen --- translations/ar.json | 8 ++++++- translations/ca.json | 8 ++++++- translations/cy.json | 8 ++++++- translations/de.json | 8 ++++++- translations/en.json | 8 ++++++- translations/es.json | 8 ++++++- translations/fr.json | 8 ++++++- translations/ga.json | 8 ++++++- translations/hi.json | 8 ++++++- translations/it.json | 8 ++++++- translations/ja.json | 8 ++++++- translations/oc.json | 8 ++++++- translations/pt.json | 8 ++++++- translations/ru.json | 8 ++++++- translations/zh.json | 8 ++++++- webapp_profile.py | 51 ++++++++++++++++++++++++++++++-------------- 16 files changed, 140 insertions(+), 31 deletions(-) diff --git a/translations/ar.json b/translations/ar.json index 978c76901..872bb6f69 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -390,5 +390,11 @@ "pronoun": "ضمير", "Type of instance": "نوع المثيل", "Security": "حماية", - "Enabling broch mode": "يوفر تمكين وضع الكتيب تحصينًا مؤقتًا ضد الهجوم. لن يتم قبول سوى المشاركات من خلال المثيلات المعروفة بالفعل. تنقضي بعد أسبوع." + "Enabling broch mode": "يوفر تمكين وضع الكتيب تحصينًا مؤقتًا ضد الهجوم. لن يتم قبول سوى المشاركات من خلال المثيلات المعروفة بالفعل. تنقضي بعد أسبوع.", + "Instance Settings": "إعدادات المثيل", + "Video Settings": "اعدادات الفيديو", + "Filtering and Blocking": "التصفية والحظر", + "Role Assignment": "تعيين الدور", + "Contact Details": "بيانات المتصل", + "Background Images": "صور الخلفية" } diff --git a/translations/ca.json b/translations/ca.json index 13488ae4f..05fd736f3 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -390,5 +390,11 @@ "pronoun": "pronom", "Type of instance": "Tipus d’instància", "Security": "Seguretat", - "Enabling broch mode": "L'activació del mode de fulletó proporciona una fortificació temporal contra l'atac. Només s’acceptaran publicacions d’instàncies ja conegudes. Transcorre al cap d’una setmana." + "Enabling broch mode": "L'activació del mode de fulletó proporciona una fortificació temporal contra l'atac. Només s’acceptaran publicacions d’instàncies ja conegudes. Transcorre al cap d’una setmana.", + "Instance Settings": "Configuració de la instància", + "Video Settings": "Configuració del vídeo", + "Filtering and Blocking": "Filtratge i bloqueig", + "Role Assignment": "Assignació de funcions", + "Contact Details": "Detalls de contacte", + "Background Images": "Imatges de fons" } diff --git a/translations/cy.json b/translations/cy.json index 47e2ac4c7..43bc66b67 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -390,5 +390,11 @@ "pronoun": "rhagenw", "Type of instance": "Math o enghraifft", "Security": "Diogelwch", - "Enabling broch mode": "Mae modd galluogi broch yn darparu amddiffynfa dros dro yn erbyn ymosodiad. Dim ond swyddi mewn achosion y gwyddys amdanynt eisoes a dderbynnir. Mae'n mynd heibio ar ôl wythnos." + "Enabling broch mode": "Mae modd galluogi broch yn darparu amddiffynfa dros dro yn erbyn ymosodiad. Dim ond swyddi mewn achosion y gwyddys amdanynt eisoes a dderbynnir. Mae'n mynd heibio ar ôl wythnos.", + "Instance Settings": "Gosodiadau Instance", + "Video Settings": "Gosodiadau Fideo", + "Filtering and Blocking": "Hidlo a Blocio", + "Role Assignment": "Aseiniad Rôl", + "Background Images": "Delweddau Cefndir", + "Contact Details": "Manylion cyswllt" } diff --git a/translations/de.json b/translations/de.json index 947df2e58..a7e2e6d87 100644 --- a/translations/de.json +++ b/translations/de.json @@ -390,5 +390,11 @@ "pronoun": "pronomen", "Type of instance": "Art der Instanz", "Security": "Sicherheit", - "Enabling broch mode": "Das Aktivieren des Broch-Modus bietet eine vorübergehende Verstärkung gegen Angriffe. Es werden nur Beiträge von bereits bekannten Instanzen akzeptiert. Es vergeht nach einer Woche." + "Enabling broch mode": "Das Aktivieren des Broch-Modus bietet eine vorübergehende Verstärkung gegen Angriffe. Es werden nur Beiträge von bereits bekannten Instanzen akzeptiert. Es vergeht nach einer Woche.", + "Instance Settings": "Instanzeinstellungen", + "Video Settings": "Video-Einstellungen", + "Filtering and Blocking": "Filtern und Blockieren", + "Role Assignment": "Rollenzuweisung", + "Background Images": "Hintergrundbilder", + "Contact Details": "Kontaktdetails" } diff --git a/translations/en.json b/translations/en.json index fac7de819..9e6194bb7 100644 --- a/translations/en.json +++ b/translations/en.json @@ -390,5 +390,11 @@ "pronoun": "pronoun", "Type of instance": "Type of instance", "Security": "Security", - "Enabling broch mode": "Enabling broch mode provides a temporary fortification against attack. Only posts by already known instances will be accepted. If not turned off, it elapses after a week." + "Enabling broch mode": "Enabling broch mode provides a temporary fortification against attack. Only posts by already known instances will be accepted. If not turned off, it elapses after a week.", + "Instance Settings": "Instance Settings", + "Video Settings": "Video Settings", + "Filtering and Blocking": "Filtering and Blocking", + "Role Assignment": "Role Assignment", + "Contact Details": "Contact Details", + "Background Images": "Background Images" } diff --git a/translations/es.json b/translations/es.json index 52a1ac223..9414179e0 100644 --- a/translations/es.json +++ b/translations/es.json @@ -390,5 +390,11 @@ "pronoun": "pronombre", "Type of instance": "Tipo de instancia", "Security": "Seguridad", - "Enabling broch mode": "Habilitar el modo broche proporciona una fortificación temporal contra el ataque. Solo se aceptarán publicaciones de instancias ya conocidas. Transcurre después de una semana." + "Enabling broch mode": "Habilitar el modo broche proporciona una fortificación temporal contra el ataque. Solo se aceptarán publicaciones de instancias ya conocidas. Transcurre después de una semana.", + "Instance Settings": "Configuración de instancia", + "Video Settings": "Ajustes de video", + "Filtering and Blocking": "Filtrado y bloqueo", + "Role Assignment": "Asignación de roles", + "Background Images": "Imágenes de fondo", + "Contact Details": "Detalles de contacto" } diff --git a/translations/fr.json b/translations/fr.json index 232a06b76..3aba51267 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -390,5 +390,11 @@ "pronoun": "pronom", "Type of instance": "Type d'instance", "Security": "Sécurité", - "Enabling broch mode": "L'activation du mode broch fournit une fortification temporaire contre les attaques. Seuls les messages par des instances déjà connues seront acceptés. Il s'écoule après une semaine." + "Enabling broch mode": "L'activation du mode broch fournit une fortification temporaire contre les attaques. Seuls les messages par des instances déjà connues seront acceptés. Il s'écoule après une semaine.", + "Instance Settings": "Paramètres d'instance", + "Video Settings": "Paramètres vidéo", + "Filtering and Blocking": "Filtrage et blocage", + "Role Assignment": "Attribution de rôle", + "Background Images": "Images d'arrière-plan", + "Contact Details": "Détails du contact" } diff --git a/translations/ga.json b/translations/ga.json index a956fc491..cb98b3e88 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -390,5 +390,11 @@ "pronoun": "forainm", "Type of instance": "Cineál mar shampla", "Security": "Slándáil", - "Enabling broch mode": "Soláthraíonn modh bróiste cumasaithe daingniú sealadach ar ionsaí. Ní ghlacfar ach le poist de réir cásanna a bhfuil eolas orthu cheana. Maireann sé tar éis seachtaine." + "Enabling broch mode": "Soláthraíonn modh bróiste cumasaithe daingniú sealadach ar ionsaí. Ní ghlacfar ach le poist de réir cásanna a bhfuil eolas orthu cheana. Maireann sé tar éis seachtaine.", + "Instance Settings": "Socruithe Institiúide", + "Video Settings": "Socruithe Físe", + "Filtering and Blocking": "Scagadh agus Blocáil", + "Role Assignment": "Sannadh Róil", + "Background Images": "Íomhánna Cúlra", + "Contact Details": "Sonraí Teagmhála" } diff --git a/translations/hi.json b/translations/hi.json index a60c8611d..d890c16ba 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -390,5 +390,11 @@ "pronoun": "सवर्नाम", "Type of instance": "उदाहरण के प्रकार", "Security": "सुरक्षा", - "Enabling broch mode": "ब्रोश मोड को सक्षम करना हमले के खिलाफ एक अस्थायी किलेबंदी प्रदान करता है। केवल पहले से ज्ञात उदाहरणों द्वारा पोस्ट स्वीकार किए जाएंगे। यह एक सप्ताह के बाद समाप्त हो जाता है।" + "Enabling broch mode": "ब्रोश मोड को सक्षम करना हमले के खिलाफ एक अस्थायी किलेबंदी प्रदान करता है। केवल पहले से ज्ञात उदाहरणों द्वारा पोस्ट स्वीकार किए जाएंगे। यह एक सप्ताह के बाद समाप्त हो जाता है।", + "Instance Settings": "उदाहरण सेटिंग्स", + "Video Settings": "वीडियो सेटिंग्स", + "Filtering and Blocking": "छानना और अवरुद्ध करना", + "Role Assignment": "भूमिका असाइनमेंट", + "Background Images": "पृष्ठभूमि छवियों", + "Contact Details": "सम्पर्क करने का विवरण" } diff --git a/translations/it.json b/translations/it.json index 2cfe13ea7..be3e43443 100644 --- a/translations/it.json +++ b/translations/it.json @@ -390,5 +390,11 @@ "pronoun": "pronome", "Type of instance": "Tipo di istanza", "Security": "Sicurezza", - "Enabling broch mode": "L'attivazione della modalità Broch fornisce una fortificazione temporanea contro gli attacchi. Verranno accettati solo i post di istanze già note. Scade dopo una settimana." + "Enabling broch mode": "L'attivazione della modalità Broch fornisce una fortificazione temporanea contro gli attacchi. Verranno accettati solo i post di istanze già note. Scade dopo una settimana.", + "Instance Settings": "Impostazioni istanza", + "Video Settings": "Impostazioni video", + "Filtering and Blocking": "Filtraggio e blocco", + "Role Assignment": "Assegnazione del ruolo", + "Background Images": "Immagini di sfondo", + "Contact Details": "Dettagli del contatto" } diff --git a/translations/ja.json b/translations/ja.json index 0f5fe213f..d5ef7d006 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -390,5 +390,11 @@ "pronoun": "代名詞", "Type of instance": "インスタンスのタイプ", "Security": "セキュリティ", - "Enabling broch mode": "ブロッホモードを有効にすると、攻撃に対する一時的な要塞が提供されます。 既知のインスタンスによる投稿のみが受け入れられます。 一週間後に経過します。" + "Enabling broch mode": "ブロッホモードを有効にすると、攻撃に対する一時的な要塞が提供されます。 既知のインスタンスによる投稿のみが受け入れられます。 一週間後に経過します。", + "Instance Settings": "インスタンス設定", + "Video Settings": "ビデオ設定", + "Filtering and Blocking": "フィルタリングとブロッキング", + "Role Assignment": "役割の割り当て", + "Background Images": "背景画像", + "Contact Details": "連絡先の詳細" } diff --git a/translations/oc.json b/translations/oc.json index 50185c38f..f8495c139 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -386,5 +386,11 @@ "pronoun": "pronoun", "Type of instance": "Type of instance", "Security": "Security", - "Enabling broch mode": "Enabling broch mode provides a temporary fortification against attack. Only posts by already known instances will be accepted. If not turned off, it elapses after a week." + "Enabling broch mode": "Enabling broch mode provides a temporary fortification against attack. Only posts by already known instances will be accepted. If not turned off, it elapses after a week.", + "Instance Settings": "Instance Settings", + "Video Settings": "Video Settings", + "Filtering and Blocking": "Filtering and Blocking", + "Role Assignment": "Role Assignment", + "Background Images": "Background Images", + "Contact Details": "Contact Details" } diff --git a/translations/pt.json b/translations/pt.json index 8e671f5d5..54ffea0d8 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -390,5 +390,11 @@ "pronoun": "pronome", "Type of instance": "Tipo de instância", "Security": "Segurança", - "Enabling broch mode": "Habilitar o modo broch fornece uma fortificação temporária contra ataques. Somente postagens de instâncias já conhecidas serão aceitas. Decorre depois de uma semana." + "Enabling broch mode": "Habilitar o modo broch fornece uma fortificação temporária contra ataques. Somente postagens de instâncias já conhecidas serão aceitas. Decorre depois de uma semana.", + "Instance Settings": "Configurações de instância", + "Video Settings": "Configurações de vídeo", + "Filtering and Blocking": "Filtragem e Bloqueio", + "Role Assignment": "Atribuição de Função", + "Background Images": "Imagens de fundo", + "Contact Details": "Detalhes do contato" } diff --git a/translations/ru.json b/translations/ru.json index 39d701e74..f171d543c 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -390,5 +390,11 @@ "pronoun": "местоимение", "Type of instance": "Тип экземпляра", "Security": "Безопасность", - "Enabling broch mode": "Включение режима брошюры обеспечивает временную защиту от атак. Будут приниматься только сообщения от уже известных экземпляров. Проходит через неделю." + "Enabling broch mode": "Включение режима брошюры обеспечивает временную защиту от атак. Будут приниматься только сообщения от уже известных экземпляров. Проходит через неделю.", + "Instance Settings": "Настройки экземпляра", + "Video Settings": "Настройки видео", + "Filtering and Blocking": "Фильтрация и блокировка", + "Role Assignment": "Назначение ролей", + "Background Images": "Фоновые изображения", + "Contact Details": "Контактная информация" } diff --git a/translations/zh.json b/translations/zh.json index fd58a8b20..493e6e184 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -390,5 +390,11 @@ "pronoun": "代词", "Type of instance": "实例类型", "Security": "安全", - "Enabling broch mode": "启用broch模式可提供针对攻击的临时防御。 仅接受已知实例的帖子。 一个星期后就过去了。" + "Enabling broch mode": "启用broch模式可提供针对攻击的临时防御。 仅接受已知实例的帖子。 一个星期后就过去了。", + "Instance Settings": "实例设定", + "Video Settings": "影片设定", + "Filtering and Blocking": "过滤和阻止", + "Role Assignment": "角色分配", + "Background Images": "背景图片", + "Contact Details": "联系方式" } diff --git a/webapp_profile.py b/webapp_profile.py index 4626ffd6e..b797de4a6 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -1211,7 +1211,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, '

' - skillsStr += ' \n' + skillsStr += ' \n' cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): @@ -1232,6 +1232,9 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, getConfigParam(baseDir, 'instanceDescriptionShort') instanceTitle = \ getConfigParam(baseDir, 'instanceTitle') + + instanceStr = '
' + \ + translate['Instance Settings'] + '\n' instanceStr += '
' instanceStr += \ '
\n' + instanceStr += '
\n' # Role assignments section moderators = '' @@ -1357,7 +1360,9 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, with open(moderatorsFile, "r") as f: moderators = f.read() # site moderators - roleAssignStr = '
' + roleAssignStr = '
' + \ + translate['Role Assignment'] + '\n' + roleAssignStr += '
' roleAssignStr += '
\n' roleAssignStr += ' ' + \ @@ -1382,10 +1387,12 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, ' ' - roleAssignStr += '
\n' + roleAssignStr += '
\n' # Video section - peertubeStr = '
\n' + peertubeStr = '
' + \ + translate['Video Settings'] + '\n' + peertubeStr += '
\n' peertubeStr += \ ' \n' @@ -1409,7 +1416,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, peertubeStr += \ ' \n' - peertubeStr += '
\n' + peertubeStr += '
\n' instanceTitle = \ getConfigParam(baseDir, 'instanceTitle') @@ -1470,6 +1477,12 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, editProfileForm += \ ' \n' + editProfileForm += \ + ' \n' + editProfileForm += \ + ' \n' alsoKnownAsStr = '' if actorJson.get('alsoKnownAs'): @@ -1536,6 +1549,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, editProfileForm += ' \n' # Contact information + editProfileForm += '
' + \ + translate['Contact Details'] + '\n' editProfileForm += '
' editProfileForm += '
\n' @@ -1588,20 +1603,16 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, editProfileForm += '
\n' - editProfileForm += '
\n' + editProfileForm += '
\n' # Customize images and banners + editProfileForm += '
' + \ + translate['Background Images'] + '\n' editProfileForm += '
\n' idx = 'The files attached below should be no larger than ' + \ '10MB in total uploaded at once.' editProfileForm += \ '

\n' - editProfileForm += \ - ' \n' - editProfileForm += \ - ' \n' if not newsInstance: editProfileForm += \ @@ -1633,9 +1644,11 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, editProfileForm += 'name="right_col_image"' editProfileForm += ' accept="' + imageFormats + '">\n' - editProfileForm += '
\n' + editProfileForm += '
\n' # Change password + editProfileForm += '
' + \ + translate['Change Password'] + '\n' editProfileForm += '
\n' editProfileForm += \ '
\n' editProfileForm += \ ' \n' - editProfileForm += '
\n' + editProfileForm += '
\n' # Filtering and blocking section + editProfileForm += '
' + \ + translate['Filtering and Blocking'] + '\n' editProfileForm += '
\n' editProfileForm += \ '
\n' + editProfileForm += '
\n' + + # Skills section + editProfileForm += '
' + \ + translate['Skills'] + '\n' editProfileForm += '
\n' editProfileForm += \ '