From 0f963d0383a72a8081fed05361e32c75f9fe1d42 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Mon, 7 Nov 2022 13:56:22 +0100
Subject: [PATCH] improvements

---
 public/locales/{de => de-DE}/translation.json |  2 +-
 public/locales/{en => en-US}/translation.json |  0
 src/components/LanguageButton.tsx             |  4 +++-
 src/init-i18n.ts                              |  3 +--
 src/routes/AuthenticatedRoute.tsx             |  6 ++++--
 src/utils/app-url-links.ts                    | 13 +++++--------
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename public/locales/{de => de-DE}/translation.json (99%)
 rename public/locales/{en => en-US}/translation.json (100%)

diff --git a/public/locales/de/translation.json b/public/locales/de-DE/translation.json
similarity index 99%
rename from public/locales/de/translation.json
rename to public/locales/de-DE/translation.json
index ef0ec41..8757632 100644
--- a/public/locales/de/translation.json
+++ b/public/locales/de-DE/translation.json
@@ -254,7 +254,7 @@
 
     "components": {
         "NavigationButton": {
-            "overview": "Überblibkc",
+            "overview": "Überblick",
             "aliases": "Aliase",
             "reports": "Berichte",
             "settings": "Einstellungen"
diff --git a/public/locales/en/translation.json b/public/locales/en-US/translation.json
similarity index 100%
rename from public/locales/en/translation.json
rename to public/locales/en-US/translation.json
diff --git a/src/components/LanguageButton.tsx b/src/components/LanguageButton.tsx
index 2501be8..d723f40 100644
--- a/src/components/LanguageButton.tsx
+++ b/src/components/LanguageButton.tsx
@@ -22,9 +22,11 @@ export default function LanguageButton(): ReactElement {
 	const {isLocked, showDialog} = useContext(LockNavigationContext)
 	const {i18n} = useTranslation()
 
+	console.log(i18n.resolvedLanguage, SORTED_ENTRIES)
+
 	return (
 		<Select
-			value={i18n.language}
+			value={i18n.resolvedLanguage}
 			fullWidth
 			size="small"
 			renderValue={value => LANGUAGE_NAME_MAP[value as Language]}
diff --git a/src/init-i18n.ts b/src/init-i18n.ts
index 5bf053a..b32ea17 100644
--- a/src/init-i18n.ts
+++ b/src/init-i18n.ts
@@ -16,8 +16,7 @@ i18n.use(HttpApi)
 	.use(initReactI18next)
 	.init({
 		debug: isDev,
-		fallbackLng: "en",
-		load: "languageOnly",
+		fallbackLng: "en-US",
 		backend: {
 			loadPath: "/locales/{{lng}}/{{ns}}.json",
 		},
diff --git a/src/routes/AuthenticatedRoute.tsx b/src/routes/AuthenticatedRoute.tsx
index 8da78d5..c92d7e7 100644
--- a/src/routes/AuthenticatedRoute.tsx
+++ b/src/routes/AuthenticatedRoute.tsx
@@ -46,7 +46,7 @@ export default function AuthenticatedRoute(): ReactElement {
 						justifyContent="space-between"
 						alignItems="center"
 					>
-						<Grid item xs={12} sm={3} md={2}>
+						<Grid item xs={12} sm={3}>
 							<Box bgcolor={theme.palette.background.paper}>
 								<List component="nav">
 									{sections.map(key => (
@@ -57,7 +57,7 @@ export default function AuthenticatedRoute(): ReactElement {
 								</List>
 							</Box>
 						</Grid>
-						<Grid item xs={12} sm={9} md={10} height="100%">
+						<Grid item xs={12} sm={9} height="100%">
 							<Grid
 								container
 								direction="column"
@@ -77,6 +77,8 @@ export default function AuthenticatedRoute(): ReactElement {
 										container
 										spacing={2}
 										justifyContent="center"
+										alignItems="center"
+										direction="row"
 										marginBottom={2}
 									>
 										<Grid item>
diff --git a/src/utils/app-url-links.ts b/src/utils/app-url-links.ts
index 72ecada..5201bf7 100644
--- a/src/utils/app-url-links.ts
+++ b/src/utils/app-url-links.ts
@@ -14,25 +14,22 @@ const APP_LINK_MAP: Record<string, OSUrls> = {
 		android: createUrl("mail.google.com", "com.google.android.gm"),
 	},
 	"gmx.net": {
-		android: createUrl("gmx.net", "de.gmx.mobile.android.mail"),
+		android: createUrl("gmx.net", "de-DE.gmx.mobile.android.mail"),
 	},
 	"web.de": {
-		android: createUrl("web.de", "de.web.mobile.android.mail"),
+		android: createUrl("web.de", "de-DE.web.mobile.android.mail"),
 	},
 	"t-online.de": {
-		android: createUrl("t-online.de", "de.telekom.mail"),
+		android: createUrl("t-online.de", "de-DE.telekom.mail"),
 	},
 	"magenta.de": {
-		android: createUrl("t-online.de", "de.telekom.mail"),
+		android: createUrl("t-online.de", "de-DE.telekom.mail"),
 	},
 	"outlook.com": {
 		android: createUrl("outlook.com", "com.microsoft.office.outlook"),
 	},
 	"yahoo.com": {
-		android: createUrl(
-			"mail.yahoo.com",
-			"com.yahoo.mobile.client.android.mai",
-		),
+		android: createUrl("mail.yahoo.com", "com.yahoo.mobile.client.android.mai"),
 	},
 }