@armoury/fivem-framework-client 1.0.49 → 1.0.54

package/dist/cjs/client/index.js

@@ -20,6 +20,7 @@ exports.bootstrap = bootstrap;
 require("reflect-metadata");
 const services_1 = require("./services");
 const fivem_framework_common_1 = require("@armoury/fivem-framework-common");
+const i18n_changer_1 = require("./services/i18n/i18n.changer");
 exports.CLIENT_PROVIDERS = [
     services_1.ClientActionPointsService,
     services_1.ClientBlipsService,
@@ -34,7 +35,8 @@ exports.CLIENT_PROVIDERS = [
     services_1.ClientWaypointsService,
 ];
 exports.CLIENT_EAGER_PROVIDERS = [
-    services_1.UI
+    services_1.UI,
+    i18n_changer_1.I18nChanger
 ];
 async function bootstrap(_class, options = {}) {
     return (0, fivem_framework_common_1.bootstrapWithProviders)(_class, exports.CLIENT_PROVIDERS, options, fivem_framework_common_1.DecorationType.CLIENT, (key, index) => Cfx.Client.GetResourceMetadata(Cfx.Client.GetCurrentResourceName(), key, index), (resourceName) => Cfx.exports[resourceName], exports.CLIENT_EAGER_PROVIDERS);

package/dist/cjs/client/services/i18n/i18n.changer.js

@@ -0,0 +1,32 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.I18nChanger = void 0;
+const fivem_framework_common_1 = require("@armoury/fivem-framework-common");
+const injection_js_1 = require("injection-js");
+const i18n_service_1 = require("./i18n.service");
+let I18nChanger = class I18nChanger {
+    _onLanguageChangedRequestedUnsafe(language) {
+        console.log(`Setting language to ${language}.`);
+        Cfx.Client.SetResourceKvp('armoury:language', language);
+        i18n_service_1.I18n.setLanguage(language);
+    }
+};
+exports.I18nChanger = I18nChanger;
+__decorate([
+    (0, fivem_framework_common_1.EventListener)({ eventName: 'armoury:unsafe:language:change:request', direction: fivem_framework_common_1.EVENT_DIRECTIONS.CLIENT_TO_CLIENT }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], I18nChanger.prototype, "_onLanguageChangedRequestedUnsafe", null);
+exports.I18nChanger = I18nChanger = __decorate([
+    (0, injection_js_1.Injectable)()
+], I18nChanger);

package/dist/cjs/client/services/i18n/i18n.service.js

@@ -16,7 +16,8 @@ const injection_js_1 = require("injection-js");
 let I18n = class I18n {
     static withOptions(options = {}) {
         var _a;
-        const language = (_a = options.defaultLanguage) !== null && _a !== void 0 ? _a : 'en-US';
+        const language = (_a = (Cfx.Client.GetResourceKvpString('armoury:language')
+            || options.defaultLanguage)) !== null && _a !== void 0 ? _a : 'en-US';
         return {
             provide: fivem_framework_common_1.APP_INITIALIZER,
             useValue: () => this.loadLanguage(language),
@@ -50,12 +51,10 @@ let I18n = class I18n {
                 console.warn(`Language not found: ${language}`);
             }
         }
-        console.log('translations are', translations);
         this.polyglot.locale(language);
         this.polyglot.replace(translations);
     }
     static translate(key, params = {}) {
-        console.log('translate() called! key:', key, 'params:', params);
         return this.polyglot.t(key, params);
     }
 };

package/dist/cjs/client/services/i18n/index.js

@@ -14,4 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./i18n.changer"), exports);
 __exportStar(require("./i18n.service"), exports);

package/dist/esm/client/index.js

@@ -2,6 +2,7 @@
 import 'reflect-metadata';
 import { ClientActionPointsService, ClientBlipsService, ClientCheckpointsService, ClientMarkersService, ClientPedsService, ClientSessionService, ClientTicksService, ClientUIService, ClientVehiclesService, ClientWaypointsService, ClientHudService, UI } from './services';
 import { bootstrapWithProviders, DecorationType } from '@armoury/fivem-framework-common';
+import { I18nChanger } from './services/i18n/i18n.changer';
 export const CLIENT_PROVIDERS = [
     ClientActionPointsService,
     ClientBlipsService,
@@ -16,7 +17,8 @@ export const CLIENT_PROVIDERS = [
     ClientWaypointsService,
 ];
 export const CLIENT_EAGER_PROVIDERS = [
-    UI
+    UI,
+    I18nChanger
 ];
 export async function bootstrap(_class, options = {}) {
     return bootstrapWithProviders(_class, CLIENT_PROVIDERS, options, DecorationType.CLIENT, (key, index) => Cfx.Client.GetResourceMetadata(Cfx.Client.GetCurrentResourceName(), key, index), (resourceName) => Cfx.exports[resourceName], CLIENT_EAGER_PROVIDERS);

package/dist/esm/client/services/i18n/i18n.changer.js

@@ -0,0 +1,29 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { EVENT_DIRECTIONS, EventListener } from '@armoury/fivem-framework-common';
+import { Injectable } from 'injection-js';
+import { I18n } from './i18n.service';
+let I18nChanger = class I18nChanger {
+    _onLanguageChangedRequestedUnsafe(language) {
+        console.log(`Setting language to ${language}.`);
+        Cfx.Client.SetResourceKvp('armoury:language', language);
+        I18n.setLanguage(language);
+    }
+};
+__decorate([
+    EventListener({ eventName: 'armoury:unsafe:language:change:request', direction: EVENT_DIRECTIONS.CLIENT_TO_CLIENT }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], I18nChanger.prototype, "_onLanguageChangedRequestedUnsafe", null);
+I18nChanger = __decorate([
+    Injectable()
+], I18nChanger);
+export { I18nChanger };

package/dist/esm/client/services/i18n/i18n.service.js

@@ -10,7 +10,8 @@ import { Injectable } from 'injection-js';
 let I18n = class I18n {
     static withOptions(options = {}) {
         var _a;
-        const language = (_a = options.defaultLanguage) !== null && _a !== void 0 ? _a : 'en-US';
+        const language = (_a = (Cfx.Client.GetResourceKvpString('armoury:language')
+            || options.defaultLanguage)) !== null && _a !== void 0 ? _a : 'en-US';
         return {
             provide: APP_INITIALIZER,
             useValue: () => this.loadLanguage(language),
@@ -44,12 +45,10 @@ let I18n = class I18n {
                 console.warn(`Language not found: ${language}`);
             }
         }
-        console.log('translations are', translations);
         this.polyglot.locale(language);
         this.polyglot.replace(translations);
     }
     static translate(key, params = {}) {
-        console.log('translate() called! key:', key, 'params:', params);
         return this.polyglot.t(key, params);
     }
 };

package/dist/esm/client/services/i18n/index.js

@@ -1 +1,2 @@
+export * from './i18n.changer';
 export * from './i18n.service';

package/dist/types/client/index.d.ts

@@ -3,8 +3,9 @@ import 'reflect-metadata';
 import { Provider } from 'injection-js';
 import { ClientActionPointsService, ClientBlipsService, ClientCheckpointsService, ClientMarkersService, ClientPedsService, ClientSessionService, ClientTicksService, ClientUIService, ClientVehiclesService, ClientWaypointsService, ClientHudService, UI } from './services';
 import { BootstrapOptions } from '@armoury/fivem-framework-common';
+import { I18nChanger } from './services/i18n/i18n.changer';
 export declare const CLIENT_PROVIDERS: (typeof ClientTicksService | typeof ClientActionPointsService | typeof ClientBlipsService | typeof ClientCheckpointsService | typeof ClientHudService | typeof ClientMarkersService | typeof ClientPedsService | typeof ClientSessionService | typeof ClientVehiclesService | typeof ClientUIService | typeof ClientWaypointsService)[];
-export declare const CLIENT_EAGER_PROVIDERS: (typeof UI)[];
+export declare const CLIENT_EAGER_PROVIDERS: (typeof UI | typeof I18nChanger)[];
 export declare function bootstrap<T extends {
     new (...args: any[]): any;
 } & Provider>(_class: T, options?: BootstrapOptions): Promise<InstanceType<T>>;

package/dist/types/client/services/i18n/i18n.changer.d.ts

@@ -0,0 +1,3 @@
+export declare class I18nChanger {
+    protected _onLanguageChangedRequestedUnsafe(language: string): void;
+}

package/dist/types/client/services/i18n/index.d.ts

@@ -1 +1,2 @@
+export * from './i18n.changer';
 export * from './i18n.service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armoury/fivem-framework-client",
-  "version": "1.0.49",
+  "version": "1.0.54",
   "description": "Client APIs for the Armoury FiveM framework",
   "main": "dist/cjs/client/index.js",
   "module": "dist/esm/client/index.js",
@@ -27,7 +27,7 @@
     "rxjs": "^7.8.1"
   },
   "peerDependencies": {
-    "@armoury/fivem-framework-common": "1.0.49",
+    "@armoury/fivem-framework-common": "1.0.54",
     "node-polyglot": "2.6.0"
   },
   "publishConfig": {