gettext-universal 1.0.7 → 1.0.9

package/package.json

@@ -4,7 +4,7 @@
   },
   "name": "gettext-universal",
   "type": "module",
-  "version": "1.0.7",
+  "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/config.js

@@ -1,3 +1,5 @@
+import events from "./events.js"
+
 class Config {
   constructor() {
     this.locales = {}
@@ -28,6 +30,7 @@ class Config {
 
   setLocale(locale) {
     this.locale = locale
+    events.emit("onLocaleChange", {locale})
   }
 }
 

package/src/events.js

@@ -0,0 +1,5 @@
+import EventEmitter from "events"
+
+const eventEmitter = new EventEmitter()
+
+export default eventEmitter

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

@@ -1,25 +1,15 @@
-import {digg} from "diggerize"
-import EventEmitter from "events"
+import config from "./config.js"
+import events from "./events.js"
 import translate from "./translate.js"
 import {createContext, useCallback, useContext, useMemo, useState} from "react"
 import useEventEmitter from "@kaspernj/api-maker/build/use-event-emitter"
 import {useLocales} from "expo-localization"
 
-const eventEmitter = new EventEmitter()
 const TranslateContext = createContext()
 
-const shared = {
-  locale: null
-}
-
-const setLocale = (locale) => {
-  shared.locale = locale
-  eventEmitter.emit("changeLocale", {locale})
-}
-
 const WithTranslate = ({children, ...restProps}) => {
   const locales = useLocales()
-  const [locale, setLocale] = useState(digg(shared, "locale"))
+  const [locale, setLocale] = useState(config.getLocale())
 
   const actualLocales = useMemo(() => {
     const actualLocales = []
@@ -41,7 +31,7 @@ const WithTranslate = ({children, ...restProps}) => {
     setLocale(locale)
   }, [])
 
-  useEventEmitter(eventEmitter, "changeLocale", onChangeLocale)
+  useEventEmitter(events, "onLocaleChange", onChangeLocale)
 
   const restPropsKeys = Object.keys(restProps)
 
@@ -76,14 +66,14 @@ 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
 }
 
-export {setLocale, WithTranslate}
+export {WithTranslate}
 export default useTranslateExpo