@duetds/components 4.30.1 → 4.31.0

package/lib/collection/components/duet-number-input/duet-number-input.js

@@ -28,37 +28,52 @@ export class DuetNumberInput {
      */
     this.unit = getLocale(this.language).money;
     /**
-     * Format of message used to announce current amount when switching between amounts.
-     * The string {current} is replaced with the current amount.
+     * Defaults for accessibleLive
      * @default {fi: "{current} euroa valittuna", en: "{current} euros selected", sv: "{current} valda euro"}
      */
-    this.accessibleLive = getLocaleString({
+    this.accessibleLiveDefaults = {
       fi: "{current} euroa valittuna",
       en: "{current} euros selected",
       sv: "{current} euro valt",
-    }, this.language);
+    };
+    /**
+     * Format of message used to announce current amount when switching between amounts.
+     * The string {current} is replaced with the current amount.
+     * @default {fi: "{current} euroa valittuna", en: "{current} euros selected", sv: "{current} valda euro"}
+     */
+    this.accessibleLive = getLocaleString(this.accessibleLiveDefaults, this.language);
     /**
      * Disables the aria-live messaging used internally in this component. This could be useful when you want to use custom aria-live messages instead.
      */
     this.accessibleLiveEnabled = true;
     /**
-     * Accessible label for the add button that is read for screen reader users.
+     * Defaults for accessibleAdd
      * @default {fi: "Lisää summaan", en: "Add to the amount", sv: "Lägg till beloppet"}
      */
-    this.accessibleAdd = getLocaleString({
+    this.accessibleAddDefaults = {
       fi: "Lisää summaan",
       en: "Add to the amount",
       sv: "Lägg till beloppet",
-    }, this.language);
+    };
     /**
-     * Accessible label for the subtract button that is read for screen reader users.
+     * Accessible label for the add button that is read for screen reader users.
+     * @default {fi: "Lisää summaan", en: "Add to the amount", sv: "Lägg till beloppet"}
+     */
+    this.accessibleAdd = getLocaleString(this.accessibleAddDefaults, this.language);
+    /**
+     * Defaults for accessibleSubtract
      * @default {fi: "Vähennä summasta", en: "Subtract from the amount", sv: "Dra från beloppet"}
      */
-    this.accessibleSubtract = getLocaleString({
+    this.accessibleSubtractDefaults = {
       fi: "Vähennä summasta",
       en: "Subtract from the amount",
       sv: "Dra från beloppet",
-    }, this.language);
+    };
+    /**
+     * Accessible label for the subtract button that is read for screen reader users.
+     * @default {fi: "Vähennä summasta", en: "Subtract from the amount", sv: "Dra från beloppet"}
+     */
+    this.accessibleSubtract = getLocaleString(this.accessibleSubtractDefaults, this.language);
     /**
      * Theme of the input.
      */
@@ -76,14 +91,19 @@ export class DuetNumberInput {
      */
     this.min = 0;
     /**
-     * Label for the number input.
+     * Defaults for Label
      * @default  {fi: "Etiketti", en: "Label", sv: "Märka"}
      */
-    this.label = getLocaleString({
+    this.labelDefaults = {
       fi: "Nimilappu",
       en: "Label",
       sv: "Etikett",
-    }, this.language);
+    };
+    /**
+     * Label for the number input.
+     * @default  {fi: "Etiketti", en: "Label", sv: "Märka"}
+     */
+    this.label = getLocaleString(this.labelDefaults, this.language);
     /**
      * Visually hide the label, but still show it to screen readers.
      */
@@ -471,6 +491,32 @@ export class DuetNumberInput {
       "attribute": "accessible-described-by",
       "reflect": false
     },
+    "accessibleLiveDefaults": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"{current} euroa valittuna\", en: \"{current} euros selected\", sv: \"{current} valda euro\"}",
+            "name": "default"
+          }],
+        "text": "Defaults for accessibleLive"
+      },
+      "attribute": "accessible-live-default",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"{current} euroa valittuna\",\n    en: \"{current} euros selected\",\n    sv: \"{current} euro valt\",\n  }"
+    },
     "accessibleLive": {
       "type": "string",
       "mutable": false,
@@ -490,7 +536,7 @@ export class DuetNumberInput {
       },
       "attribute": "accessible-live",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"{current} euroa valittuna\",\n      en: \"{current} euros selected\",\n      sv: \"{current} euro valt\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.accessibleLiveDefaults, this.language)"
     },
     "accessibleLiveEnabled": {
       "type": "boolean",
@@ -510,6 +556,32 @@ export class DuetNumberInput {
       "reflect": false,
       "defaultValue": "true"
     },
+    "accessibleAddDefaults": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"Lis\u00E4\u00E4 summaan\", en: \"Add to the amount\", sv: \"L\u00E4gg till beloppet\"}",
+            "name": "default"
+          }],
+        "text": "Defaults for accessibleAdd"
+      },
+      "attribute": "accessible-add-default",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"Lis\u00E4\u00E4 summaan\",\n    en: \"Add to the amount\",\n    sv: \"L\u00E4gg till beloppet\",\n  }"
+    },
     "accessibleAdd": {
       "type": "string",
       "mutable": false,
@@ -529,7 +601,33 @@ export class DuetNumberInput {
       },
       "attribute": "accessible-add",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"Lis\u00E4\u00E4 summaan\",\n      en: \"Add to the amount\",\n      sv: \"L\u00E4gg till beloppet\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.accessibleAddDefaults, this.language)"
+    },
+    "accessibleSubtractDefaults": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"V\u00E4henn\u00E4 summasta\", en: \"Subtract from the amount\", sv: \"Dra fr\u00E5n beloppet\"}",
+            "name": "default"
+          }],
+        "text": "Defaults for accessibleSubtract"
+      },
+      "attribute": "accessible-subtract-defaults",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"V\u00E4henn\u00E4 summasta\",\n    en: \"Subtract from the amount\",\n    sv: \"Dra fr\u00E5n beloppet\",\n  }"
     },
     "accessibleSubtract": {
       "type": "string",
@@ -550,7 +648,7 @@ export class DuetNumberInput {
       },
       "attribute": "accessible-subtract",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"V\u00E4henn\u00E4 summasta\",\n      en: \"Subtract from the amount\",\n      sv: \"Dra fr\u00E5n beloppet\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.accessibleSubtractDefaults, this.language)"
     },
     "theme": {
       "type": "string",
@@ -651,6 +749,32 @@ export class DuetNumberInput {
       "reflect": false,
       "defaultValue": "0"
     },
+    "labelDefaults": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"Etiketti\", en: \"Label\", sv: \"M\u00E4rka\"}",
+            "name": "default"
+          }],
+        "text": "Defaults for Label"
+      },
+      "attribute": "label-default",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"Nimilappu\",\n    en: \"Label\",\n    sv: \"Etikett\",\n  }"
+    },
     "label": {
       "type": "string",
       "mutable": false,
@@ -670,7 +794,7 @@ export class DuetNumberInput {
       },
       "attribute": "label",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"Nimilappu\",\n      en: \"Label\",\n      sv: \"Etikett\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.labelDefaults, this.language)"
     },
     "labelHidden": {
       "type": "boolean",

package/lib/collection/components/duet-tab-group/duet-tab-group.js

@@ -31,14 +31,19 @@ export class DuetTabGroup {
      */
     this.language = getLanguage();
     /**
-     * Label for the select element which gets shown on mobile.
+     * Defaults for Label
      * @default {fi: "Valitse", en: "Choose", sv: "Välja"}
      */
-    this.label = getLocaleString({
+    this.labelDefaults = {
       fi: "Valitse",
       en: "Choose",
       sv: "Välj",
-    }, this.language);
+    };
+    /**
+     * Label for the select element which gets shown on mobile.
+     * @default {fi: "Valitse", en: "Choose", sv: "Välja"}
+     */
+    this.label = getLocaleString(this.labelDefaults, this.language);
     /**
      * Determines whether the label for the select element shown on mobile is visually hidden.
      */
@@ -258,6 +263,32 @@ export class DuetTabGroup {
       "reflect": false,
       "defaultValue": "getLanguage()"
     },
+    "labelDefaults": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"Valitse\", en: \"Choose\", sv: \"V\u00E4lja\"}",
+            "name": "default"
+          }],
+        "text": "Defaults for Label"
+      },
+      "attribute": "label-default",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"Valitse\",\n    en: \"Choose\",\n    sv: \"V\u00E4lj\",\n  }"
+    },
     "label": {
       "type": "string",
       "mutable": false,
@@ -277,7 +308,7 @@ export class DuetTabGroup {
       },
       "attribute": "label",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"Valitse\",\n      en: \"Choose\",\n      sv: \"V\u00E4lj\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.labelDefaults, this.language)"
     },
     "labelHidden": {
       "type": "boolean",

package/lib/collection/components/duet-tooltip/duet-tooltip.js

@@ -29,25 +29,35 @@ export class DuetTooltip {
      */
     this.language = getLanguage();
     /**
-     * Adds accessible label for the info icon that is only shown for screen
-     * readers. This property is always required to create an accessible interface!
+     * Default language strings for the accessibleLabel
      * @default {fi: "Näytä lisätietoja", en: "See more information", sv: "Se mer information"}
      */
-    this.accessibleLabel = getLocaleString({
+    this.accessibleLabelDefault = {
       fi: "Näytä lisätietoja",
       en: "Show more information",
       sv: "Visa mer tilläggsuppgifter",
-    }, this.language);
+    };
     /**
-     * Adds accessible label for the close icon that is only shown for screen
-     * readers. This property is always required to create an accessibly interface!
+     * Adds accessible label for the info icon that is only shown for screen
+     * readers. This property is always required to create an accessible interface!
+     * @default {fi: "Näytä lisätietoja", en: "See more information", sv: "Se mer information"}
+     */
+    this.accessibleLabel = getLocaleString(this.accessibleLabelDefault, this.language);
+    /**
+     * Default language strings for the accessibleCloseLabel
      * @default {fi: "Sulje lisätiedot", en: "Close details", sv: "Stäng detaljer"}
      */
-    this.accessibleCloseLabel = getLocaleString({
+    this.accessibleCloseLabelDefault = {
       fi: "Sulje lisätiedot",
       en: "Close details",
       sv: "Stäng tilläggsuppgifter",
-    }, this.language);
+    };
+    /**
+     * Adds accessible label for the close icon that is only shown for screen
+     * readers. This property is always required to create an accessibly interface!
+     * @default {fi: "Sulje lisätiedot", en: "Close details", sv: "Stäng detaljer"}
+     */
+    this.accessibleCloseLabel = getLocaleString(this.accessibleCloseLabelDefault, this.language);
     /**
      * Label of the tooltip. If used, replaces the accessibleLabel option.
      */
@@ -282,6 +292,32 @@ export class DuetTooltip {
       "reflect": false,
       "defaultValue": "getLanguage()"
     },
+    "accessibleLabelDefault": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"N\u00E4yt\u00E4 lis\u00E4tietoja\", en: \"See more information\", sv: \"Se mer information\"}",
+            "name": "default"
+          }],
+        "text": "Default language strings for the accessibleLabel"
+      },
+      "attribute": "accessible-label-default",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"N\u00E4yt\u00E4 lis\u00E4tietoja\",\n    en: \"Show more information\",\n    sv: \"Visa mer till\u00E4ggsuppgifter\",\n  }"
+    },
     "accessibleLabel": {
       "type": "string",
       "mutable": false,
@@ -301,7 +337,7 @@ export class DuetTooltip {
       },
       "attribute": "accessible-label",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"N\u00E4yt\u00E4 lis\u00E4tietoja\",\n      en: \"Show more information\",\n      sv: \"Visa mer till\u00E4ggsuppgifter\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.accessibleLabelDefault, this.language)"
     },
     "accessibleInputLabel": {
       "type": "string",
@@ -323,6 +359,32 @@ export class DuetTooltip {
       "attribute": "accessible-input-label",
       "reflect": false
     },
+    "accessibleCloseLabelDefault": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"Sulje lis\u00E4tiedot\", en: \"Close details\", sv: \"St\u00E4ng detaljer\"}",
+            "name": "default"
+          }],
+        "text": "Default language strings for the accessibleCloseLabel"
+      },
+      "attribute": "accessible-close-label-default",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"Sulje lis\u00E4tiedot\",\n    en: \"Close details\",\n    sv: \"St\u00E4ng till\u00E4ggsuppgifter\",\n  }"
+    },
     "accessibleCloseLabel": {
       "type": "string",
       "mutable": false,
@@ -342,7 +404,7 @@ export class DuetTooltip {
       },
       "attribute": "accessible-close-label",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"Sulje lis\u00E4tiedot\",\n      en: \"Close details\",\n      sv: \"St\u00E4ng till\u00E4ggsuppgifter\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.accessibleCloseLabelDefault, this.language)"
     },
     "label": {
       "type": "string",

package/lib/collection/components/duet-tray/duet-tray.js

@@ -31,25 +31,35 @@ export class DuetTray {
      */
     this.language = getLanguage();
     /**
-     * Accessible label that is shown for screen reader users in the expandable
-     * close toggle. Not visible for normal users.
+     * Defaults for accessibleCloseLabel
      * @default {fi: "Sulje", en: "Close", sv: "Stänga"}
      */
-    this.accessibleCloseLabel = getLocaleString({
+    this.accessibleCloseLabelDefaults = {
       fi: "Sulje",
       en: "Close",
       sv: "Stäng",
-    }, this.language);
+    };
     /**
      * Accessible label that is shown for screen reader users in the expandable
-     * open toggle. Not visible for normal users.
+     * close toggle. Not visible for normal users.
+     * @default {fi: "Sulje", en: "Close", sv: "Stänga"}
+     */
+    this.accessibleCloseLabel = getLocaleString(this.accessibleCloseLabelDefaults, this.language);
+    /**
+     * Defaults for accessibleOpenLabel
      * @default {fi: "Avaa", en: "Open", sv: "Öppen"}
      */
-    this.accessibleOpenLabel = getLocaleString({
+    this.accessibleOpenLabelDefaults = {
       fi: "Avaa",
       en: "Open",
       sv: "Öppna",
-    }, this.language);
+    };
+    /**
+     * Accessible label that is shown for screen reader users in the expandable
+     * open toggle. Not visible for normal users.
+     * @default {fi: "Avaa", en: "Open", sv: "Öppen"}
+     */
+    this.accessibleOpenLabel = getLocaleString(this.accessibleOpenLabelDefaults, this.language);
     /**
      * Theme of the info panel.
      */
@@ -163,6 +173,32 @@ export class DuetTray {
       "reflect": false,
       "defaultValue": "getLanguage()"
     },
+    "accessibleCloseLabelDefaults": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"Sulje\", en: \"Close\", sv: \"St\u00E4nga\"}",
+            "name": "default"
+          }],
+        "text": "Defaults for accessibleCloseLabel"
+      },
+      "attribute": "accessible-close-label-default",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"Sulje\",\n    en: \"Close\",\n    sv: \"St\u00E4ng\",\n  }"
+    },
     "accessibleCloseLabel": {
       "type": "string",
       "mutable": false,
@@ -182,7 +218,33 @@ export class DuetTray {
       },
       "attribute": "accessible-close-label",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"Sulje\",\n      en: \"Close\",\n      sv: \"St\u00E4ng\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.accessibleCloseLabelDefaults, this.language)"
+    },
+    "accessibleOpenLabelDefaults": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "DuetLangObject | string",
+        "resolved": "DuetLangObject | string",
+        "references": {
+          "DuetLangObject": {
+            "location": "import",
+            "path": "../../utils/language-utils"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "text": "{fi: \"Avaa\", en: \"Open\", sv: \"\u00D6ppen\"}",
+            "name": "default"
+          }],
+        "text": "Defaults for accessibleOpenLabel"
+      },
+      "attribute": "accessible-open-label-default",
+      "reflect": false,
+      "defaultValue": "{\n    fi: \"Avaa\",\n    en: \"Open\",\n    sv: \"\u00D6ppna\",\n  }"
     },
     "accessibleOpenLabel": {
       "type": "string",
@@ -203,7 +265,7 @@ export class DuetTray {
       },
       "attribute": "accessible-open-label",
       "reflect": false,
-      "defaultValue": "getLocaleString(\n    {\n      fi: \"Avaa\",\n      en: \"Open\",\n      sv: \"\u00D6ppna\",\n    },\n    this.language\n  )"
+      "defaultValue": "getLocaleString(this.accessibleOpenLabelDefaults, this.language)"
     },
     "theme": {
       "type": "string",

package/lib/collection/utils/fixture-utils.js

@@ -1,6 +1,8 @@
 /*!
  * Built with Duet Design System
  */
+require("dotenv").config();
+const port = process.env.KOA_PROXY_PORT ? parseInt(process.env.KOA_PROXY_PORT) : 3334;
 import * as fs from "fs";
 import * as path from "path";
 import { createPage } from "./test-utils";
@@ -37,7 +39,7 @@ function getAllFixturesFiles(dirPath, fixPath = "fixtures", skipFixture = []) {
 /**
  * Generate automatic fixture testing for jest
  */
-const htmlFragment = (fixtureHtml, theme = "", minHeight = "0px") => {
+const htmlFragment = (fixtureHtml, theme = "", minHeight = "0px", lang = "fi") => {
   let fontFile = "localtapiola";
   let className = "";
   if (theme === "turva") {
@@ -45,7 +47,7 @@ const htmlFragment = (fixtureHtml, theme = "", minHeight = "0px") => {
     className = "duet-theme-turva";
   }
   return `
-<html class="${className}" lang="fi" style="min-height: auto">
+<html class="${className}" lang="${lang}" style="min-height: auto">
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -70,9 +72,9 @@ const htmlFragment = (fixtureHtml, theme = "", minHeight = "0px") => {
       }
 
     </style>
-    <link rel="stylesheet" href="http://localhost:3334/fonts/lib/${fontFile}.css" />
-    <link rel="stylesheet" href="http://localhost:3334/tokens/lib/tokens.custom-properties.css" />
-    <link rel="stylesheet" href="http://localhost:3334/css/lib/duet.css" />
+    <link rel="stylesheet" href="http://0.0.0.0:${port}/fonts/lib/${fontFile}.css" />
+    <link rel="stylesheet" href="http://0.0.0.0:${port}/tokens/lib/tokens.custom-properties.css" />
+    <link rel="stylesheet" href="http://0.0.0.0:${port}/css/lib/duet.css" />
   </head>
   <body style="min-height: ${minHeight} !important; margin: 8px">
     ${fixtureHtml}

package/lib/collection/utils/language-utils.js

@@ -1,6 +1,7 @@
 /*!
  * Built with Duet Design System
  */
+import { convertHtmlQuotes } from "./string-utils";
 const localeLookUpTable = {
   fi: "fi-FI",
   en: "en-GB",
@@ -15,13 +16,13 @@ const localeMonetarySignifierLookUpTable = {
 };
 const defLanguageArray = ["fi", "en", "sv"];
 const defaultLanguage = "fi";
-const currentLanguage = document.documentElement.lang
-  ? document.documentElement.lang.toLowerCase()
-  : defaultLanguage;
+export const getCurrentLanguage = () => {
+  return document.documentElement.lang ? document.documentElement.lang.toLowerCase() : defaultLanguage;
+};
 export const isOfTypeLanguage = (keyInput) => {
   return defLanguageArray.includes(keyInput);
 };
-const checkForLanguage = (languageString = currentLanguage) => {
+const checkForLanguage = (languageString = getCurrentLanguage()) => {
   if (isOfTypeLanguage(languageString)) {
     return languageString;
   }
@@ -35,7 +36,7 @@ const checkForLanguage = (languageString = currentLanguage) => {
  * @param {string} lang=fi - "fi" | "sv" | "en"
  * @default {string} "fi"
  */
-export const getLanguage = (languageString = currentLanguage) => checkForLanguage(languageString);
+export const getLanguage = (languageString = getCurrentLanguage()) => checkForLanguage(languageString);
 /**
  * Returns the current language and locale
  * If language is not fi|sv|en it will default to "fi"
@@ -53,20 +54,33 @@ export const getLocale = (lang) => {
   }
   throw new Error(`Locale for "${lang}" not found`);
 };
+const sanitizeString = (string) => {
+  const argIsString = typeof string === "string";
+  if (argIsString) {
+    try {
+      return JSON.parse(convertHtmlQuotes(string));
+    }
+    catch (e) {
+      console.log("getLocaleString received a string, that didnt parse to json object", string, e);
+    }
+  }
+  return string;
+};
 /**
  * Returns the current string / object from a given translation object
  * If language is not fi|sv|en it will default to "fi"
  * special case where lang can be ALSO be "us" in addition to other types - if user decides to override local language
- * @param {object} langObject - {fi: "finnish", sv: "swedish", en: "english"}
+ * @param {object} langObject - {fi: "finnish", sv: "swedish", en: "english"} | string will get JSON.parsed
  * @param {boolean} languageOverride = false - in case you want to override the actual language set in html tag
  * @default {object} {locale: "fi-FI", money: "€"}
  * @returns {(string|Object)} given example contains {fi:"something"} and langua===fi this will return "something"
  */
 export const getLocaleString = (langObject, languageOverride) => {
+  const obj = sanitizeString(langObject);
   if (languageOverride) {
-    return langObject[checkForLanguage(languageOverride)];
+    return obj[checkForLanguage(languageOverride)];
   }
   else {
-    return langObject[getLanguage()];
+    return obj[getLanguage()];
   }
 };