@stevenkellner/team-conduct-api 1.0.22 → 1.0.24

package/lib/test/localization.de.test.js

@@ -1,77 +1,40 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@assertive-ts/core");
-const localizationEN = __importStar(require("../src/locales/en.json"));
-const localizationDE = __importStar(require("../src/locales/de.json"));
+const en_1 = require("../src/locales/en");
+const de_1 = require("../src/locales/de");
 const types_1 = require("../src/types");
 const localization_utils_1 = require("./localization-utils");
 describe('Localization for de', () => {
-    const testedKeys = new localization_utils_1.TestedKeys((0, localization_utils_1.localizationWithoutDefault)(localizationDE));
     before(() => {
-        types_1.Localization.shared.setLocale('de');
-    });
-    after('all values should be tested', () => {
-        testedKeys.checkAllTested();
+        types_1.Localization.locale = 'de';
     });
     it('should have the same keys as en', () => {
-        (0, localization_utils_1.hasSameKeys)((0, localization_utils_1.localizationWithoutDefault)(localizationDE), (0, localization_utils_1.localizationWithoutDefault)(localizationEN));
+        (0, localization_utils_1.hasSameKeys)(de_1.localizationDE, en_1.localizationEN);
     });
     describe('notification.fine should be tested', () => {
         it('notification.fine.new should be tested', () => {
-            testedKeys.testArgs(key => key.notification.fine.new.title, ['fine-reason'], 'fine-reason');
-            testedKeys.testArgs(key => key.notification.fine.new.body, ['10,50 €'], 'Du hast eine neue Strafe von 10,50 €. Bitte so schnell wie möglich zahlen.');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.new.title.value({ reason: 'fine-reason' })).toBeEqual('fine-reason');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.new.body.value({ amount: '10,50 €' })).toBeEqual('Du hast eine neue Strafe von 10,50 €. Bitte so schnell wie möglich zahlen.');
         });
         it('notification.fine.reminder should be tested', () => {
-            testedKeys.test(key => key.notification.fine.reminder.title, 'Du hast noch offene Strafen');
-            testedKeys.testArgs(key => key.notification.fine.reminder.body, ['10,50 €'], 'Bei dir sind noch 10,50 € offen. Bitte so schnell wie möglich zahlen.');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.reminder.title.value()).toBeEqual('Du hast noch offene Strafen');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.reminder.body.value({ amount: '10,50 €' })).toBeEqual('Bei dir sind noch 10,50 € offen. Bitte so schnell wie möglich zahlen.');
         });
         it('notification.fine.stateChange should be tested', () => {
-            testedKeys.test(key => key.notification.fine.stateChange.title, 'Eine deiner Strafen hat sich geändert');
-            testedKeys.testArgs(key => key.notification.fine.stateChange.bodyPayed, ['10,50 €', 'fine-reason'], 'Du hast eine Strafe von 10,50 € bezahlt (fine-reason).');
-            testedKeys.testArgs(key => key.notification.fine.stateChange.bodyUnpayed, ['10,50 €', 'fine-reason'], '10,50 €, fine-reason ist noch offen.');
-            testedKeys.testArgs(key => key.notification.fine.stateChange.bodyDeleted, ['10,50 €', 'fine-reason'], '10,50 €, fine-reason wurde gelöscht.');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.stateChange.title.value()).toBeEqual('Eine deiner Strafen hat sich geändert');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.stateChange.bodyPayed.value({ amount: '10,50 €', reason: 'fine-reason' })).toBeEqual('Du hast eine Strafe von 10,50 € bezahlt (fine-reason).');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.stateChange.bodyUnpayed.value({ amount: '10,50 €', reason: 'fine-reason' })).toBeEqual('fine-reason, 10,50 € ist noch offen.');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.stateChange.bodyDeleted.value({ amount: '10,50 €', reason: 'fine-reason' })).toBeEqual('fine-reason, 10,50 € wurde gelöscht.');
         });
     });
     describe('fineAmount should be tested', () => {
         it('fineAmount.item.type.crateOfBeer should be tested', () => {
-            testedKeys.test(key => key.fineAmount.item.type.crateOfBeer, 'Kasten Bier');
-            testedKeys.testN(key => key.fineAmount.item.type.crateOfBeer, 1, 'Ein Kasten Bier');
-            testedKeys.testN(key => key.fineAmount.item.type.crateOfBeer, 4, '4 Kästen Bier');
-            testedKeys.testN(key => key.fineAmount.item.type.crateOfBeerWithoutCount, 1, 'Kasten Bier');
-            testedKeys.testN(key => key.fineAmount.item.type.crateOfBeerWithoutCount, 4, 'Kästen Bier');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.name.value()).toBeEqual('Kasten Bier');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.withCount.value(1)).toBeEqual('Ein Kasten Bier');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.withCount.value(4)).toBeEqual('4 Kästen Bier');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.withoutCount.value(1)).toBeEqual('Kasten Bier');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.withoutCount.value(4)).toBeEqual('Kästen Bier');
         });
         it('fineAmount.item.type.crateOfBeer should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineAmount.Item.Type.formatted('crateOfBeer')).toBeEqual('Kasten Bier');
@@ -83,11 +46,11 @@ describe('Localization for de', () => {
     });
     describe('fineTemplateRepetition should be tested', () => {
         it('fineTemplateRepetition.item.minute should be tested', () => {
-            testedKeys.test(key => key.fineTemplateRepetition.item.minute, 'Minute');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.minute, 1, '1 Minute');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.minute, 4, '4 Minuten');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.minuteWithoutCount, 1, 'Minute');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.minuteWithoutCount, 4, 'Minuten');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.name.value()).toBeEqual('Minute');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.withCount.value(1)).toBeEqual('1 Minute');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.withCount.value(4)).toBeEqual('4 Minuten');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.withoutCount.value(1)).toBeEqual('Minute');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.withoutCount.value(4)).toBeEqual('Minuten');
         });
         it('fineTemplateRepetition.item.minute should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineTemplateRepetition.Item.formatted('minute')).toBeEqual('Minute');
@@ -97,11 +60,11 @@ describe('Localization for de', () => {
             (0, core_1.expect)(new types_1.FineTemplateRepetition('minute', null).formattedWithoutCount(4)).toBeEqual('Minuten');
         });
         it('fineTemplateRepetition.item.day should be tested', () => {
-            testedKeys.test(key => key.fineTemplateRepetition.item.day, 'Tag');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.day, 1, '1 Tag');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.day, 4, '4 Tage');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.dayWithoutCount, 1, 'Tag');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.dayWithoutCount, 4, 'Tage');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.name.value()).toBeEqual('Tag');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.withCount.value(1)).toBeEqual('1 Tag');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.withCount.value(4)).toBeEqual('4 Tage');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.withoutCount.value(1)).toBeEqual('Tag');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.withoutCount.value(4)).toBeEqual('Tage');
         });
         it('fineTemplateRepetition.item.day should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineTemplateRepetition.Item.formatted('day')).toBeEqual('Tag');
@@ -111,11 +74,11 @@ describe('Localization for de', () => {
             (0, core_1.expect)(new types_1.FineTemplateRepetition('day', null).formattedWithoutCount(4)).toBeEqual('Tage');
         });
         it('fineTemplateRepetition.item.item should be tested', () => {
-            testedKeys.test(key => key.fineTemplateRepetition.item.item, 'Teil');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.item, 1, '1 Teil');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.item, 4, '4 Teile');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.itemWithoutCount, 1, 'Teil');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.itemWithoutCount, 4, 'Teile');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.name.value()).toBeEqual('Teil');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.withCount.value(1)).toBeEqual('1 Teil');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.withCount.value(4)).toBeEqual('4 Teile');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.withoutCount.value(1)).toBeEqual('Teil');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.withoutCount.value(4)).toBeEqual('Teile');
         });
         it('fineTemplateRepetition.item.item should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineTemplateRepetition.Item.formatted('item')).toBeEqual('Teil');
@@ -125,11 +88,11 @@ describe('Localization for de', () => {
             (0, core_1.expect)(new types_1.FineTemplateRepetition('item', null).formattedWithoutCount(4)).toBeEqual('Teile');
         });
         it('fineTemplateRepetition.item.count should be tested', () => {
-            testedKeys.test(key => key.fineTemplateRepetition.item.count, 'Anzahl');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.count, 1, '1 mal');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.count, 4, '4 mal');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.countWithoutCount, 1, 'mal');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.countWithoutCount, 4, 'mal');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.name.value()).toBeEqual('Anzahl');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.withCount.value(1)).toBeEqual('1 mal');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.withCount.value(4)).toBeEqual('4 mal');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.withoutCount.value(1)).toBeEqual('mal');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.withoutCount.value(4)).toBeEqual('mal');
         });
         it('fineTemplateRepetition.item.count should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineTemplateRepetition.Item.formatted('count')).toBeEqual('Anzahl');
@@ -141,13 +104,13 @@ describe('Localization for de', () => {
     });
     describe('payedState should be tested', () => {
         it('payedState.payed should be tested', () => {
-            testedKeys.test(key => key.payedState.payed, 'Bezahlt');
+            (0, core_1.expect)(types_1.Localization.shared.payedState.payed.value()).toBeEqual('Bezahlt');
         });
         it('payedState.payed should be formatted correctly', () => {
             (0, core_1.expect)(types_1.PayedState.formatted('payed')).toBeEqual('Bezahlt');
         });
         it('payedState.notPayed should be tested', () => {
-            testedKeys.test(key => key.payedState.notPayed, 'Offen');
+            (0, core_1.expect)(types_1.Localization.shared.payedState.notPayed.value()).toBeEqual('Offen');
         });
         it('payedState.notPayed should be formatted correctly', () => {
             (0, core_1.expect)(types_1.PayedState.formatted('notPayed')).toBeEqual('Offen');
@@ -155,25 +118,25 @@ describe('Localization for de', () => {
     });
     describe('userRole should be tested', () => {
         it('userRole.personManager should be tested', () => {
-            testedKeys.test(key => key.userRole.personManager, 'Personenmanager');
+            (0, core_1.expect)(types_1.Localization.shared.userRole.personManager.value()).toBeEqual('Personenmanager');
         });
         it('userRole.personManager should be formatted correctly', () => {
             (0, core_1.expect)(types_1.UserRole.formatted('person-manager')).toBeEqual('Personenmanager');
         });
         it('userRole.fineTemplateManager should be tested', () => {
-            testedKeys.test(key => key.userRole.fineTemplateManager, 'Strafvorlagenmanager');
+            (0, core_1.expect)(types_1.Localization.shared.userRole.fineTemplateManager.value()).toBeEqual('Strafvorlagenmanager');
         });
         it('userRole.fineTemplateManager should be formatted correctly', () => {
             (0, core_1.expect)(types_1.UserRole.formatted('fineTemplate-manager')).toBeEqual('Strafvorlagenmanager');
         });
         it('userRole.fineManager should be tested', () => {
-            testedKeys.test(key => key.userRole.fineManager, 'Strafenmanager');
+            (0, core_1.expect)(types_1.Localization.shared.userRole.fineManager.value()).toBeEqual('Strafenmanager');
         });
         it('userRole.fineManager should be formatted correctly', () => {
             (0, core_1.expect)(types_1.UserRole.formatted('fine-manager')).toBeEqual('Strafenmanager');
         });
         it('userRole.teamManager should be tested', () => {
-            testedKeys.test(key => key.userRole.teamManager, 'Teammanager');
+            (0, core_1.expect)(types_1.Localization.shared.userRole.teamManager.value()).toBeEqual('Teammanager');
         });
         it('userRole.teamManager should be formatted correctly', () => {
             (0, core_1.expect)(types_1.UserRole.formatted('team-manager')).toBeEqual('Teammanager');

package/lib/test/localization.en.test.js

@@ -1,73 +1,34 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@assertive-ts/core");
-const localizationEN = __importStar(require("../src/locales/en.json"));
 const types_1 = require("../src/types");
-const localization_utils_1 = require("./localization-utils");
 describe('Localization for en', () => {
-    const testedKeys = new localization_utils_1.TestedKeys((0, localization_utils_1.localizationWithoutDefault)(localizationEN));
     before(() => {
-        types_1.Localization.shared.setLocale('en');
-    });
-    after('all values should be tested', () => {
-        testedKeys.checkAllTested();
+        types_1.Localization.locale = 'en';
     });
     describe('notification.fine should be tested', () => {
         it('notification.fine.new should be tested', () => {
-            testedKeys.testArgs(key => key.notification.fine.new.title, ['fine-reason'], 'fine-reason');
-            testedKeys.testArgs(key => key.notification.fine.new.body, ['10.50 €'], 'You have a new fine of 10.50 €. Please pay it as soon as possible.');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.new.title.value({ reason: 'fine-reason' })).toBeEqual('fine-reason');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.new.body.value({ amount: '10.50 €' })).toBeEqual('You have a new fine of 10.50 €. Please pay it as soon as possible.');
         });
         it('notification.fine.reminder should be tested', () => {
-            testedKeys.test(key => key.notification.fine.reminder.title, 'You still have outstanding fines');
-            testedKeys.testArgs(key => key.notification.fine.reminder.body, ['10.50 €'], 'You still have 10.50 € outstanding. Please pay as soon as possible.');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.reminder.title.value()).toBeEqual('You still have outstanding fines');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.reminder.body.value({ amount: '10.50 €' })).toBeEqual('You still have 10.50 € outstanding. Please pay as soon as possible.');
         });
         it('notification.fine.stateChange should be tested', () => {
-            testedKeys.test(key => key.notification.fine.stateChange.title, 'One of your fines has changed');
-            testedKeys.testArgs(key => key.notification.fine.stateChange.bodyPayed, ['10.50 €', 'fine-reason'], 'You have paid a fine of 10.50 € (fine-reason).');
-            testedKeys.testArgs(key => key.notification.fine.stateChange.bodyUnpayed, ['10.50 €', 'fine-reason'], '10.50 €, fine-reason is still outstanding.');
-            testedKeys.testArgs(key => key.notification.fine.stateChange.bodyDeleted, ['10.50 €', 'fine-reason'], '10.50 €, fine-reason has been deleted.');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.stateChange.title.value()).toBeEqual('One of your fines has changed');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.stateChange.bodyPayed.value({ amount: '10.50 €', reason: 'fine-reason' })).toBeEqual('You have paid a fine of 10.50 € (fine-reason).');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.stateChange.bodyUnpayed.value({ amount: '10.50 €', reason: 'fine-reason' })).toBeEqual('fine-reason, 10.50 € is still outstanding.');
+            (0, core_1.expect)(types_1.Localization.shared.notification.fine.stateChange.bodyDeleted.value({ amount: '10.50 €', reason: 'fine-reason' })).toBeEqual('fine-reason, 10.50 € has been deleted.');
         });
     });
     describe('fineAmount should be tested', () => {
         it('fineAmount.item.type.crateOfBeer should be tested', () => {
-            testedKeys.test(key => key.fineAmount.item.type.crateOfBeer, 'Crate of Beer');
-            testedKeys.testN(key => key.fineAmount.item.type.crateOfBeer, 1, 'a crate of beer');
-            testedKeys.testN(key => key.fineAmount.item.type.crateOfBeer, 4, '4 crates of beer');
-            testedKeys.testN(key => key.fineAmount.item.type.crateOfBeerWithoutCount, 1, 'Crate of Beer');
-            testedKeys.testN(key => key.fineAmount.item.type.crateOfBeerWithoutCount, 4, 'Crates of Beer');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.name.value()).toBeEqual('Crate of Beer');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.withCount.value(1)).toBeEqual('a crate of beer');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.withCount.value(4)).toBeEqual('4 crates of beer');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.withoutCount.value(1)).toBeEqual('Crate of Beer');
+            (0, core_1.expect)(types_1.Localization.shared.fineAmount.item.type.crateOfBeer.withoutCount.value(4)).toBeEqual('Crates of Beer');
         });
         it('fineAmount.item.type.crateOfBeer should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineAmount.Item.Type.formatted('crateOfBeer')).toBeEqual('Crate of Beer');
@@ -79,53 +40,53 @@ describe('Localization for en', () => {
     });
     describe('fineTemplateRepetition should be tested', () => {
         it('fineTemplateRepetition.item.minute should be tested', () => {
-            testedKeys.test(key => key.fineTemplateRepetition.item.minute, 'Minute');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.minute, 1, '1 minute');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.minute, 4, '4 minutes');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.minuteWithoutCount, 1, 'Minute');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.minuteWithoutCount, 4, 'Minutes');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.name.value()).toBeEqual('Minute');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.withCount.value(1)).toBeEqual('1 minute');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.withCount.value(4)).toBeEqual('4 minutes');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.withoutCount.value(1)).toBeEqual('minute');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.minute.withoutCount.value(4)).toBeEqual('minutes');
         });
         it('fineTemplateRepetition.item.minute should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineTemplateRepetition.Item.formatted('minute')).toBeEqual('Minute');
             (0, core_1.expect)(new types_1.FineTemplateRepetition('minute', null).formatted(1)).toBeEqual('1 minute');
             (0, core_1.expect)(new types_1.FineTemplateRepetition('minute', null).formatted(4)).toBeEqual('4 minutes');
-            (0, core_1.expect)(new types_1.FineTemplateRepetition('minute', null).formattedWithoutCount(1)).toBeEqual('Minute');
-            (0, core_1.expect)(new types_1.FineTemplateRepetition('minute', null).formattedWithoutCount(4)).toBeEqual('Minutes');
+            (0, core_1.expect)(new types_1.FineTemplateRepetition('minute', null).formattedWithoutCount(1)).toBeEqual('minute');
+            (0, core_1.expect)(new types_1.FineTemplateRepetition('minute', null).formattedWithoutCount(4)).toBeEqual('minutes');
         });
         it('fineTemplateRepetition.item.day should be tested', () => {
-            testedKeys.test(key => key.fineTemplateRepetition.item.day, 'Day');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.day, 1, '1 day');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.day, 4, '4 days');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.dayWithoutCount, 1, 'Day');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.dayWithoutCount, 4, 'Days');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.name.value()).toBeEqual('Day');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.withCount.value(1)).toBeEqual('1 day');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.withCount.value(4)).toBeEqual('4 days');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.withoutCount.value(1)).toBeEqual('day');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.day.withoutCount.value(4)).toBeEqual('days');
         });
         it('fineTemplateRepetition.item.day should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineTemplateRepetition.Item.formatted('day')).toBeEqual('Day');
             (0, core_1.expect)(new types_1.FineTemplateRepetition('day', null).formatted(1)).toBeEqual('1 day');
             (0, core_1.expect)(new types_1.FineTemplateRepetition('day', null).formatted(4)).toBeEqual('4 days');
-            (0, core_1.expect)(new types_1.FineTemplateRepetition('day', null).formattedWithoutCount(1)).toBeEqual('Day');
-            (0, core_1.expect)(new types_1.FineTemplateRepetition('day', null).formattedWithoutCount(4)).toBeEqual('Days');
+            (0, core_1.expect)(new types_1.FineTemplateRepetition('day', null).formattedWithoutCount(1)).toBeEqual('day');
+            (0, core_1.expect)(new types_1.FineTemplateRepetition('day', null).formattedWithoutCount(4)).toBeEqual('days');
         });
         it('fineTemplateRepetition.item.item should be tested', () => {
-            testedKeys.test(key => key.fineTemplateRepetition.item.item, 'Item');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.item, 1, '1 item');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.item, 4, '4 items');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.itemWithoutCount, 1, 'Item');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.itemWithoutCount, 4, 'Items');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.name.value()).toBeEqual('Item');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.withCount.value(1)).toBeEqual('1 item');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.withCount.value(4)).toBeEqual('4 items');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.withoutCount.value(1)).toBeEqual('item');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.item.withoutCount.value(4)).toBeEqual('items');
         });
         it('fineTemplateRepetition.item.item should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineTemplateRepetition.Item.formatted('item')).toBeEqual('Item');
             (0, core_1.expect)(new types_1.FineTemplateRepetition('item', null).formatted(1)).toBeEqual('1 item');
             (0, core_1.expect)(new types_1.FineTemplateRepetition('item', null).formatted(4)).toBeEqual('4 items');
-            (0, core_1.expect)(new types_1.FineTemplateRepetition('item', null).formattedWithoutCount(1)).toBeEqual('Item');
-            (0, core_1.expect)(new types_1.FineTemplateRepetition('item', null).formattedWithoutCount(4)).toBeEqual('Items');
+            (0, core_1.expect)(new types_1.FineTemplateRepetition('item', null).formattedWithoutCount(1)).toBeEqual('item');
+            (0, core_1.expect)(new types_1.FineTemplateRepetition('item', null).formattedWithoutCount(4)).toBeEqual('items');
         });
         it('fineTemplateRepetition.item.count should be tested', () => {
-            testedKeys.test(key => key.fineTemplateRepetition.item.count, 'Count');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.count, 1, '1 time');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.count, 4, '4 times');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.countWithoutCount, 1, 'time');
-            testedKeys.testN(key => key.fineTemplateRepetition.item.countWithoutCount, 4, 'times');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.name.value()).toBeEqual('Count');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.withCount.value(1)).toBeEqual('1 time');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.withCount.value(4)).toBeEqual('4 times');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.withoutCount.value(1)).toBeEqual('time');
+            (0, core_1.expect)(types_1.Localization.shared.fineTemplateRepetition.item.count.withoutCount.value(4)).toBeEqual('times');
         });
         it('fineTemplateRepetition.item.count should be formatted correctly', () => {
             (0, core_1.expect)(types_1.FineTemplateRepetition.Item.formatted('count')).toBeEqual('Count');
@@ -137,13 +98,13 @@ describe('Localization for en', () => {
     });
     describe('payedState should be tested', () => {
         it('payedState.payed should be tested', () => {
-            testedKeys.test(key => key.payedState.payed, 'Paid');
+            (0, core_1.expect)(types_1.Localization.shared.payedState.payed.value()).toBeEqual('Paid');
         });
         it('payedState.payed should be formatted correctly', () => {
             (0, core_1.expect)(types_1.PayedState.formatted('payed')).toBeEqual('Paid');
         });
         it('payedState.notPayed should be tested', () => {
-            testedKeys.test(key => key.payedState.notPayed, 'Outstanding');
+            (0, core_1.expect)(types_1.Localization.shared.payedState.notPayed.value()).toBeEqual('Outstanding');
         });
         it('payedState.notPayed should be formatted correctly', () => {
             (0, core_1.expect)(types_1.PayedState.formatted('notPayed')).toBeEqual('Outstanding');
@@ -151,25 +112,25 @@ describe('Localization for en', () => {
     });
     describe('userRole should be tested', () => {
         it('userRole.personManager should be tested', () => {
-            testedKeys.test(key => key.userRole.personManager, 'Person Manager');
+            (0, core_1.expect)(types_1.Localization.shared.userRole.personManager.value()).toBeEqual('Person Manager');
         });
         it('userRole.personManager should be formatted correctly', () => {
             (0, core_1.expect)(types_1.UserRole.formatted('person-manager')).toBeEqual('Person Manager');
         });
         it('userRole.fineTemplateManager should be tested', () => {
-            testedKeys.test(key => key.userRole.fineTemplateManager, 'Fine Template Manager');
+            (0, core_1.expect)(types_1.Localization.shared.userRole.fineTemplateManager.value()).toBeEqual('Fine Template Manager');
         });
         it('userRole.fineTemplateManager should be formatted correctly', () => {
             (0, core_1.expect)(types_1.UserRole.formatted('fineTemplate-manager')).toBeEqual('Fine Template Manager');
         });
         it('userRole.fineManager should be tested', () => {
-            testedKeys.test(key => key.userRole.fineManager, 'Fine Manager');
+            (0, core_1.expect)(types_1.Localization.shared.userRole.fineManager.value()).toBeEqual('Fine Manager');
         });
         it('userRole.fineManager should be formatted correctly', () => {
             (0, core_1.expect)(types_1.UserRole.formatted('fine-manager')).toBeEqual('Fine Manager');
         });
         it('userRole.teamManager should be tested', () => {
-            testedKeys.test(key => key.userRole.teamManager, 'Team Manager');
+            (0, core_1.expect)(types_1.Localization.shared.userRole.teamManager.value()).toBeEqual('Team Manager');
         });
         it('userRole.teamManager should be formatted correctly', () => {
             (0, core_1.expect)(types_1.UserRole.formatted('team-manager')).toBeEqual('Team Manager');

package/lib/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../index.ts","../src/Firestore.ts","../src/FirestoreScheme.ts","../src/checkAuthentication.ts","../src/firebaseFunctionsContext.ts","../src/index.ts","../src/pushNotification.ts","../src/firebase/FirebaseConfiguration.ts","../src/firebase/Messaging.ts","../src/firebase/index.ts","../src/functions/index.ts","../src/functions/fine/add.ts","../src/functions/fine/delete.ts","../src/functions/fine/update.ts","../src/functions/fineTemplate/add.ts","../src/functions/fineTemplate/delete.ts","../src/functions/fineTemplate/update.ts","../src/functions/invitation/invite.ts","../src/functions/invitation/register.ts","../src/functions/invitation/withdraw.ts","../src/functions/notification/register.ts","../src/functions/notification/subscribe.ts","../src/functions/paypalMe/edit.ts","../src/functions/person/add.ts","../src/functions/person/delete.ts","../src/functions/person/update.ts","../src/functions/team/new.ts","../src/functions/user/login.ts","../src/functions/user/roleEdit.ts","../src/types/Configuration.ts","../src/types/Fine.ts","../src/types/FineAmount.ts","../src/types/FineTemplate.ts","../src/types/FineTemplateRepetition.ts","../src/types/Invitation.ts","../src/types/Localization.ts","../src/types/MoneyAmount.ts","../src/types/NotificationProperties.ts","../src/types/PayedState.ts","../src/types/Person.ts","../src/types/PersonPrivateProperties.ts","../src/types/PersonSignInProperties.ts","../src/types/Team.ts","../src/types/User.ts","../src/types/UserRole.ts","../src/types/index.ts","../test/localization-utils.ts","../test/localization.de.test.ts","../test/localization.en.test.ts"],"version":"5.8.3"}
+{"root":["../index.ts","../src/Firestore.ts","../src/FirestoreScheme.ts","../src/checkAuthentication.ts","../src/firebaseFunctionsContext.ts","../src/index.ts","../src/pushNotification.ts","../src/firebase/FirebaseConfiguration.ts","../src/firebase/Messaging.ts","../src/firebase/index.ts","../src/functions/index.ts","../src/functions/fine/add.ts","../src/functions/fine/delete.ts","../src/functions/fine/update.ts","../src/functions/fineTemplate/add.ts","../src/functions/fineTemplate/delete.ts","../src/functions/fineTemplate/update.ts","../src/functions/invitation/invite.ts","../src/functions/invitation/register.ts","../src/functions/invitation/withdraw.ts","../src/functions/notification/register.ts","../src/functions/notification/subscribe.ts","../src/functions/paypalMe/edit.ts","../src/functions/person/add.ts","../src/functions/person/delete.ts","../src/functions/person/update.ts","../src/functions/team/new.ts","../src/functions/user/login.ts","../src/functions/user/roleEdit.ts","../src/locales/de.ts","../src/locales/en.ts","../src/types/Configuration.ts","../src/types/Fine.ts","../src/types/FineAmount.ts","../src/types/FineTemplate.ts","../src/types/FineTemplateRepetition.ts","../src/types/Invitation.ts","../src/types/Localization.ts","../src/types/MoneyAmount.ts","../src/types/NotificationProperties.ts","../src/types/PayedState.ts","../src/types/Person.ts","../src/types/PersonPrivateProperties.ts","../src/types/PersonSignInProperties.ts","../src/types/Pluralization.ts","../src/types/Team.ts","../src/types/User.ts","../src/types/UserRole.ts","../src/types/index.ts","../test/localization-utils.ts","../test/localization.de.test.ts","../test/localization.en.test.ts"],"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stevenkellner/team-conduct-api",
-    "version": "1.0.22",
+    "version": "1.0.24",
     "description": "Firebase API for Team Conduct",
     "license": "MIT",
     "author": "Steven Kellner",
@@ -18,24 +18,22 @@
         "lint": "eslint --ext .js,.ts .",
         "lint:fix": "eslint --ext .js,.ts . --fix",
         "test": "mocha",
-        "upgrade": "ncu --upgrade --install always",
+        "upgrade": "npm cache clean --force && ncu --upgrade --install always",
         "release": "npm run rebuild && npm run lint && npm version patch && git push --follow-tags"
     },
     "dependencies": {
-        "@stevenkellner/firebase-function": "^1.4.137",
-        "@stevenkellner/typescript-common-functionality": "^1.0.49",
-        "i18n": "^0.15.1"
+        "@stevenkellner/firebase-function": "^1.4.138",
+        "@stevenkellner/typescript-common-functionality": "^1.0.54"
     },
     "devDependencies": {
         "@assertive-ts/core": "^2.1.0",
         "@eslint/compat": "^1.2.9",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "^9.26.0",
-        "@types/i18n": "^0.13.12",
+        "@eslint/js": "^9.27.0",
         "@types/mocha": "^10.0.10",
-        "@typescript-eslint/eslint-plugin": "^8.32.0",
-        "@typescript-eslint/parser": "^8.32.0",
-        "eslint": "^9.26.0",
+        "@typescript-eslint/eslint-plugin": "^8.32.1",
+        "@typescript-eslint/parser": "^8.32.1",
+        "eslint": "^9.27.0",
         "eslint-config-google": "^0.14.0",
         "eslint-plugin-import": "^2.31.0",
         "mocha": "^11.3.0",

package/src/functions/fine/add.ts

@@ -45,10 +45,14 @@ export class FineAddFunction extends FirebaseFunction<FineAddFunction.Parameters
         person.fineIds.push(parameters.fine.id);
         await Firestore.shared.person(parameters.teamId, parameters.personId).set(person);
 
-        Localization.shared.setLocale(parameters.configuration.locale);
+        Localization.locale = parameters.configuration.locale;
         await pushNotification(parameters.teamId, parameters.personId, 'new-fine', {
-            title: Localization.shared.get(key => key.notification.fine.new.title, parameters.fine.reason),
-            body: Localization.shared.get(key => key.notification.fine.new.body, parameters.fine.amount.formatted(parameters.configuration))
+            title: Localization.shared.notification.fine.new.title.value({
+                reason: parameters.fine.reason
+            }),
+            body: Localization.shared.notification.fine.new.body.value({
+                amount: parameters.fine.amount.formatted(parameters.configuration)
+            })
         });
     }
 }

package/src/functions/fine/delete.ts

@@ -44,10 +44,12 @@ export class FineDeleteFunction extends FirebaseFunction<FineDeleteFunction.Para
         person.fineIds = person.fineIds.filter(id => id.guidString !== parameters.id.guidString);
         await Firestore.shared.person(parameters.teamId, parameters.personId).set(person);
 
-        Localization.shared.setLocale(parameters.configuration.locale);
+        Localization.locale = parameters.configuration.locale;
         await pushNotification(parameters.teamId, parameters.personId, 'fine-state-change', {
-            title: Localization.shared.get(key => key.notification.fine.stateChange.title),
-            body: Localization.shared.get(key => key.notification.fine.stateChange.bodyDeleted, fineSnapshot.data.reason, FineAmount.builder.build(fineSnapshot.data.amount).formatted(parameters.configuration))
+            title: Localization.shared.notification.fine.stateChange.title.value(),
+            body: Localization.shared.notification.fine.stateChange.bodyDeleted.value({
+                amount: FineAmount.builder.build(fineSnapshot.data.amount).formatted(parameters.configuration)
+            })
         });
     }
 }

package/src/functions/fine/update.ts

@@ -1,7 +1,7 @@
 import { Configuration } from '../../types/Configuration';
 import { FirebaseFunction, FunctionsError } from '@stevenkellner/firebase-function';
 import { pushNotification } from '../../pushNotification';
-import { Fine, Localization, Person, Team } from '../../types';
+import { Fine, Localization, Person, Team, ValueLocalization } from '../../types';
 import { Flattable, ObjectTypeBuilder, ValueTypeBuilder } from '@stevenkellner/typescript-common-functionality';
 import { checkAuthentication } from '../../checkAuthentication';
 import { Firestore } from '../../Firestore';
@@ -37,16 +37,19 @@ export class FineUpdateFunction extends FirebaseFunction<FineUpdateFunction.Para
 
         await Firestore.shared.fine(parameters.teamId, parameters.fine.id).set(parameters.fine);
 
-        Localization.shared.setLocale(parameters.configuration.locale);
+        Localization.locale = parameters.configuration.locale;
         if (parameters.fine.payedState !== fineSnapshot.data.payedState) {
-            let body: string;
+            let bodyLocalization: ValueLocalization;
             if (parameters.fine.payedState === 'payed')
-                body = Localization.shared.get(key => key.notification.fine.stateChange.bodyPayed, parameters.fine.amount.formatted(parameters.configuration), parameters.fine.reason);
+                bodyLocalization = Localization.shared.notification.fine.stateChange.bodyPayed;
             else
-                body = Localization.shared.get(key => key.notification.fine.stateChange.bodyUnpayed, parameters.fine.reason, parameters.fine.amount.formatted(parameters.configuration));
+                bodyLocalization = Localization.shared.notification.fine.stateChange.bodyUnpayed;
             await pushNotification(parameters.teamId, parameters.personId, 'fine-state-change', {
-                title: Localization.shared.get(key => key.notification.fine.stateChange.title),
-                body: body
+                title: Localization.shared.notification.fine.stateChange.title.value(),
+                body: bodyLocalization.value({
+                    reason: parameters.fine.reason,
+                    amount: parameters.fine.amount.formatted(parameters.configuration)
+                })
             });
 
         }