@olenbetong/appframe-core 2.0.1 → 2.0.3

package/src/getLocalizedString.ts

@@ -1,7 +1,9 @@
-async function getLocalizedStringAsync(string: string) {
+import { has } from "./has";
+
+async function getLocalizedStringAsync(text: string) {
   try {
-    let response = await fetch("/api/user/localize", {
-      body: JSON.stringify({ string }),
+    let response = await fetch(`/api/user/localize/new/${af.article.id}`, {
+      body: JSON.stringify({ text }),
       headers: {
         Accept: "application/json; */*",
         "Content-Type": "application/json",
@@ -15,18 +17,22 @@ async function getLocalizedStringAsync(string: string) {
     }
   } catch (error) {}
 
-  return string;
+  return text;
 }
 
+function afGetLocalizedString(string: undefined | null): undefined | null;
 function afGetLocalizedString(string: string): string;
 function afGetLocalizedString(string: string, wait: false): string;
 function afGetLocalizedString(string: string, wait: true): Promise<string>;
-function afGetLocalizedString(
-  string: string,
-  wait?: boolean
-): string | Promise<string> {
+function afGetLocalizedString(string: string | undefined | null, wait?: boolean): string | undefined | null | Promise<string> {
+  if(typeof string === "string" && string.trim().length === 0) {
+    return string;
+  }
+
+  if (string === undefined || string === '' || string === null) { return; }
+
   if (af?.article?.i18n !== undefined) {
-    if (!Object.prototype.hasOwnProperty.call(af.article.i18n, string)) {
+    if (!has(af.article.i18n, string)) {
       af.article.i18n[string] = string;
 
       let promise = getLocalizedStringAsync(string).then((text) => {
@@ -101,17 +107,11 @@ function addDeveloperUtils() {
           if (string) {
             const escaped = string.replace(/'/g, "\\'");
             if (forCustomRoute) {
-              const localized = afGetLocalizedString(string).replaceAll(
-                /'/g,
-                "\\'"
-              );
+              const localized = afGetLocalizedString(string).replaceAll(/'/g, "\\'");
               strings.push(`'${escaped}': '${localized}',`);
             } else {
               strings.push(
-                `s['${escaped}'] = @Html(@context.AddLocalizableString("${string.replaceAll(
-                  '"',
-                  '\\"'
-                )}"));`
+                `s['${escaped}'] = @Html(@context.AddLocalizableString("${string.replaceAll('"', '\\"')}"));`
               );
             }
           }