From 4d582ce478f71075cdfa7f4074c144f7a0e78f63 Mon Sep 17 00:00:00 2001 From: Andreas Date: Wed, 28 Aug 2024 17:43:32 +0200 Subject: [PATCH] Language improvements (#617) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🔨 Change English date format * 🌐 Update German translation --- backend/src/appointment/controller/mailer.py | 2 +- backend/src/appointment/l10n/de/email.ftl | 18 ++++++++++++++++-- backend/src/appointment/l10n/de/main.ftl | 4 ++++ backend/src/appointment/l10n/en/main.ftl | 4 ++-- frontend/src/locales/de.json | 4 ++++ frontend/src/locales/en.json | 6 +++--- 6 files changed, 30 insertions(+), 8 deletions(-) diff --git a/backend/src/appointment/controller/mailer.py b/backend/src/appointment/controller/mailer.py index 9a72c74fa..5ca2251f7 100644 --- a/backend/src/appointment/controller/mailer.py +++ b/backend/src/appointment/controller/mailer.py @@ -161,7 +161,7 @@ def __init__(self, name, email, date, duration, *args, **kwargs): if self.time_format == 'time-format': self.time_format = '%I:%M%p' if self.date_format == 'date-format': - self.date_format = '%A, %B %d %Y' + self.date_format = '%A, %B %d, %Y' date_end = self.date + datetime.timedelta(minutes=self.duration) diff --git a/backend/src/appointment/l10n/de/email.ftl b/backend/src/appointment/l10n/de/email.ftl index 30e416ede..2d4539a8d 100644 --- a/backend/src/appointment/l10n/de/email.ftl +++ b/backend/src/appointment/l10n/de/email.ftl @@ -3,15 +3,29 @@ ## General -brand-name = Thunderbird Appointment --brand-footer = Diese Nachricht wurde gesendet von {-brand-name}. +-brand-slogan = Weniger planen, mehr schaffen. +-brand-sign-up-with-url = Registrieren auf appointment.day +-brand-sign-up-with-no-url = Registrieren auf +-brand-footer = Diese Nachricht wurde gesendet von: + {-brand-name} + {-brand-slogan} {-brand-sign-up-with-url} -mail-brand-footer = {-brand-footer} +mail-brand-footer = Diese Nachricht wurde gesendet von: + {-brand-name} + {-brand-slogan} {-brand-sign-up-with-no-url} ## Invitation invite-mail-subject = Einladung gesendet von {-brand-name} invite-mail-plain = {-brand-footer} +invite-mail-html-heading-name = { $name } +invite-mail-html-heading-email = ({ $email }) +invite-mail-html-heading-text = hat deine Buchung bestätigt: +invite-mail-html-time = { $duration } min +invite-mail-html-invite-is-attached = Deine Kalendereinladung ist angehängt. +invite-mail-html-download = Download + ## New Booking # Variables diff --git a/backend/src/appointment/l10n/de/main.ftl b/backend/src/appointment/l10n/de/main.ftl index 3e984c876..20443297f 100644 --- a/backend/src/appointment/l10n/de/main.ftl +++ b/backend/src/appointment/l10n/de/main.ftl @@ -93,6 +93,10 @@ join-online = Online teilnehmen unter: { $url } # $phone (String) - An unformatted phone number for the meeting join-phone = Per Telefon teilnehmen: { $phone } +# Waiting List Errors +wl-subscriber-already-exists = { $email } ist bereits Abonnent. +wl-subscriber-failed-to-create = { $email } konnte nicht eingeladen werden. Bitte den Fehler melden! + ## Account Data Readme # This is a text file that is generated and bundled along with your account data diff --git a/backend/src/appointment/l10n/en/main.ftl b/backend/src/appointment/l10n/en/main.ftl index 75a0fe6d7..57be43b20 100644 --- a/backend/src/appointment/l10n/en/main.ftl +++ b/backend/src/appointment/l10n/en/main.ftl @@ -7,8 +7,8 @@ locale = en # Time Format: 8:23pm time-format = %I:%M%p -# Date Format: Sunday, April 04 2024 -date-format = %A, %B %d %Y +# Date Format: Sunday, April 04, 2024 +date-format = %A, %B %d, %Y ## Health Check diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 5360336d5..dbd85539b 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -278,10 +278,13 @@ "selectCalendar": "Kalender auswählen", "send": "Senden", "sendInvitationToAnotherEmail": "Die Einladung an eine andere E-Mail-Adresse senden", + "sendInviteToWaitingList": "Wähle jemanden aus, um eine Einladung zu senden! | Eine Einladung an {Anzahl} Person senden | Eine Einladung an {Anzahl} Leute senden", + "sentCountInvitesSuccessfully": "Alle ausgewählten Benutzer sind bereits eingeladen! | {Anzahl} Einladung gesendet! | {Anzahl} Einladungen gesendet!", "settings": "Einstellungen", "shareMyLink": "Meinen Link teilen", "showSecondaryTimeZone": "Zeige sekundäre Zeitzone", "signInWithGoogle": "Mit Google anmelden", + "signUpForBeta": "Registriere dich für die Beta", "signUpWithInviteCode": "Anmeldung mit Einladungscode", "slotLength": "Termindauer", "start": "Start", @@ -409,6 +412,7 @@ "none": "{value}" }, "waitingList": { + "adminInviteNotice": "Hinweis: Der Senden-Button wird bereits akzeptierte Personen nicht erneut einladen, sie können aber dennoch ausgewählt werden. Verwende die Filter für eine bessere Übersicht!", "confirmHeading": "Deine E-Mail-Adresse wurde bestätigt!", "confirmInfo": "Deine E-Mail-Adresse ist nun bestätigt. Sobald Du ausgewählt wurdest, wirst Du einen Einladungscode bekommen.", "errorHeading": "Es gab ein Problem mit diesem Link", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 78dc872b8..3d1ab8b5a 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -283,8 +283,8 @@ "settings": "Settings", "shareMyLink": "Share my link", "showSecondaryTimeZone": "Show secondary time zone", - "signUpForBeta": "Sign up for the beta", "signInWithGoogle": "Sign in with Google", + "signUpForBeta": "Sign up for the beta", "signUpWithInviteCode": "Sign up with invite code", "slotLength": "Booking Duration", "start": "Start", @@ -412,6 +412,7 @@ "none": "{value}" }, "waitingList": { + "adminInviteNotice": "Notice: The Send button will not re-invite people already accepted, but you can still select them. Use the filters for clarity!", "confirmHeading": "Your email is confirmed!", "confirmInfo": "Your email is now confirmed and if selected you will be contacted about an invite code in the future.", "errorHeading": "There was a problem with that link", @@ -421,7 +422,6 @@ "signUpAlreadyExists": "You are already on the waiting list.", "signUpCheckYourEmail": "Check your email for more information.", "signUpHeading": "Just one more step!", - "signUpInfo": "Before you can be added to the waiting list, you need to confirm your email address.", - "adminInviteNotice": "Notice: The Send button will not re-invite people already accepted, but you can still select them. Use the filters for clarity!" + "signUpInfo": "Before you can be added to the waiting list, you need to confirm your email address." } }