@bottlebooks/valid-values 1.2.0 → 1.2.2

package/dist/validValues/types/ValidValueDefinition.d.ts

@@ -11,7 +11,7 @@ export interface ValidValueDefinition {
      *
      * Define it using `defineMessage()` from @lingui/macro.
      */
-    title?: string | MessageDescriptor;
+    title: string | MessageDescriptor;
     /**
      * Fields that will never be stored in the database,
      * because they are not relevant to the frontend rendering.

package/dist/validValues/types/ValidValueDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ValidValueDefinition.d.ts","sourceRoot":"","sources":["../../../src/validValues/types/ValidValueDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACpC;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC;IACnC;;;;OAIG;IACH,IAAI,CAAC,EAAE,EAKN,CAAC;IACF;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC;CACf"}
+{"version":3,"file":"ValidValueDefinition.d.ts","sourceRoot":"","sources":["../../../src/validValues/types/ValidValueDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACpC;;;;OAIG;IACH,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAC;IAClC;;;;OAIG;IACH,IAAI,CAAC,EAAE,EAKN,CAAC;IACF;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC;CACf"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@bottlebooks/valid-values",
   "description": "The Bottlebooks lookup values, defined globally.",
   "private": false,
-  "version": "1.2.0",
+  "version": "1.2.2",
   "type": "commonjs",
   "main": "dist/index.js",
   "scripts": {
@@ -32,5 +32,5 @@
     "@babel/core": "^7.15.5",
     "@lingui/core": "^3.14.0"
   },
-  "gitHead": "c633baa84173c2e200b85f3833ef54bfb3809a22"
+  "gitHead": "b08f6c4c45753bb5137e8caa37ae99581a5d5814"
 }

package/src/core/translate.ts

@@ -1,16 +1,40 @@
 import { i18n, MessageDescriptor } from '@lingui/core';
 
-export function translate(message: MessageDescriptor, locale: string) {
-    i18n.activate(locale);
-    const translation = i18n._(message);
-    if (translation === message.id) {
+export function translate(title: MessageDescriptor | string, locale?: string) {
+  // if (typeof title === 'string') {
+  //   return title;
+  // }
+  const messageId = typeof title === 'string' ? title : title?.id;
+  if (!messageId) {
+    console.log(
+      '%c' + `ERROR: messageId_missing:${JSON.stringify(title)}`,
+      'color: #d0011b;'
+    );
+    return '';
+  }
+
+  if (!locale) {
+    locale = 'en';
+  }
+  //  else {
+  //   i18n.activate('en');
+  // }
+  i18n.activate(locale);
+
+  let translation = i18n._(messageId);
+  if (translation === messageId) {
+    if (messageId.includes('validValues.')) {
       console.log(
-        '%c' + `WARNING: translation_missing:${message.id}:${locale}`,
+        '%c' + `ERROR: translation_missing:${messageId}:${locale}`,
         'color: #d0011b;'
       );
-      i18n.activate('en');
-      return i18n._(message) || '';
+      return '';
     }
-    return translation;
+    console.log(
+      '%c' + `WARNING: translation==messageId:${messageId}:${locale}`,
+      'color: #d0011b;'
+    );
   }
-  
+
+  return translation;
+}

package/src/locales/json/bg.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "винен дестилат",
   "validValues.ingredient.wineSpirit": "винена дестилатна спиртна напитка",
   "validValues.ingredient.yeastMannoproteins": "манопротеини от дрожди"
-}
+}

package/src/locales/json/cz.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "destilátu z vína",
   "validValues.ingredient.wineSpirit": "vínovice",
   "validValues.ingredient.yeastMannoproteins": "kvasinkové mannoproteiny"
-}
+}

package/src/locales/json/de.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "Weindestillat",
   "validValues.ingredient.wineSpirit": "Branntwein",
   "validValues.ingredient.yeastMannoproteins": "Hefe-Mannoproteine"
-}
+}

package/src/locales/json/dk.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "vindestillat",
   "validValues.ingredient.wineSpirit": "vinbrændevin",
   "validValues.ingredient.yeastMannoproteins": "gærmannoproteiner"
-}
+}

package/src/locales/json/ee.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "veinidestillaati",
   "validValues.ingredient.wineSpirit": "veinipiiritus",
   "validValues.ingredient.yeastMannoproteins": "pärmi mannoproteiinid"
-}
+}

package/src/locales/json/en.json

@@ -38,4 +38,4 @@
   "validValues.productType.wine_pearlwine": "Pearl wine",
   "validValues.productType.wine_sparkling": "Sparkling wine",
   "validValues.productType.wine_stillwine": "Still wine"
-}
+}

package/src/locales/json/es.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "destilado de vino",
   "validValues.ingredient.wineSpirit": "aguardiente de vino",
   "validValues.ingredient.yeastMannoproteins": "manoproteínas de levaduras"
-}
+}

package/src/locales/json/fi.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "viinitislettä",
   "validValues.ingredient.wineSpirit": "viinistä tislattu väkevä alkoholijuoma",
   "validValues.ingredient.yeastMannoproteins": "hiivan mannoproteiinit"
-}
+}

package/src/locales/json/fr.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "distillat de vin",
   "validValues.ingredient.wineSpirit": "eau-de-vie de vin",
   "validValues.ingredient.yeastMannoproteins": "mannoprotéines de levures"
-}
+}

package/src/locales/json/gr.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "αποστάγματος οίνου",
   "validValues.ingredient.wineSpirit": "απόσταγμα οίνου",
   "validValues.ingredient.yeastMannoproteins": "μαννοπρωτεΐνες από ζυμομύκητες"
-}
+}

package/src/locales/json/hr.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "vinskog destilata",
   "validValues.ingredient.wineSpirit": "rakija od vina",
   "validValues.ingredient.yeastMannoproteins": "manoproteini kvasca"
-}
+}

package/src/locales/json/hu.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "aszalt szőlőből előállított alkohol",
   "validValues.ingredient.wineSpirit": "mezőgazdasági eredetű párlat",
   "validValues.ingredient.yeastMannoproteins": "mannoprotein alapú élesztő"
-}
+}

package/src/locales/json/ie.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "driogáit fíona",
   "validValues.ingredient.wineSpirit": "biotáille fíona",
   "validValues.ingredient.yeastMannoproteins": "mannapróitéin ghiosta"
-}
+}

package/src/locales/json/it.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "distillato di vino",
   "validValues.ingredient.wineSpirit": "acquavite di vino",
   "validValues.ingredient.yeastMannoproteins": "mannoproteine di lieviti"
-}
+}

package/src/locales/json/json.json

@@ -47,4 +47,4 @@
     "rose": "Ružové",
     "orange": "Oranžové"
   }
-}
+}

package/src/locales/json/lt.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "vyno distiliato",
   "validValues.ingredient.wineSpirit": "vyno spiritą",
   "validValues.ingredient.yeastMannoproteins": "mielių manobaltymai"
-}
+}

package/src/locales/json/lv.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "vīna destilāts",
   "validValues.ingredient.wineSpirit": "vīna spirts",
   "validValues.ingredient.yeastMannoproteins": "rauga mannoproteīni"
-}
+}

package/src/locales/json/mt.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "distillat tal-inbid",
   "validValues.ingredient.wineSpirit": "spirtu mill-inbid",
   "validValues.ingredient.yeastMannoproteins": "mannoproteini tal-ħmira"
-}
+}

package/src/locales/json/nl.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "wijndistillaat",
   "validValues.ingredient.wineSpirit": ";wijn-eau-de-vie",
   "validValues.ingredient.yeastMannoproteins": "mannoproteïnen uit gist"
-}
+}

package/src/locales/json/pl.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "destylatu wina",
   "validValues.ingredient.wineSpirit": "okowita z wina gronowego",
   "validValues.ingredient.yeastMannoproteins": "mannoproteiny drożdży"
-}
+}

package/src/locales/json/props.json

@@ -1,3 +1,3 @@
 {
   "validValues.wineColor.addForm": false
-}
+}

package/src/locales/json/pt.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "destilado de vinho",
   "validValues.ingredient.wineSpirit": "aguardente de vinho",
   "validValues.ingredient.yeastMannoproteins": "manoproteínas de leveduras"
-}
+}

package/src/locales/json/ro.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "distilat de vin",
   "validValues.ingredient.wineSpirit": "rachiu de vin",
   "validValues.ingredient.yeastMannoproteins": "manoproteine de drojdie"
-}
+}

package/src/locales/json/se.json

@@ -47,4 +47,4 @@
   "validValues.ingredient.wineDistillate": "vindestillat",
   "validValues.ingredient.wineSpirit": "vinsprit",
   "validValues.ingredient.yeastMannoproteins": "mannoproteiner från jäst"
-}
+}

package/src/locales/json/si.json

@@ -48,4 +48,4 @@
   "validValues.ingredient.wineDistillate": "vinskega destilata",
   "validValues.ingredient.wineSpirit": "žganje iz vina",
   "validValues.ingredient.yeastMannoproteins": "manoproteini kvasovk"
-}
+}

package/src/locales/json/sk.json

@@ -1,3 +1,3 @@
 {
   "validValues.productType.wine_stillwine": "Tiché víno"
-}
+}