gettext-universal 1.0.8 → 1.0.9

package/package.json

@@ -4,7 +4,7 @@
   },
   "name": "gettext-universal",
   "type": "module",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "main": "index.js",
   "scripts": {
     "gettext-universal": "node bin/gettext-universal.js",

package/spec/gettext-universal.spec.js

@@ -1,9 +1,28 @@
+import config from "../src/config.js"
 import translate from "../src/translate.js"
 
 describe("gettext-universal", () => {
   it("falls back to the given msgId", () => {
+    config.setLocale("en")
+    config.locales = {
+      en: {}
+    }
+
     const result = translate("Hello world")
 
     expect(result).toEqual("Hello world")
   })
+
+  it("replaces placeholders with variables", () => {
+    config.setLocale("en")
+    config.locales = {
+      "en": {
+        "Hello name": "Hello %{name}"
+      }
+    }
+
+    const result = translate("Hello name", {name: "Kasper"})
+
+    expect(result).toEqual("Hello Kasper")
+  })
 })

package/src/translate.js

@@ -1,6 +1,6 @@
 import config from "./config.js"
 
-const translate = (msgId, args) => {
+const translate = (msgId, variables, args) => {
   let preferredLocales
 
   if (Array.isArray(args)) {
@@ -22,7 +22,7 @@ const translate = (msgId, args) => {
 
   let translation
 
-  for (preferredLocale of preferredLocales) {
+  for (const preferredLocale of preferredLocales) {
     const localeTranslations = config.getLocales()[preferredLocale]
 
     if (!localeTranslations) continue
@@ -36,16 +36,20 @@ const translate = (msgId, args) => {
   }
 
   if (!translation) {
-    for (const fallback of config.getFallbacks()) {
-      const localeTranslations = config.getLocales()[fallback]
+    const fallbacks = config.getFallbacks()
 
-      if (!localeTranslations) continue
+    if (fallbacks) {
+      for (const fallback of config.getFallbacks()) {
+        const localeTranslations = config.getLocales()[fallback]
 
-      const localeTranslation = localeTranslations[msgId]
+        if (!localeTranslations) continue
 
-      if (localeTranslation) {
-        translation = localeTranslation
-        break
+        const localeTranslation = localeTranslations[msgId]
+
+        if (localeTranslation) {
+          translation = localeTranslation
+          break
+        }
       }
     }
   }
@@ -58,6 +62,15 @@ const translate = (msgId, args) => {
     }
   }
 
+  if (variables) {
+    for (const key in variables) {
+      const value = variables[key]
+      const replaceKey = `%{${key}}`
+
+      translation = translation.replaceAll(replaceKey, value)
+    }
+  }
+
   return translation
 }
 

package/src/use-translate-expo.js

@@ -66,10 +66,10 @@ const useTranslateExpo = () => {
     return preferredLocales
   }, [localeContext?.locale, locales])
 
-  const currentTranslation = useCallback((msgId, args = {}) => {
-    args.locales = preferredLocales
+  const currentTranslation = useCallback((msgId, variables, args = {}) => {
+    args.locales ||= preferredLocales
 
-    return translate(msgId, args)
+    return translate(msgId, variables, args)
   }, [preferredLocales])
 
   return currentTranslation