Merge branch 'main' of https://github.com/bulwarkmail/webmail

components/providers/intl-provider.tsx

@@ -11,6 +11,7 @@ import itMessages from '@/locales/it/common.json';
 import deMessages from '@/locales/de/common.json';
 import nlMessages from '@/locales/nl/common.json';
 import ptMessages from '@/locales/pt/common.json';
+import ruMessages from '@/locales/ru/common.json';
 
 // Pre-loaded translations (loaded at build time, not runtime)
 const ALL_MESSAGES = {
@@ -22,6 +23,7 @@ const ALL_MESSAGES = {
   de: deMessages,
   nl: nlMessages,
   pt: ptMessages,
+  ru: ruMessages,
 };
 
 interface IntlProviderProps {

components/ui/language-switcher.tsx

@@ -16,7 +16,8 @@ export function LanguageSwitcher({ className }: { className?: string }) {
     { value: 'it', label: 'Italiano' },
     { value: 'de', label: 'Deutsch' },
     { value: 'nl', label: 'Nederlands' },
-    { value: 'pt', label: 'Português' }
+    { value: 'pt', label: 'Português' },
+    { value: 'ru', label: 'Русский' }
   ];
 
   return (

i18n/request.ts

@@ -32,6 +32,9 @@ export default getRequestConfig(async ({ requestLocale }) => {
     case 'pt':
       messages = (await import('../locales/pt/common.json')).default;
       break;
+    case 'ru':
+      messages = (await import('../locales/ru/common.json')).default;
+      break;
     default:
       messages = (await import('../locales/en/common.json')).default;
   }

i18n/routing.ts

@@ -1,7 +1,7 @@
 import { defineRouting } from 'next-intl/routing';
 
 export const routing = defineRouting({
-  locales: ['en', 'fr', 'de', 'es', 'it', 'ja', 'nl', 'pt'],
+  locales: ['en', 'fr', 'de', 'es', 'it', 'ja', 'nl', 'pt', 'ru'],
   defaultLocale: 'en',
   localePrefix: 'never'
 });

locales/de/common.json

@@ -583,6 +583,7 @@
     "german": "Deutsch",
     "dutch": "Nederlands",
     "portuguese": "Português",
+    "russian": "Русский",
     "select_language": "Sprache auswählen",
     "switch_to_english": "Zu Englisch wechseln",
     "switch_to_french": "Zu Französisch wechseln",
@@ -592,6 +593,7 @@
     "switch_to_german": "Zu Deutsch wechseln",
     "switch_to_dutch": "Zu Niederländisch wechseln",
     "switch_to_portuguese": "Zu Portugiesisch wechseln",
+    "switch_to_russian": "Zu Russisch wechseln",
     "switching": "Sprache wird gewechselt..."
   },
   "settings": {

locales/en/common.json

@@ -583,6 +583,7 @@
     "german": "Deutsch",
     "dutch": "Nederlands",
     "portuguese": "Português",
+    "russian": "Русский",
     "select_language": "Select language",
     "switch_to_english": "Switch to English",
     "switch_to_french": "Switch to French",
@@ -592,6 +593,7 @@
     "switch_to_german": "Switch to German",
     "switch_to_dutch": "Switch to Dutch",
     "switch_to_portuguese": "Switch to Portuguese",
+    "switch_to_russian": "Switch to Russian",
     "switching": "Changing language..."
   },
   "settings": {

locales/es/common.json

@@ -583,6 +583,7 @@
     "german": "Deutsch",
     "dutch": "Nederlands",
     "portuguese": "Português",
+    "russian": "Русский",
     "select_language": "Seleccionar idioma",
     "switch_to_english": "Cambiar a inglés",
     "switch_to_french": "Cambiar a francés",
@@ -592,6 +593,7 @@
     "switch_to_german": "Cambiar a alemán",
     "switch_to_dutch": "Cambiar a neerlandés",
     "switch_to_portuguese": "Cambiar a portugués",
+    "switch_to_russian": "Cambiar a ruso",
     "switching": "Cambiando idioma..."
   },
   "settings": {

locales/fr/common.json

@@ -583,6 +583,7 @@
     "german": "Deutsch",
     "dutch": "Nederlands",
     "portuguese": "Português",
+    "russian": "Русский",
     "select_language": "Sélectionner la langue",
     "switch_to_english": "Passer à l'anglais",
     "switch_to_french": "Passer au français",
@@ -592,6 +593,7 @@
     "switch_to_german": "Passer à l'allemand",
     "switch_to_dutch": "Passer au néerlandais",
     "switch_to_portuguese": "Passer au portugais",
+    "switch_to_russian": "Passer au russe",
     "switching": "Changement de langue..."
   },
   "settings": {

locales/it/common.json

@@ -583,6 +583,7 @@
     "german": "Deutsch",
     "dutch": "Nederlands",
     "portuguese": "Português",
+    "russian": "Русский",
     "select_language": "Seleziona lingua",
     "switch_to_english": "Passa all'inglese",
     "switch_to_french": "Passa al francese",
@@ -592,6 +593,7 @@
     "switch_to_german": "Passa al tedesco",
     "switch_to_dutch": "Passa all'olandese",
     "switch_to_portuguese": "Passa al portoghese",
+    "switch_to_russian": "Passa al russo",
     "switching": "Cambio lingua in corso..."
   },
   "settings": {

locales/ja/common.json

@@ -583,6 +583,7 @@
     "german": "Deutsch",
     "dutch": "Nederlands",
     "portuguese": "Português",
+    "russian": "Русский",
     "select_language": "言語を選択",
     "switch_to_english": "英語に切り替え",
     "switch_to_french": "フランス語に切り替え",
@@ -592,6 +593,7 @@
     "switch_to_german": "ドイツ語に切り替え",
     "switch_to_dutch": "オランダ語に切り替え",
     "switch_to_portuguese": "ポルトガル語に切り替え",
+    "switch_to_russian": "ロシア語に切り替え",
     "switching": "言語を変更中..."
   },
   "settings": {

locales/nl/common.json

@@ -583,6 +583,7 @@
     "german": "Deutsch",
     "dutch": "Nederlands",
     "portuguese": "Português",
+    "russian": "Русский",
     "select_language": "Selecteer taal",
     "switch_to_english": "Overschakelen naar Engels",
     "switch_to_french": "Overschakelen naar Frans",
@@ -592,6 +593,7 @@
     "switch_to_german": "Overschakelen naar Duits",
     "switch_to_dutch": "Overschakelen naar Nederlands",
     "switch_to_portuguese": "Overschakelen naar Portugees",
+    "switch_to_russian": "Overschakelen naar Russisch",
     "switching": "Taal wijzigen..."
   },
   "settings": {

locales/pt/common.json

@@ -583,6 +583,7 @@
     "german": "Deutsch",
     "dutch": "Nederlands",
     "portuguese": "Português",
+    "russian": "Русский",
     "select_language": "Selecionar idioma",
     "switch_to_english": "Mudar para Inglês",
     "switch_to_french": "Mudar para Francês",
@@ -592,6 +593,7 @@
     "switch_to_german": "Mudar para Alemão",
     "switch_to_dutch": "Mudar para Holandês",
     "switch_to_portuguese": "Mudar para Português",
+    "switch_to_russian": "Mudar para Russo",
     "switching": "Alterando idioma..."
   },
   "settings": {

package-lock.json

@@ -9854,7 +9854,7 @@
         "asn1js": "^3.0.5",
         "core-js": "^3.35.1",
         "des.js": "^1.1.0",
-        "elliptic": "git+https://github.com/mahrud/elliptic.git",
+        "elliptic": "^6.6.1",
         "pvtsutils": "^1.3.5",
         "tslib": "^2.6.2",
         "webcrypto-core": "^1.7.8"