@bottlebooks/valid-values 1.2.0 → 1.2.1

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.1",
   "type": "commonjs",
   "main": "dist/index.js",
   "scripts": {
@@ -32,5 +32,5 @@
     "@babel/core": "^7.15.5",
     "@lingui/core": "^3.14.0"
   },
-  "gitHead": "c633baa84173c2e200b85f3833ef54bfb3809a22"
+  "gitHead": "fc6e66bcc86624d21020629f89b961862bbb7f4f"
 }

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;
+}