Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

add types for languages

Guy Ben-Aharona0ffac759d95
diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
index ac1370ae..00871511 100644
--- a/src/i18n/i18n.ts
+++ b/src/i18n/i18n.ts
@@ -1,6 +1,6 @@
import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';
-import { en } from './locales/en';
+import { en, enMetadata } from './locales/en';
import { es } from './locales/es';
const resources = {
@@ -10,11 +10,11 @@ const resources = {
i18n.use(initReactI18next).init({
resources,
- lng: 'en',
+ lng: enMetadata.code,
interpolation: {
escapeValue: false,
},
- fallbackLng: 'en',
+ fallbackLng: enMetadata.code,
debug: false,
});
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index f8e87ee0..a3cea2d7 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -1,6 +1,6 @@
-import { ResourceLanguage } from 'i18next';
+import { LanguageMetadata } from '../types';
-export const en: ResourceLanguage = {
+export const en = {
translation: {
menu: {
file: {
@@ -24,7 +24,7 @@ export const en: ResourceLanguage = {
show_sidebar: 'Show Sidebar',
hide_sidebar: 'Hide Sidebar',
theme: 'Theme',
- change_language: 'Change Language',
+ change_language: 'Language',
},
help: {
help: 'Help',
@@ -202,3 +202,8 @@ export const en: ResourceLanguage = {
},
},
};
+
+export const enMetadata: LanguageMetadata = {
+ name: 'English',
+ code: 'en',
+};
diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
index a8dc8317..ca41e610 100644
--- a/src/i18n/locales/es.ts
+++ b/src/i18n/locales/es.ts
@@ -1,6 +1,6 @@
-import { ResourceLanguage } from 'i18next';
+import { LanguageTranslation } from '../types';
-export const es: ResourceLanguage = {
+export const es: LanguageTranslation = {
translation: {
menu: {
file: {
@@ -24,7 +24,7 @@ export const es: ResourceLanguage = {
show_sidebar: 'Mostrar Barra Lateral',
hide_sidebar: 'Ocultar Barra Lateral',
theme: 'Tema',
- change_language: 'Cambiar Idioma',
+ change_language: 'Idioma',
},
help: {
help: 'Ayuda',
@@ -203,3 +203,8 @@ export const es: ResourceLanguage = {
},
},
};
+
+export const esMetadata = {
+ name: 'Español',
+ code: 'es',
+};
diff --git a/src/i18n/types.ts b/src/i18n/types.ts
new file mode 100644
index 00000000..d3913b08
--- /dev/null
+++ b/src/i18n/types.ts
@@ -0,0 +1,8 @@
+import { en } from './locales/en';
+
+export type LanguageTranslation = typeof en;
+
+export type LanguageMetadata = {
+ name: string;
+ code: string;
+};
diff --git a/src/pages/editor-page/top-navbar/top-navbar.tsx b/src/pages/editor-page/top-navbar/top-navbar.tsx
index e57b2ab8..b44fdb25 100644
--- a/src/pages/editor-page/top-navbar/top-navbar.tsx
+++ b/src/pages/editor-page/top-navbar/top-navbar.tsx
@@ -43,6 +43,8 @@ import { useHistory } from '@/hooks/use-history';
import { useTranslation } from 'react-i18next';
import { useLayout } from '@/hooks/use-layout';
import { useTheme } from '@/hooks/use-theme';
+import { enMetadata } from '@/i18n/locales/en';
+import { esMetadata } from '@/i18n/locales/es';
export interface TopNavbarProps {}
@@ -546,14 +548,26 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
</MenubarSubTrigger>
<MenubarSubContent>
<MenubarCheckboxItem
- onClick={() => changeLanguage('en')}
+ onClick={() =>
+ changeLanguage(enMetadata.code)
+ }
+ checked={
+ i18n.language ===
+ enMetadata.code
+ }
>
- English
+ {enMetadata.name}
</MenubarCheckboxItem>
<MenubarCheckboxItem
- onClick={() => changeLanguage('es')}
+ onClick={() =>
+ changeLanguage(esMetadata.code)
+ }
+ checked={
+ i18n.language ===
+ esMetadata.code
+ }
>
- Español
+ {esMetadata.name}
</MenubarCheckboxItem>
</MenubarSubContent>
</MenubarSub>