From df29c0e0240851022f717d338c6f43477f15d780 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 24 Aug 2020 10:05:46 +0100 Subject: [PATCH] Clearer new post logic --- 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 | 62 +++++++++++++++++++++++++------------------- 16 files changed, 65 insertions(+), 42 deletions(-) diff --git a/translations/ar.json b/translations/ar.json index cbf796db8..6c65f21b9 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -278,5 +278,6 @@ "Event banner image description": "وصف صورة شعار الحدث", "Banner image": "صورة بانر", "Maximum attendees": "الحد الأقصى للحضور", - "Ticket URL": "عنوان URL للتذكرة" + "Ticket URL": "عنوان URL للتذكرة", + "Create a new event": "أنشئ حدثًا جديدًا" } diff --git a/translations/ca.json b/translations/ca.json index 310a661c3..c462ce6d3 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -278,5 +278,6 @@ "Event banner image description": "Descripció de la imatge del banner de l’esdeveniment", "Banner image": "Imatge de pancarta", "Maximum attendees": "Màxim d’assistents", - "Ticket URL": "URL de l'entrada" + "Ticket URL": "URL de l'entrada", + "Create a new event": "Creeu un esdeveniment nou" } diff --git a/translations/cy.json b/translations/cy.json index d2cece7ae..9affa0a71 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -278,5 +278,6 @@ "Event banner image description": "Disgrifiad delwedd baner y digwyddiad", "Banner image": "Delwedd baner", "Maximum attendees": "Uchafswm mynychwyr", - "Ticket URL": "URL y tocyn" + "Ticket URL": "URL y tocyn", + "Create a new event": "Creu digwyddiad newydd" } diff --git a/translations/de.json b/translations/de.json index 5e5b00215..930ef8304 100644 --- a/translations/de.json +++ b/translations/de.json @@ -278,5 +278,6 @@ "Event banner image description": "Beschreibung des Ereignisbannerbildes", "Banner image": "Bannerbild", "Maximum attendees": "Maximale Teilnehmerzahl", - "Ticket URL": "Ticket URL" + "Ticket URL": "Ticket URL", + "Create a new event": "Erstellen Sie ein neues Ereignis" } diff --git a/translations/en.json b/translations/en.json index 32950fcc6..00626db29 100644 --- a/translations/en.json +++ b/translations/en.json @@ -278,5 +278,6 @@ "Event banner image description": "Event banner image description", "Banner image": "Banner image", "Maximum attendees": "Maximum attendees", - "Ticket URL": "Ticket URL" + "Ticket URL": "Ticket URL", + "Create a new event": "Create a new event" } diff --git a/translations/es.json b/translations/es.json index 3023aba06..c605d8172 100644 --- a/translations/es.json +++ b/translations/es.json @@ -278,5 +278,6 @@ "Event banner image description": "Descripción de la imagen del banner del evento", "Banner image": "Imagen de banner", "Maximum attendees": "Asistentes máximos", - "Ticket URL": "URL del ticket" + "Ticket URL": "URL del ticket", + "Create a new event": "Crea un nuevo evento" } diff --git a/translations/fr.json b/translations/fr.json index ba35142d3..19dd7bf1d 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -278,5 +278,6 @@ "Event banner image description": "Description de l'image de la bannière de l'événement", "Banner image": "Image de bannière", "Maximum attendees": "Nombre maximum de participants", - "Ticket URL": "URL du ticket" + "Ticket URL": "URL du ticket", + "Create a new event": "Créer un nouvel événement" } diff --git a/translations/ga.json b/translations/ga.json index f2d7dfd0f..33184c028 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -278,5 +278,6 @@ "Event banner image description": "Tuairisc íomhá meirge na hócáide", "Banner image": "Íomhá meirge", "Maximum attendees": "Uasmhéid freastail", - "Ticket URL": "URL na dticéad" + "Ticket URL": "URL na dticéad", + "Create a new event": "Cruthaigh imeacht nua" } diff --git a/translations/hi.json b/translations/hi.json index f1408a8b8..b7ca0a68a 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -278,5 +278,6 @@ "Event banner image description": "घटना बैनर छवि विवरण", "Banner image": "बैनर की छवि", "Maximum attendees": "अधिकतम उपस्थित", - "Ticket URL": "टिकट URL" + "Ticket URL": "टिकट URL", + "Create a new event": "एक नई घटना बनाएँ" } diff --git a/translations/it.json b/translations/it.json index 26129d99f..f5db48988 100644 --- a/translations/it.json +++ b/translations/it.json @@ -278,5 +278,6 @@ "Event banner image description": "Descrizione dell'immagine del banner dell'evento", "Banner image": "Immagine banner", "Maximum attendees": "Numero massimo di partecipanti", - "Ticket URL": "URL del biglietto" + "Ticket URL": "URL del biglietto", + "Create a new event": "Crea un nuovo evento" } diff --git a/translations/ja.json b/translations/ja.json index 7168441e0..0e18d19b8 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -278,5 +278,6 @@ "Event banner image description": "イベントバナー画像の説明", "Banner image": "バナー画像", "Maximum attendees": "最大参加者", - "Ticket URL": "チケットURL" + "Ticket URL": "チケットURL", + "Create a new event": "新しいイベントを作成する" } diff --git a/translations/oc.json b/translations/oc.json index d4de3fa48..d2c8307b2 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -274,5 +274,6 @@ "Event banner image description": "Event banner image description", "Banner image": "Banner image", "Maximum attendees": "Maximum attendees", - "Ticket URL": "Ticket URL" + "Ticket URL": "Ticket URL", + "Create a new event": "Create a new event" } diff --git a/translations/pt.json b/translations/pt.json index 82f591749..aaf2f4ff7 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -278,5 +278,6 @@ "Event banner image description": "Descrição da imagem do banner do evento", "Banner image": "Imagem de banner", "Maximum attendees": "Máximo de participantes", - "Ticket URL": "URL do bilhete" + "Ticket URL": "URL do bilhete", + "Create a new event": "Crie um novo evento" } diff --git a/translations/ru.json b/translations/ru.json index 5f00471d4..9f55c9816 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -278,5 +278,6 @@ "Event banner image description": "Описание изображения баннера мероприятия", "Banner image": "Изображение баннера", "Maximum attendees": "Максимальное количество участников", - "Ticket URL": "URL билета" + "Ticket URL": "URL билета", + "Create a new event": "Создать новое мероприятие" } diff --git a/translations/zh.json b/translations/zh.json index eab8eece1..0a0f18988 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -278,5 +278,6 @@ "Event banner image description": "活动横幅图片说明", "Banner image": "横幅图片", "Maximum attendees": "参加人数上限", - "Ticket URL": "工单URL" + "Ticket URL": "工单URL", + "Create a new event": "建立新活动" } diff --git a/webinterface.py b/webinterface.py index 29707c2a4..cabbd6ace 100644 --- a/webinterface.py +++ b/webinterface.py @@ -4729,33 +4729,8 @@ def htmlTimeline(defaultTimeline: str, tlStr = htmlHeader(cssFilename, profileStyle) - if boxName != 'dm': - if boxName != 'tlblogs': - if not manuallyApproveFollowers: - newPostButtonStr = \ - '| ' + \ - translate['Create a new post'] + \ - '\n' - else: - newPostButtonStr = \ - '| ' + translate['Create a new post'] + \ - '\n' - else: - newPostButtonStr = \ - '| ' + \ - translate['Create a new post'] + \ - '\n' - else: + # what screen to go to when a new post is created + if boxName == 'dm': newPostButtonStr = \ '| ' + translate['Create a new DM'] + \ '\n' + elif boxName == 'tlblogs': + newPostButtonStr = \ + '| ' + \ + translate['Create a new post'] + \ + '\n' + elif boxName == 'tlevents': + newPostButtonStr = \ + '| ' + \ + translate['Create a new event'] + \ + '\n' + else: + if not manuallyApproveFollowers: + newPostButtonStr = \ + '| ' + \ + translate['Create a new post'] + \ + '\n' + else: + newPostButtonStr = \ + '| ' + translate['Create a new post'] + \ + '\n' # This creates a link to the profile page when viewed # in lynx, but should be invisible in a graphical web browser