From 07c33720c8367a3cefa47e096db90776e53803e6 Mon Sep 17 00:00:00 2001
From: maartenvn <maartenvn.eu@gmail.com>
Date: Sat, 10 Oct 2020 00:43:00 +0200
Subject: [PATCH] Use 'language' instead of 'locale' in the app

---
 app/.storybook/mock-data/collections.json | 4 ++--
 app/.storybook/mock-data/fields.json      | 4 ++--
 app/src/hydrate.ts                        | 2 +-
 app/src/types/users.ts                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/.storybook/mock-data/collections.json b/app/.storybook/mock-data/collections.json
index 9de015cc41..81f7acedd1 100644
--- a/app/.storybook/mock-data/collections.json
+++ b/app/.storybook/mock-data/collections.json
@@ -10482,9 +10482,9 @@
 					"group": null,
 					"length": "32"
 				},
-				"locale": {
+				"language": {
 					"collection": "directus_users",
-					"field": "locale",
+					"field": "language",
 					"datatype": "VARCHAR",
 					"unique": false,
 					"primary_key": false,
diff --git a/app/.storybook/mock-data/fields.json b/app/.storybook/mock-data/fields.json
index 66bdf085e3..b583a291f0 100644
--- a/app/.storybook/mock-data/fields.json
+++ b/app/.storybook/mock-data/fields.json
@@ -5639,7 +5639,7 @@
 		},
 		{
 			"collection": "directus_users",
-			"field": "locale",
+			"field": "language",
 			"datatype": "VARCHAR",
 			"unique": false,
 			"primary_key": false,
@@ -5666,7 +5666,7 @@
 			"validation": null,
 			"group": null,
 			"length": "8",
-			"name": "Locale"
+			"name": "Language"
 		},
 		{
 			"collection": "directus_users",
diff --git a/app/src/hydrate.ts b/app/src/hydrate.ts
index 78a01553ab..76909ba75a 100644
--- a/app/src/hydrate.ts
+++ b/app/src/hydrate.ts
@@ -57,7 +57,7 @@ export async function hydrate(stores = useStores()) {
 		 */
 		await userStore.hydrate();
 
-		setLanguage((userStore.state.currentUser?.locale as Language) || 'en-US');
+		setLanguage((userStore.state.currentUser?.language as Language) || 'en-US');
 
 		await Promise.all(stores.filter(({ id }) => id !== 'userStore').map((store) => store.hydrate?.()));
 
diff --git a/app/src/types/users.ts b/app/src/types/users.ts
index 1daa636327..02bd687c72 100644
--- a/app/src/types/users.ts
+++ b/app/src/types/users.ts
@@ -47,7 +47,7 @@ export type User = {
 	role: Role;
 	password_reset_token: string | null;
 	timezone: string;
-	locale: string;
+	language: string;
 	locale_options: null;
 	avatar: null | Avatar;
 	company: string | null;