Translations respect language of user profile

assets/js/src/core/app/store/middleware/rtkQueryErrorLogger.ts

@@ -31,9 +31,9 @@ const initialState: UserInformation = {
   isAdmin: false,
   classes: [],
   docTypes: [],
+  language: 'en',
   activePerspective: 0,
   perspectives: [],
-  language: 'en',
   dateTimeLocale: '',
   welcomeScreen: false,
   memorizeTabs: false,

assets/js/src/core/modules/app/app-loader.tsx

@@ -63,7 +63,7 @@ export const AppLoader = (props: IAppLoaderProps): React.JSX.Element => {
           dispatch(setUser(data))
         }
       })
-      .catch(() => {})
+      .catch(() => { })
 
     return await userFetcher
   }
@@ -79,7 +79,7 @@ export const AppLoader = (props: IAppLoaderProps): React.JSX.Element => {
           dispatch(setSettings(data))
         }
       })
-      .catch(() => {})
+      .catch(() => { })
 
     return await settingsFetcher
   }
@@ -91,10 +91,12 @@ export const AppLoader = (props: IAppLoaderProps): React.JSX.Element => {
   }
 
   async function loadTranslations (): Promise<any> {
-    await translations({ translation: { locale: 'en', keys: [] } })
+    const user = selectCurrentUser(store.getState())
+    await translations({ translation: { locale: user.language, keys: [], useFallback: true } })
       .unwrap()
       .then(response => {
-        i18n.addResourceBundle('en', 'translation', response.keys ?? [], true, true)
+        i18n.addResourceBundle(user.language, 'translation', response.keys ?? [], true, true)
+        void i18n.changeLanguage(user.language)
       })
       .catch(() => {
         trackError(new GeneralError('Error loading translations'))
@@ -106,19 +108,19 @@ export const AppLoader = (props: IAppLoaderProps): React.JSX.Element => {
 
     if (isSuccessInitSetting === true) {
       Promise.allSettled([
-        initActivePerspective()
+        initActivePerspective(),
+        loadTranslations()
       ]).then(() => {
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 
   useEffect(() => {
     Promise.all([
-      initLoadUser(),
-      loadTranslations()
+      initLoadUser()
     ]).then(() => {
       setIsLoading(false)
-    }).catch(() => {})
+    }).catch(() => { })
   }, [])
 
   useEffect(() => {

assets/js/src/core/modules/auth/user/user-slice.ts

@@ -24,9 +24,9 @@ const initialState: UserInformation = {
   isAdmin: false,
   classes: [],
   docTypes: [],
+  language: 'en',
   activePerspective: 0,
   perspectives: [],
-  language: 'en',
   dateTimeLocale: '',
   welcomeScreen: false,
   memorizeTabs: false,

assets/js/src/core/modules/document/document-api-slice.gen.ts

@@ -6,6 +6,14 @@ const injectedRtkApi = api
     })
     .injectEndpoints({
         endpoints: (build) => ({
+            documentAdd: build.mutation<DocumentAddApiResponse, DocumentAddApiArg>({
+                query: (queryArg) => ({
+                    url: `/pimcore-studio/api/documents/add/${queryArg.parentId}`,
+                    method: "POST",
+                    body: queryArg.documentAddParameters,
+                }),
+                invalidatesTags: ["Documents"],
+            }),
             documentsListAvailableSites: build.query<
                 DocumentsListAvailableSitesApiResponse,
                 DocumentsListAvailableSitesApiArg
@@ -48,6 +56,15 @@ const injectedRtkApi = api
         overrideExisting: false,
     });
 export { injectedRtkApi as api };
+export type DocumentAddApiResponse = /** status 200 ID of added document */ {
+    /** ID of created document element */
+    id: number;
+};
+export type DocumentAddApiArg = {
+    /** ParentId of the document */
+    parentId: number;
+    documentAddParameters: DocumentAdd;
+};
 export type DocumentsListAvailableSitesApiResponse = /** status 200 List of available sites */ {
     items: Site[];
 };
@@ -96,6 +113,34 @@ export type DocumentGetTreeApiArg = {
     /** Include all descendants in the result. */
     pathIncludeDescendants?: boolean;
 };
+export type Error = {
+    /** Message */
+    message: string;
+};
+export type DevError = {
+    /** Message */
+    message: string;
+    /** Details */
+    details: string;
+};
+export type DocumentAdd = {
+    /** Key */
+    key: string;
+    /** Type */
+    type: string;
+    /** Title */
+    title: any;
+    /** Navigation name */
+    navigationName: any;
+    /** Document type ID */
+    docTypeId: any;
+    /** Id of the base document for new translation */
+    translationsSourceId: any;
+    /** Document language when adding a translation */
+    language: any;
+    /** Id of the base document for content */
+    inheritanceSourceId: any;
+};
 export type Site = {
     /** AdditionalAttributes */
     additionalAttributes?: {
@@ -112,16 +157,6 @@ export type Site = {
     /** Root path */
     rootPath?: any;
 };
-export type Error = {
-    /** Message */
-    message: string;
-};
-export type DevError = {
-    /** Message */
-    message: string;
-    /** Details */
-    details: string;
-};
 export type ElementIcon = {
     /** Icon type */
     type: "name" | "path";
@@ -299,6 +334,7 @@ export type Snippet = Document & {
     staticGeneratorLifetime?: number;
 };
 export const {
+    useDocumentAddMutation,
     useDocumentsListAvailableSitesQuery,
     useDocumentGetByIdQuery,
     useDocumentPageStreamPreviewQuery,

public/build/80f3ca92-2343-436f-ad38-339f72f9962c/entrypoints.json

@@ -0,0 +1,9 @@
+{
+  "entrypoints": {
+    "vendor": {
+      "js": [
+        "/bundles/pimcorestudioui/build/80f3ca92-2343-436f-ad38-339f72f9962c/vendor.js"
+      ]
+    }
+  }
+}

public/build/80f3ca92-2343-436f-ad38-339f72f9962c/manifest.json

@@ -0,0 +1,3 @@
+{
+  "bundles/pimcorestudioui/build/80f3ca92-2343-436f-ad38-339f72f9962c/vendor.js": "/bundles/pimcorestudioui/build/80f3ca92-2343-436f-ad38-339f72f9962c/vendor.js"
+}

public/build/b5815405-f353-4d8e-aa34-1ae5768b226e/entrypoints.json

@@ -0,0 +1,12 @@
+{
+  "entrypoints": {
+    "core-dll": {
+      "css": [
+        "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/core-dll.css"
+      ],
+      "js": [
+        "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/core-dll.js"
+      ]
+    }
+  }
+}

public/build/b5815405-f353-4d8e-aa34-1ae5768b226e/manifest.json

@@ -0,0 +1,14 @@
+{
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/core-dll.css": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/core-dll.css",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/core-dll.js": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/core-dll.js",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/105.js": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/105.js",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/fonts/Lato-Light.ttf": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/fonts/Lato-Light.c7400fca.ttf",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/fonts/Lato-Regular.ttf": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/fonts/Lato-Regular.9d883d54.ttf",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/fonts/Lato-Bold.ttf": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/fonts/Lato-Bold.636be8de.ttf",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/images/spritesheet.svg": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/images/spritesheet.a4e0eb7a.svg",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/images/spritesheet-2x.png": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/images/spritesheet-2x.7ea3a6d4.png",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/images/spritesheet.png": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/images/spritesheet.ef32ea2b.png",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/images/marker-icon.png": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/images/marker-icon.2b3e1faf.png",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/images/layers-2x.png": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/images/layers-2x.8f2c4d11.png",
+  "bundles/pimcorestudioui/b5815405-f353-4d8e-aa34-1ae5768b226e/images/layers.png": "/bundles/pimcorestudioui/build/b5815405-f353-4d8e-aa34-1ae5768b226e/images/layers.416d9136.png"
+}

public/build/ea89a32b-d610-41f2-986e-caa6893c8340/entrypoints.json

@@ -0,0 +1,9 @@
+{
+  "entrypoints": {
+    "main": {
+      "js": [
+        "/bundles/pimcorestudioui/build/ea89a32b-d610-41f2-986e-caa6893c8340/main.js"
+      ]
+    }
+  }
+}

public/build/ea89a32b-d610-41f2-986e-caa6893c8340/manifest.json

@@ -0,0 +1,3 @@
+{
+  "bundles/pimcorestudioui/build/ea89a32b-d610-41f2-986e-caa6893c8340/main.js": "/bundles/pimcorestudioui/build/ea89a32b-d610-41f2-986e-caa6893c8340/main.js"
+}