Skip to content

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

refactor languages menu (#347)

Guy Ben-Aharonf00c9b9a0355
diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
index c26aa04a..d1d3e20f 100644
--- a/src/i18n/i18n.ts
+++ b/src/i18n/i18n.ts
@@ -1,13 +1,25 @@
import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';
+import type { LanguageMetadata } from './types';
import { en, enMetadata } from './locales/en';
-import { es } from './locales/es';
-import { fr } from './locales/fr';
-import { de } from './locales/de';
-import { hi } from './locales/hi';
-import { ja } from './locales/ja';
-import { pt_BR } from './locales/pt_BR';
-import { uk } from './locales/uk';
+import { es, esMetadata } from './locales/es';
+import { fr, frMetadata } from './locales/fr';
+import { de, deMetadata } from './locales/de';
+import { hi, hiMetadata } from './locales/hi';
+import { ja, jaMetadata } from './locales/ja';
+import { pt_BR, pt_BRMetadata } from './locales/pt_BR';
+import { uk, ukMetadata } from './locales/uk';
+
+export const languages: LanguageMetadata[] = [
+ enMetadata,
+ esMetadata,
+ frMetadata,
+ deMetadata,
+ hiMetadata,
+ jaMetadata,
+ pt_BRMetadata,
+ ukMetadata,
+];
const resources = {
en,
diff --git a/src/pages/editor-page/top-navbar/top-navbar.tsx b/src/pages/editor-page/top-navbar/top-navbar.tsx
index feaea165..d71fb1b9 100644
--- a/src/pages/editor-page/top-navbar/top-navbar.tsx
+++ b/src/pages/editor-page/top-navbar/top-navbar.tsx
@@ -30,17 +30,10 @@ 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';
-import { deMetadata } from '@/i18n/locales/de';
-import { jaMetadata } from '@/i18n/locales/ja';
import { useLocalConfig } from '@/hooks/use-local-config';
-import { frMetadata } from '@/i18n/locales/fr';
-import { hiMetadata } from '@/i18n/locales/hi';
import { DiagramName } from './diagram-name';
import { LastSaved } from './last-saved';
-import { pt_BRMetadata } from '@/i18n/locales/pt_BR';
-import { ukMetadata } from '@/i18n/locales/uk';
+import { languages } from '@/i18n/i18n';
export interface TopNavbarProps {}
@@ -566,96 +559,22 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
{t('menu.view.change_language')}
</MenubarSubTrigger>
<MenubarSubContent>
- <MenubarCheckboxItem
- onClick={() =>
- changeLanguage(enMetadata.code)
- }
- checked={
- i18n.language ===
- enMetadata.code
- }
- >
- {enMetadata.name}
- </MenubarCheckboxItem>
- <MenubarCheckboxItem
- onClick={() =>
- changeLanguage(esMetadata.code)
- }
- checked={
- i18n.language ===
- esMetadata.code
- }
- >
- {esMetadata.name}
- </MenubarCheckboxItem>
- <MenubarCheckboxItem
- onClick={() =>
- changeLanguage(frMetadata.code)
- }
- checked={
- i18n.language ===
- frMetadata.code
- }
- >
- {frMetadata.name}
- </MenubarCheckboxItem>
- <MenubarCheckboxItem
- onClick={() =>
- changeLanguage(deMetadata.code)
- }
- checked={
- i18n.language ===
- deMetadata.code
- }
- >
- {deMetadata.name}
- </MenubarCheckboxItem>
- <MenubarCheckboxItem
- onClick={() =>
- changeLanguage(hiMetadata.code)
- }
- checked={
- i18n.language ===
- hiMetadata.code
- }
- >
- {hiMetadata.name}
- </MenubarCheckboxItem>
- <MenubarCheckboxItem
- onClick={() =>
- changeLanguage(jaMetadata.code)
- }
- checked={
- i18n.language ===
- jaMetadata.code
- }
- >
- {jaMetadata.name}
- </MenubarCheckboxItem>
- <MenubarCheckboxItem
- onClick={() =>
- changeLanguage(
- pt_BRMetadata.code
- )
- }
- checked={
- i18n.language ===
- pt_BRMetadata.code
- }
- >
- {pt_BRMetadata.name}
- </MenubarCheckboxItem>
- <MenubarCheckboxItem
- onClick={() =>
- changeLanguage(ukMetadata.code)
- }
- checked={
- i18n.language ===
- ukMetadata.code
- }
- >
- {ukMetadata.name}
- </MenubarCheckboxItem>
+ {languages.map((language) => (
+ <MenubarCheckboxItem
+ key={language.code}
+ onClick={() =>
+ changeLanguage(
+ language.code
+ )
+ }
+ checked={
+ i18n.language ===
+ language.code
+ }
+ >
+ {language.name}
+ </MenubarCheckboxItem>
+ ))}
</MenubarSubContent>
</MenubarSub>
</MenubarContent>