bfg-common 1.3.595 → 1.3.597

package/composables/productNameLocal.ts

@@ -1,40 +1,48 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LanguageKey } from '~/lib/models/types'
-
-export function productNameLocal(
-  localization: UI_I_Localization
-): UI_I_Localization {
-  const config = useRuntimeConfig()
-
-  const productName =
-    config.public.LOCALIZATION_CODE === 'ru'
-      ? config.public.PRODUCT_NAME_RU
-      : config.public.PRODUCT_NAME_EN
-
-  return replaceProductNameRecursion(localization, productName)
-}
-
-const replaceProductNameRecursion = (
-  localization: UI_I_Localization,
-  productName: any
-): UI_I_Localization => {
-  for (const key of Object.keys(localization)) {
-    const item = localization[key as UI_T_LanguageKey]
-    // TODO move to config
-    const localizationKeys = [
-      'common',
-      'auth',
-      'home',
-      'tasks',
-      'layout',
-      'mainNavigation'
-    ]
-    if (localizationKeys.includes(key)) {
-      for (const key2 of Object.keys(item)) {
-        item[key2] = item[key2].replaceAll('{productName}', productName)
-      }
-    }
-  }
-
-  return localization
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LanguageKey } from '~/lib/models/types'
+
+export function productNameLocal(
+  localization: UI_I_Localization
+): UI_I_Localization {
+  const config = useRuntimeConfig()
+
+  const productName =
+    config.public.LOCALIZATION_CODE === 'ru'
+      ? config.public.PRODUCT_NAME_RU
+      : config.public.PRODUCT_NAME_EN
+
+  return replaceProductNameRecursion(localization, productName)
+}
+
+const replaceProductNameRecursion = (
+  localization: UI_I_Localization,
+  productName: any
+): UI_I_Localization => {
+  for (const key of Object.keys(localization)) {
+    const item = localization[key as UI_T_LanguageKey]
+    // TODO move to config
+    const localizationKeys = [
+      'common',
+      'auth',
+      'home',
+      'tasks',
+      'layout',
+      'mainNavigation',
+      'administration',
+      'inventoryConfigure',
+      'datastoreWizard',
+      'inventorySummary',
+      'contextMenu',
+      'networks',
+      'inventory',
+      'inventoryTabs',
+    ]
+    if (localizationKeys.includes(key)) {
+      for (const key2 of Object.keys(item)) {
+        item[key2] = item[key2].replaceAll('{productName}', productName)
+      }
+    }
+  }
+
+  return localization
+}

package/composables/useEnvLanguage.ts

@@ -3,9 +3,9 @@ export function useEnvLanguage(): string {
 
   let localizationCode = 'en_US'
   const langFromLocalStorage =
+    $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
     useLocalStorage('lang') ||
-    useLocalStorage('languageType') ||
-    $store.getters['main/getInterfaceLang'] // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
+    useLocalStorage('languageType')
 
   if (langFromLocalStorage) {
     if (

package/lib/models/interfaces.ts

@@ -20,6 +20,14 @@ export interface UI_I_Localization {
   tasks: UI_I_ArbitraryObject<string>
   layout: UI_I_ArbitraryObject<string>
   mainNavigation: UI_I_ArbitraryObject<string>
+  administration: UI_I_ArbitraryObject<string>
+  inventoryConfigure: UI_I_ArbitraryObject<string>
+  datastoreWizard: UI_I_ArbitraryObject<string>
+  inventorySummary: UI_I_ArbitraryObject<string>
+  contextMenu: UI_I_ArbitraryObject<string>
+  networks: UI_I_ArbitraryObject<string>
+  inventory: UI_I_ArbitraryObject<string>
+  inventoryTabs: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/lib/models/types.ts

@@ -1,29 +1,37 @@
-export type UI_T_Project = 'sphere' | 'procurator'
-
-export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
-export type UI_T_BinaryLower =
-  | 'kb'
-  | 'mb'
-  | 'gb'
-  | 'tb'
-  | 'pb'
-  | 'eb'
-  | 'zb'
-  | 'yb'
-
-export type UI_T_LangValue =
-  | 'en_US'
-  | 'ru_RU'
-  | 'hy_AM'
-  | 'zh_CHS'
-  | 'kk_KZ'
-  | 'be_BY'
-  | 'BROWSER'
-
-export type UI_T_LanguageKey =
-  | 'common'
-  | 'auth'
-  | 'home'
-  | 'tasks'
-  | 'layout'
-  | 'mainNavigation'
+export type UI_T_Project = 'sphere' | 'procurator'
+
+export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
+export type UI_T_BinaryLower =
+  | 'kb'
+  | 'mb'
+  | 'gb'
+  | 'tb'
+  | 'pb'
+  | 'eb'
+  | 'zb'
+  | 'yb'
+
+export type UI_T_LangValue =
+  | 'en_US'
+  | 'ru_RU'
+  | 'hy_AM'
+  | 'zh_CHS'
+  | 'kk_KZ'
+  | 'be_BY'
+  | 'BROWSER'
+
+export type UI_T_LanguageKey =
+  | 'common'
+  | 'auth'
+  | 'home'
+  | 'tasks'
+  | 'layout'
+  | 'mainNavigation'
+  | 'administration'
+  | 'inventoryConfigure'
+  | 'datastoreWizard'
+  | 'inventorySummary'
+  | 'contextMenu'
+  | 'networks'
+  | 'inventory'
+  | 'inventoryTabs'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.3.595",
+  "version": "1.3.597",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "^1.0.15",
-    "bfg-uikit": "1.0.88",
+    "bfg-uikit": "1.0.91",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }