github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-23 15:18:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use 'language' instead of 'locale' in the app

Browse Source
This commit is contained in:
maartenvn
2020-10-10 00:43:00 +02:00
parent 6ee74e06e7
commit 07c33720c8
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/.storybook/mock-data/collections.json
View File

@@ -10482,9 +10482,9 @@
"group": null,
"length": "32"
},
"locale": {
"language": {
"collection": "directus_users",
"field": "locale",
"field": "language",
"datatype": "VARCHAR",
"unique": false,
"primary_key": false,

4
app/.storybook/mock-data/fields.json
View File

@@ -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",

2
app/src/hydrate.ts
View File

@@ -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?.()));

2
app/src/types/users.ts
View File

@@ -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;