gettext-universal 1.0.3 → 1.0.5

package/package.json

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

package/src/translate.js

@@ -1,6 +1,15 @@
 import config from "./config.js"
 
-const translate = (msgId, preferredLocales) => {
+const translate = (msgId, args) => {
+  let preferredLocales
+
+  if (Array.isArray(args)) {
+    preferredLocales = args
+    args = null
+  } else if (args?.locales) {
+    preferredLocales = args.locales
+  }
+
   if (!preferredLocales) {
     if (config.getLocale()) {
       preferredLocales = [config.getLocale()]
@@ -41,7 +50,13 @@ const translate = (msgId, preferredLocales) => {
     }
   }
 
-  if (!translation) translation = msgId
+  if (!translation) {
+    if (args?.defaultValue) {
+      translation = args.defaultValue
+    } else {
+      translation = msgId
+    }
+  }
 
   return translation
 }

package/src/use-translate-expo.js

@@ -2,12 +2,21 @@ import translate from "./translate.js"
 import {useCallback} from "react"
 import {useLocales} from "expo-localization"
 
-const useTranslate = () => {
+const useTranslateExpo = () => {
   const locales = useLocales()
-  const preferredLocales = locales.map((localeData) => localeData.languageCode)
-  const currentTranslation = useCallback((msgId) => translate(msgId, preferredLocales), [preferredLocales])
+  let preferredLocales
+
+  if (Array.isArray(locales)) {
+    preferredLocales = locales?.map((localeData) => localeData.languageCode)
+  }
+
+  const currentTranslation = useCallback((msgId, args = {}) => {
+    args.locales = preferredLocales
+
+    return translate(msgId, args)
+  }, [preferredLocales])
 
   return currentTranslation
 }
 
-export default useTranslate
+export default useTranslateExpo