Merge pull request #31 from timonmdy/v2.2/hotfix-1

Apply language correclty

Author: timonmdy

languages/de.json

@@ -11,6 +11,9 @@
     "general.close": "Schließen",
     "general.retry": "Erneut versuchen",
     "general.copy": "Kopieren",
+    "general.cut": "Ausschneiden",
+    "general.paste": "Einfügen",
+    "general.selectAll": "Alles auswählen",
     "general.enabled": "Aktiviert",
     "general.disabled": "Deaktiviert",
     "general.on": "An",

src/main/shared/config/DefaultLanguage.config.ts

@@ -9,6 +9,9 @@ const ENGLISH_STRINGS = {
   'general.close': 'Close',
   'general.retry': 'Retry',
   'general.copy': 'Copy',
+  'general.cut': 'Cut',
+  'general.paste': 'Paste',
+  'general.selectAll': 'Select All',
   'general.enabled': 'Enabled',
   'general.disabled': 'Disabled',
   'general.on': 'On',

src/renderer/components/settings/sections/AppearanceSection.tsx

@@ -5,6 +5,7 @@ import { useTranslation } from '../../../i18n/I18nProvider';
 import { VscSync, VscCheck } from 'react-icons/vsc';
 import type { ThemeDefinition } from '../../../../main/shared/types/Theme.types';
 import type { LanguageDefinition } from '../../../../main/shared/types/Language.types';
+import { ENGLISH } from '../../../../main/shared/config/DefaultLanguage.config';
 import type { JRCEnvironment } from '../../../../main/shared/types/App.types';
 
 type FetchState = 'idle' | 'loading' | 'done' | 'error';
@@ -85,7 +86,7 @@ export function AppearanceSection() {
 
   // Active theme/lang always shown first; session entries fill the rest
   const allThemes = [theme, ...sessionThemes.filter((th) => th.id !== theme.id)];
-  const allLangs = [language, ...sessionLangs.filter((l) => l.id !== language.id)];
+  const allLangs = mergeById([language, ENGLISH], sessionLangs, (l) => l.id);
 
   return (
     <>

src/renderer/hooks/useInputContextMenu.tsx

@@ -1,6 +1,7 @@
 import React, { useCallback, useState } from 'react';
 import { MdContentCopy, MdContentCut, MdContentPaste, MdSelectAll } from 'react-icons/md';
 import { ContextMenu } from '../components/common/ContextMenu';
+import { useTranslation } from '../i18n/I18nProvider';
 
 type InputEl = HTMLInputElement | HTMLTextAreaElement;
 
@@ -15,6 +16,7 @@ interface State {
 let closeActiveMenu: (() => void) | null = null;
 
 export function useInputContextMenu() {
+  const { t } = useTranslation();
   const [state, setState] = useState<State | null>(null);
 
   const onContextMenu = useCallback((e: React.MouseEvent<InputEl>) => {
@@ -42,7 +44,7 @@ export function useInputContextMenu() {
       onClose={handleClose}
       items={[
         {
-          label: 'Cut',
+          label: t('general.cut'),
           icon: <MdContentCut size={12} />,
           disabled: !state.hasSelection,
           onClick: () => {
@@ -51,7 +53,7 @@ export function useInputContextMenu() {
           },
         },
         {
-          label: 'Copy',
+          label: t('general.copy'),
           icon: <MdContentCopy size={12} />,
           disabled: !state.hasSelection,
           onClick: () => {
@@ -60,7 +62,7 @@ export function useInputContextMenu() {
           },
         },
         {
-          label: 'Paste',
+          label: t('general.paste'),
           icon: <MdContentPaste size={12} />,
           onClick: () => {
             state.el.focus();
@@ -70,7 +72,7 @@ export function useInputContextMenu() {
         { type: 'separator' as const },
         {
           icon: <MdSelectAll size={12} />,
-          label: 'Select All',
+          label: t('general.selectAll'),
           onClick: () => {
             state.el.focus();
             state.el.select();