Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Language improvements #617

Merged
merged 2 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/src/appointment/controller/mailer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
18 changes: 16 additions & 2 deletions backend/src/appointment/l10n/de/email.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions backend/src/appointment/l10n/de/main.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions backend/src/appointment/l10n/en/main.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions frontend/src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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."
}
}