Refactor code and improve internationalization support

- Updated import statements to remove invisible characters. - Standardized comments to use a consistent hyphen format. - Adjusted username validation error messages for consistency. - Enhanced email sending functions to include language support. - Added email internationalization configuration for dynamic translations. - Updated calendar and federation routes to include language in user queries. - Improved user feedback messages in German and English for clarity.
2026-03-02 16:14:54 +01:00
parent c2c10f9a4b
commit b5218046c9
15 changed files with 356 additions and 217 deletions
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -1,4 +1,4 @@
-{
+{
  "common": {
    "appName": "Redlight",
    "loading": "Laden...",
@@ -76,11 +76,11 @@
    "emailNotVerified": "E-Mail-Adresse noch nicht verifiziert. Bitte prüfe dein Postfach.",
    "username": "Benutzername",
    "usernamePlaceholder": "z.B. maxmuster",
-    "usernameHint": "Nur Buchstaben, Zahlen, _ und - erlaubt (3–30 Zeichen)",
+    "usernameHint": "Nur Buchstaben, Zahlen, _ und - erlaubt (3-30 Zeichen)",
    "displayName": "Anzeigename",
    "displayNamePlaceholder": "Max Mustermann",
    "usernameTaken": "Benutzername ist bereits vergeben",
-    "usernameInvalid": "Benutzername darf nur Buchstaben, Zahlen, _ und - enthalten (3–30 Zeichen)",
+    "usernameInvalid": "Benutzername darf nur Buchstaben, Zahlen, _ und - enthalten (3-30 Zeichen)",
    "usernameRequired": "Benutzername ist erforderlich",
    "displayNameRequired": "Anzeigename ist erforderlich",
    "emailVerificationBanner": "Deine E-Mail-Adresse wurde noch nicht verifiziert.",
@@ -394,7 +394,7 @@
    "removeRoomConfirm": "Raum wirklich entfernen?",
    "roomRemoved": "Raum entfernt",
    "roomRemoveFailed": "Raum konnte nicht entfernt werden",
-    "acceptedSaved": "Einladung angenommen – Raum wurde in deinem Dashboard gespeichert!",
+    "acceptedSaved": "Einladung angenommen - Raum wurde in deinem Dashboard gespeichert!",
    "meetingId": "Meeting ID",
    "maxParticipants": "Max. Teilnehmer",
    "recordingOn": "Aufnahme aktiviert",
@@ -412,7 +412,7 @@
    "calendarEvent": "Kalendereinladung",
    "calendarAccepted": "Kalender-Event angenommen und in deinen Kalender eingetragen!",
    "localCalendarEvent": "Lokale Kalendereinladung",
-    "calendarLocalAccepted": "Einladung angenommen – Event wurde in deinen Kalender eingetragen!",
+    "calendarLocalAccepted": "Einladung angenommen - Event wurde in deinen Kalender eingetragen!",
    "invitationRemoved": "Einladung entfernt",
    "removeInvitation": "Einladung entfernen"
  },
@@ -475,5 +475,42 @@
    "organizer": "Organisator",
    "federatedFrom": "Von Remote-Instanz",
    "joinFederatedMeeting": "Remote-Meeting beitreten"
+  },
+  "email": {
+    "greeting": "Hey {name} 👋",
+    "viewInvitation": "Einladung anzeigen",
+    "invitationFooter": "Öffne den Link oben, um die Einladung anzunehmen oder abzulehnen.",
+    "linkHint": "Oder kopiere diesen Link in deinen Browser:",
+    "verify": {
+      "subject": "{appName} - E-Mail-Adresse bestätigen",
+      "intro": "Bitte bestätige deine E-Mail-Adresse, indem du auf den Button klickst:",
+      "button": "E-Mail bestätigen",
+      "validity": "Dieser Link ist 24 Stunden gültig.",
+      "footer": "Falls du dich nicht registriert hast, kannst du diese E-Mail ignorieren."
+    },
+    "invite": {
+      "subject": "{appName} - Du wurdest eingeladen",
+      "title": "Du wurdest eingeladen! 🎉",
+      "intro": "Du wurdest eingeladen, ein Konto auf {appName} zu erstellen.",
+      "prompt": "Klicke auf den Button, um dich zu registrieren:",
+      "button": "Konto erstellen",
+      "validity": "Dieser Link ist 7 Tage gültig.",
+      "footer": "Falls du diese Einladung nicht erwartet hast, kannst du diese E-Mail ignorieren."
+    },
+    "federationInvite": {
+      "subject": "{appName} - Meeting-Einladung von {fromUser}",
+      "intro": "Du hast eine Meeting-Einladung von {fromUser} erhalten.",
+      "roomLabel": "Raum:"
+    },
+    "calendarInvite": {
+      "subject": "{appName} - Kalendereinladung von {fromUser}",
+      "intro": "Du hast eine Kalendereinladung von {fromUser} erhalten."
+    },
+    "calendarDeleted": {
+      "subject": "{appName} - Kalendereintrag abgesagt: {title}",
+      "intro": "Der folgende Kalendereintrag wurde vom Organisator ({fromUser}) gelöscht und ist nicht mehr verfügbar:",
+      "note": "Der Termin wurde automatisch aus deinem Kalender entfernt.",
+      "footer": "Diese Nachricht wurde automatisch von {appName} versendet."
+    }
  }
 }
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1,4 +1,4 @@
-{
+{
  "common": {
    "appName": "Redlight",
    "loading": "Loading...",
@@ -76,11 +76,11 @@
    "emailNotVerified": "Email not yet verified. Please check your inbox.",
    "username": "Username",
    "usernamePlaceholder": "e.g. johndoe",
-    "usernameHint": "Letters, numbers, _ and - only (3–30 chars)",
+    "usernameHint": "Letters, numbers, _ and - only (3-30 chars)",
    "displayName": "Display Name",
    "displayNamePlaceholder": "John Doe",
    "usernameTaken": "Username is already taken",
-    "usernameInvalid": "Username may only contain letters, numbers, _ and - (3–30 chars)",
+    "usernameInvalid": "Username may only contain letters, numbers, _ and - (3-30 chars)",
    "usernameRequired": "Username is required",
    "displayNameRequired": "Display name is required",
    "emailVerificationBanner": "Your email address has not been verified yet.",
@@ -394,7 +394,7 @@
    "removeRoomConfirm": "Really remove this room?",
    "roomRemoved": "Room removed",
    "roomRemoveFailed": "Could not remove room",
-    "acceptedSaved": "Invitation accepted – room saved to your dashboard!",
+    "acceptedSaved": "Invitation accepted - room saved to your dashboard!",
    "meetingId": "Meeting ID",
    "maxParticipants": "Max. participants",
    "recordingOn": "Recording enabled",
@@ -412,7 +412,7 @@
    "calendarEvent": "Calendar Invitation",
    "calendarAccepted": "Calendar event accepted and added to your calendar!",
    "localCalendarEvent": "Local Calendar Invitation",
-    "calendarLocalAccepted": "Invitation accepted – event added to your calendar!",
+    "calendarLocalAccepted": "Invitation accepted - event added to your calendar!",
    "invitationRemoved": "Invitation removed",
    "removeInvitation": "Remove invitation"
  },
@@ -475,5 +475,42 @@
    "organizer": "Organizer",
    "federatedFrom": "From remote instance",
    "joinFederatedMeeting": "Join remote meeting"
+  },
+  "email": {
+    "greeting": "Hey {name} 👋",
+    "viewInvitation": "View Invitation",
+    "invitationFooter": "Open the link above to accept or decline the invitation.",
+    "linkHint": "Or copy this link in your browser:",
+    "verify": {
+      "subject": "{appName} - Verify your email",
+      "intro": "Please verify your email address by clicking the button below:",
+      "button": "Verify Email",
+      "validity": "This link is valid for 24 hours.",
+      "footer": "If you didn't register, please ignore this email."
+    },
+    "invite": {
+      "subject": "{appName} - You've been invited",
+      "title": "You've been invited! 🎉",
+      "intro": "You have been invited to create an account on {appName}.",
+      "prompt": "Click the button below to register:",
+      "button": "Create Account",
+      "validity": "This link is valid for 7 days.",
+      "footer": "If you didn't expect this invitation, you can safely ignore this email."
+    },
+    "federationInvite": {
+      "subject": "{appName} - Meeting invitation from {fromUser}",
+      "intro": "You have received a meeting invitation from {fromUser}.",
+      "roomLabel": "Room:"
+    },
+    "calendarInvite": {
+      "subject": "{appName} - Calendar invitation from {fromUser}",
+      "intro": "You have received a calendar invitation from {fromUser}."
+    },
+    "calendarDeleted": {
+      "subject": "{appName} - Calendar event cancelled: {title}",
+      "intro": "The following calendar event was deleted by the organiser ({fromUser}) and is no longer available:",
+      "note": "The event has been automatically removed from your calendar.",
+      "footer": "This message was sent automatically by {appName}."
+    }
  }
 }
--- a/src/pages/Calendar.jsx
+++ b/src/pages/Calendar.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import {
  ChevronLeft, ChevronRight, Plus, Calendar as CalendarIcon, Clock, Video,
  Loader2, Download, Share2, Globe, Trash2, Edit, X, UserPlus, Send, ExternalLink,
@@ -494,7 +494,7 @@ export default function Calendar() {
                        style={{ backgroundColor: ev.color || '#6366f1' }}
                      >
                        <div className="truncate">{ev.title}</div>
-                        <div className="opacity-80 text-[10px]">{formatTime(ev.start_time)} – {formatTime(ev.end_time)}</div>
+                        <div className="opacity-80 text-[10px]">{formatTime(ev.start_time)} - {formatTime(ev.end_time)}</div>
                      </div>
                    ))}
                  </div>
@@ -604,7 +604,7 @@ export default function Calendar() {
            <div className="flex items-center gap-2 text-sm text-th-text-s">
              <Clock size={14} />
              <span>
-                {new Date(showDetail.start_time).toLocaleString()} – {new Date(showDetail.end_time).toLocaleString()}
+                {new Date(showDetail.start_time).toLocaleString()} - {new Date(showDetail.end_time).toLocaleString()}
              </span>
            </div>

--- a/src/pages/FederationInbox.jsx
+++ b/src/pages/FederationInbox.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { Globe, Mail, Check, X, ExternalLink, Loader2, Inbox, Calendar, Trash2 } from 'lucide-react';
 import api from '../services/api';
 import { useLanguage } from '../contexts/LanguageContext';
@@ -210,7 +210,7 @@ export default function FederationInbox() {
                                            {t('federation.from')}: <span className="font-medium text-th-text">{inv.from_user}</span>
                                        </p>
                                        <p className="text-sm text-th-text-s mt-1">
-                                            {new Date(inv.start_time).toLocaleString()} – {new Date(inv.end_time).toLocaleString()}
+                                            {new Date(inv.start_time).toLocaleString()} - {new Date(inv.end_time).toLocaleString()}
                                        </p>
                                        {inv.description && (
                                            <p className="text-sm text-th-text-s mt-1 italic">"{inv.description}"</p>
@@ -249,7 +249,7 @@ export default function FederationInbox() {
                                            {t('federation.from')}: <span className="font-medium text-th-text">{inv.from_name}</span>
                                        </p>
                                        <p className="text-sm text-th-text-s mt-1">
-                                            {new Date(inv.start_time).toLocaleString()} – {new Date(inv.end_time).toLocaleString()}
+                                            {new Date(inv.start_time).toLocaleString()} - {new Date(inv.end_time).toLocaleString()}
                                        </p>
                                        {inv.description && (
                                            <p className="text-sm text-th-text-s mt-1 italic">"{inv.description}"</p>