Merge branch 'main' of https://github.com/Worklenz/worklenz into release/v2.0.4

worklenz-frontend/src/features/i18n/language-selector.tsx

@@ -15,12 +15,16 @@ const LanguageSelector = () => {
     { key: 'en', label: 'English' },
     { key: 'es', label: 'Español' },
     { key: 'pt', label: 'Português' },
+    { key: 'alb', label: 'Shqip' },
+    { key: 'de', label: 'Deutsch' },
   ];
 
   const languageLabels = {
     en: 'En',
     es: 'Es',
     pt: 'Pt',
+    alb: 'Sq',
+    de: 'de',
   };
 
   return (

worklenz-frontend/src/features/i18n/localesSlice.ts

@@ -5,6 +5,8 @@ export enum Language {
   EN = 'en',
   ES = 'es',
   PT = 'pt',
+  ALB = 'alb',
+  DE = 'de',
 }
 
 export type ILanguageType = `${Language}`;

worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx

@@ -47,6 +47,14 @@ const LanguageAndRegionSettings = () => {
       value: Language.PT,
       label: 'Português',
     },
+    {
+      value: Language.ALB,
+      label: 'Shqip',
+    },
+    {
+      value: Language.DE,
+      label: 'Deutsch',
+    },
   ];
 
   const handleLanguageChange = async (values: { language?: ILanguageType; timezone?: string }) => {

worklenz-frontend/src/utils/greetingString.ts

@@ -29,6 +29,18 @@ export const greetingString = (name: string): string => {
     morning = 'manhã';
     afternoon = 'tarde';
     evening = 'noite';
+  } else if (language === 'alb') {
+    greetingPrefix = 'Përshëndetje';
+    greetingSuffix = 'të mbarë';
+    morning = 'mëngjesi';
+    afternoon = 'pasdite';
+    evening = 'mbrëmja';
+  } else if (language === 'de') {
+    greetingPrefix = 'Hallo';
+    greetingSuffix = 'Guten';
+    morning = 'Morgen';
+    afternoon = 'Tag';
+    evening = 'Abend';
   }
 
   return `${greetingPrefix} ${name}, ${greetingSuffix} ${greet}!`;