@acorex/modules 21.0.0-beta.3 → 21.0.0-beta.4

package/fesm2022/acorex-modules-locale-management.mjs

@@ -19,7 +19,6 @@ import { AXLocaleService, AX_LOCALE_PROFILE_PROVIDERS } from '@acorex/core/local
 import { AXTranslationService } from '@acorex/core/translation';
 import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
 import { AXPCommonMenuKeys, AXPWidgetsList } from '@acorex/modules/common';
-import { AXFormatService } from '@acorex/core/format';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/widget-core';
 import { AXDataSource } from '@acorex/cdk/common';
 
@@ -519,19 +518,18 @@ class AXMRegionalSettingProvider {
         this.injector = injector;
         this.regionalService = this.injector.get(AXMLocaleManagementService);
         this.translateService = this.injector.get(AXTranslationService);
-        this.formatService = this.injector.get(AXFormatService);
     }
     async provide(context) {
-        const trans = async (key) => await this.translateService.translateAsync(`@locale-management:settings.settings.regional.${key}`);
+        const i18n = (key) => `@locale-management:settings.settings.regional.${key}`;
         const profiles = await this.regionalService.getLocaleProfiles();
         const defaultProfile = profiles.find((p) => p.code === 'en-US');
         context
-            .addGroup('regional-settings', await trans('title'), await trans('description'), 'fa-light fa-earth-americas')
+            .addGroup('regional-settings', i18n('nav-title'), i18n('description'), 'fa-light fa-earth-americas', i18n('title'))
             // Date & Time Section
-            .addSection('date-time', await trans('datetime.title'), await trans('datetime.description'))
+            .addSection('date-time', i18n('datetime.title'), i18n('datetime.description'))
             .addSetting({
             key: AXPRegionalSetting.TimeZone,
-            title: await trans('datetime.timezone.title'),
+            title: i18n('datetime.timezone.title'),
             scope: 'T',
             isInherited: true,
             defaultValue: await this.regionalService.getBrowserTimeZoneCode(),
@@ -543,14 +541,14 @@ class AXMRegionalSettingProvider {
                     dataSource: 'timezones',
                 },
             },
-            description: await trans('datetime.timezone.description'),
+            description: i18n('datetime.timezone.description'),
         })
             .endSection()
             // Region Section
-            .addSection('region', await trans('region.title'), await trans('region.description'))
+            .addSection('region', i18n('region.title'), i18n('region.description'))
             .addSetting({
             key: AXPRegionalSetting.LocaleProfile,
-            title: await trans('region.format.title'),
+            title: i18n('region.format.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: defaultProfile.code,
@@ -562,11 +560,11 @@ class AXMRegionalSettingProvider {
                     dataSource: profiles,
                 },
             },
-            description: await trans('region.format.description'),
+            description: i18n('region.format.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.Language,
-            title: await trans('region.language.title'),
+            title: i18n('region.language.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: await this.translateService.getDefaultLang(),
@@ -584,11 +582,11 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('region.language.description'),
+            description: i18n('region.language.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.Calendar,
-            title: await trans('region.calendar.title'),
+            title: i18n('region.calendar.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: defaultProfile.calendar.system,
@@ -600,11 +598,11 @@ class AXMRegionalSettingProvider {
                     textField: 'text',
                     dataSource: [
                         {
-                            text: await trans('region.calendar.options.gregorian'),
+                            text: i18n('region.calendar.options.gregorian'),
                             value: 'gregorian',
                         },
                         {
-                            text: await trans('region.calendar.options.hijri'),
+                            text: i18n('region.calendar.options.hijri'),
                             value: 'solar-hijri',
                         },
                     ],
@@ -618,11 +616,11 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('region.calendar.description'),
+            description: i18n('region.calendar.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.FirstDayOfWeek,
-            title: await trans('region.firstday.title'),
+            title: i18n('region.firstday.title'),
             scope: 'T',
             isInherited: false,
             defaultValue: defaultProfile.calendar.week.startsOn,
@@ -634,15 +632,15 @@ class AXMRegionalSettingProvider {
                     textField: 'text',
                     dataSource: [
                         {
-                            text: await trans('region.firstday.options.saturday'),
+                            text: i18n('region.firstday.options.saturday'),
                             value: 6,
                         },
                         {
-                            text: await trans('region.firstday.options.sunday'),
+                            text: i18n('region.firstday.options.sunday'),
                             value: 0,
                         },
                         {
-                            text: await trans('region.firstday.options.monday'),
+                            text: i18n('region.firstday.options.monday'),
                             value: 1,
                         },
                     ],
@@ -656,11 +654,11 @@ class AXMRegionalSettingProvider {
                     ],
                 },
             },
-            description: await trans('region.firstday.description'),
+            description: i18n('region.firstday.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.WeekendDays,
-            title: await trans('region.workdays.title'),
+            title: i18n('region.workdays.title'),
             scope: 'T',
             isInherited: false,
             defaultValue: defaultProfile.calendar.week.weekends,
@@ -671,13 +669,13 @@ class AXMRegionalSettingProvider {
                     valueField: 'value',
                     textField: 'text',
                     dataSource: [
-                        { text: await trans('region.workdays.options.monday'), value: 1 },
-                        { text: await trans('region.workdays.options.tuesday'), value: 2 },
-                        { text: await trans('region.workdays.options.wednesday'), value: 3 },
-                        { text: await trans('region.workdays.options.thursday'), value: 4 },
-                        { text: await trans('region.workdays.options.friday'), value: 5 },
-                        { text: await trans('region.workdays.options.saturday'), value: 6 },
-                        { text: await trans('region.workdays.options.sunday'), value: 0 },
+                        { text: i18n('region.workdays.options.monday'), value: 1 },
+                        { text: i18n('region.workdays.options.tuesday'), value: 2 },
+                        { text: i18n('region.workdays.options.wednesday'), value: 3 },
+                        { text: i18n('region.workdays.options.thursday'), value: 4 },
+                        { text: i18n('region.workdays.options.friday'), value: 5 },
+                        { text: i18n('region.workdays.options.saturday'), value: 6 },
+                        { text: i18n('region.workdays.options.sunday'), value: 0 },
                     ],
                 },
                 triggers: [
@@ -689,11 +687,11 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('region.workdays.description'),
+            description: i18n('region.workdays.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.MultiLanguageSupport,
-            title: await trans('region.multilanguage-support.title'),
+            title: i18n('region.multilanguage-support.title'),
             scope: 'T',
             isInherited: true,
             defaultValue: false,
@@ -703,11 +701,11 @@ class AXMRegionalSettingProvider {
                     label: null,
                 },
             },
-            description: await trans('region.multilanguage-support.description'),
+            description: i18n('region.multilanguage-support.description'),
         })
             // .addSetting({
             //   key: AXPRegionalSetting.ShortDate,
-            //   title: await trans('region.shortdate.title'),
+            //   title: i18n('region.shortdate.title'),
             //   scope: 'U',
             //   isInherited: true,
             //   defaultValue: defaultProfile.formats.date.medium,
@@ -733,11 +731,11 @@ class AXMRegionalSettingProvider {
             //       },
             //     ],
             //   },
-            //   description: await trans('region.shortdate.description'),
+            //   description: i18n('region.shortdate.description'),
             // })
             // .addSetting({
             //   key: AXPRegionalSetting.LongDate,
-            //   title: await trans('region.longdate.title'),
+            //   title: i18n('region.longdate.title'),
             //   scope: 'U',
             //   isInherited: true,
             //   defaultValue: defaultProfile.formats.date.long,
@@ -763,11 +761,11 @@ class AXMRegionalSettingProvider {
             //       },
             //     ],
             //   },
-            //   description: await trans('region.longdate.description'),
+            //   description: i18n('region.longdate.description'),
             // })
             // .addSetting({
             //   key: AXPRegionalSetting.ShortTime,
-            //   title: await trans('region.shorttime.title'),
+            //   title: i18n('region.shorttime.title'),
             //   scope: 'U',
             //   isInherited: true,
             //   defaultValue: defaultProfile.formats.time.short,
@@ -793,11 +791,11 @@ class AXMRegionalSettingProvider {
             //       },
             //     ],
             //   },
-            //   description: await trans('region.shorttime.description'),
+            //   description: i18n('region.shorttime.description'),
             // })
             // .addSetting({
             //   key: AXPRegionalSetting.LongTime,
-            //   title: await trans('region.longtime.title'),
+            //   title: i18n('region.longtime.title'),
             //   scope: 'U',
             //   isInherited: true,
             //   defaultValue: defaultProfile.formats.time.long,
@@ -823,14 +821,14 @@ class AXMRegionalSettingProvider {
             //       },
             //     ],
             //   },
-            //   description: await trans('region.longtime.description'),
+            //   description: i18n('region.longtime.description'),
             // })
             .endSection()
             // Unit Settings Section
-            .addSection('units', await trans('units.title'), await trans('units.description'))
+            .addSection('units', i18n('units.title'), i18n('units.description'))
             .addSetting({
             key: AXPRegionalSetting.TemperatureUnits,
-            title: await trans('units.temperature.title'),
+            title: i18n('units.temperature.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: defaultProfile.units.temperature,
@@ -840,10 +838,10 @@ class AXMRegionalSettingProvider {
                 options: {
                     valueField: 'value',
                     textField: 'text',
-                    dataSource: await Promise.all(profiles.map(async (c) => ({
-                        text: await trans(`units.temperature.options.${c.units.temperature}`),
+                    dataSource: profiles.map((c) => ({
+                        text: i18n(`units.temperature.options.${c.units.temperature}`),
                         value: c.units.temperature,
-                    }))),
+                    })),
                 },
                 triggers: [
                     {
@@ -854,11 +852,11 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('units.temperature.description'),
+            description: i18n('units.temperature.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.DistanceUnits,
-            title: await trans('units.distance.title'),
+            title: i18n('units.distance.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: defaultProfile.units.distance,
@@ -868,10 +866,10 @@ class AXMRegionalSettingProvider {
                 options: {
                     valueField: 'value',
                     textField: 'text',
-                    dataSource: await Promise.all(profiles.map(async (c) => ({
-                        text: await trans(`units.distance.options.${c.units.distance}`),
+                    dataSource: profiles.map((c) => ({
+                        text: i18n(`units.distance.options.${c.units.distance}`),
                         value: c.units.distance,
-                    }))),
+                    })),
                 },
                 triggers: [
                     {
@@ -882,11 +880,11 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('units.distance.description'),
+            description: i18n('units.distance.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.WeightUnits,
-            title: await trans('units.weight.title'),
+            title: i18n('units.weight.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: defaultProfile.units.weight,
@@ -896,10 +894,10 @@ class AXMRegionalSettingProvider {
                 options: {
                     valueField: 'value',
                     textField: 'text',
-                    dataSource: await Promise.all(profiles.map(async (c) => ({
-                        text: await trans(`units.weight.options.${c.units.weight}`),
+                    dataSource: profiles.map((c) => ({
+                        text: i18n(`units.weight.options.${c.units.weight}`),
                         value: c.units.weight,
-                    }))),
+                    })),
                 },
                 triggers: [
                     {
@@ -910,11 +908,11 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('units.weight.description'),
+            description: i18n('units.weight.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.VolumeUnits,
-            title: await trans('units.volume.title'),
+            title: i18n('units.volume.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: defaultProfile.units.volume,
@@ -925,8 +923,8 @@ class AXMRegionalSettingProvider {
                     valueField: 'value',
                     textField: 'text',
                     dataSource: [
-                        { text: await trans('units.volume.options.liters'), value: 'liters' },
-                        { text: await trans('units.volume.options.gallons'), value: 'gallons' },
+                        { text: i18n('units.volume.options.liters'), value: 'liters' },
+                        { text: i18n('units.volume.options.gallons'), value: 'gallons' },
                     ],
                 },
                 triggers: [
@@ -938,11 +936,11 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('units.volume.description'),
+            description: i18n('units.volume.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.SpeedUnits,
-            title: await trans('units.speed.title'),
+            title: i18n('units.speed.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: defaultProfile.units.speed,
@@ -952,10 +950,10 @@ class AXMRegionalSettingProvider {
                 options: {
                     valueField: 'value',
                     textField: 'text',
-                    dataSource: await Promise.all(profiles.map(async (c) => ({
-                        text: await trans(`units.speed.options.${c.units.speed}`),
+                    dataSource: profiles.map((c) => ({
+                        text: i18n(`units.speed.options.${c.units.speed}`),
                         value: c.units.speed,
-                    }))),
+                    })),
                 },
                 triggers: [
                     {
@@ -966,11 +964,11 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('units.speed.description'),
+            description: i18n('units.speed.description'),
         })
             .addSetting({
             key: AXPRegionalSetting.AreaUnits,
-            title: await trans('units.area.title'),
+            title: i18n('units.area.title'),
             scope: 'U',
             isInherited: true,
             defaultValue: defaultProfile.units.area,
@@ -980,10 +978,10 @@ class AXMRegionalSettingProvider {
                 options: {
                     valueField: 'value',
                     textField: 'text',
-                    dataSource: await Promise.all(profiles.map(async (c) => ({
-                        text: await trans(`units.area.options.${c.units.area}`),
+                    dataSource: profiles.map((c) => ({
+                        text: i18n(`units.area.options.${c.units.area}`),
                         value: c.units.area,
-                    }))),
+                    })),
                 },
                 triggers: [
                     {
@@ -994,7 +992,7 @@ class AXMRegionalSettingProvider {
                     },
                 ],
             },
-            description: await trans('units.area.description'),
+            description: i18n('units.area.description'),
         })
             .endSection()
             .endGroup();