gettext-universal 1.0.6 → 1.0.8

package/bin/{po2mjs.js → po2js.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import Po2Mjs from "../src/po2mjs.js"
+import Po2Js from "../src/po2js.js"
 
 const processArgs = process.argv.slice(2)
 let directory
@@ -15,6 +15,6 @@ for (let i = 0; i < processArgs.length; i++) {
   }
 }
 
-const po2Mjs = new Po2Mjs({directory})
+const po2Js = new Po2Js({directory})
 
-await po2Mjs.run()
+await po2Js.run()

package/package.json

@@ -4,11 +4,11 @@
   },
   "name": "gettext-universal",
   "type": "module",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "index.js",
   "scripts": {
     "gettext-universal": "node bin/gettext-universal.js",
-    "po2mjs": "node bin/po2mjs.js",
+    "po2js": "node bin/po2js.js",
     "test": "jasmine"
   },
   "repository": {

package/src/config.js

@@ -1,3 +1,5 @@
+import events from "./events.js"
+
 class Config {
   constructor() {
     this.locales = {}
@@ -14,7 +16,7 @@ class Config {
       const locale = match[1]
       const translations = requireContext(localeFile).default
 
-      locales[locale] = translations
+      this.locales[locale] = translations
     }
   }
 
@@ -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/{po2mjs.js → po2js.js}

@@ -1,7 +1,7 @@
 import {promises as fs} from "fs"
 import path from "path"
 
-export default class Po2Mjs {
+export default class Po2Js {
   constructor({directory}) {
     this.directory = directory
   }

package/src/use-translate-expo.js

@@ -1,21 +1,16 @@
-import EventEmitter from "events"
+import config from "./config.js"
+import events from "./events.js"
 import translate from "./translate.js"
-import {createContext, useCallback, useMemo, useState} from "react"
+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 WithTranslate = ({children, ...restProps}) => {
-  const restPropsKeys = Object.keys(restProps)
-
-  if (restPropsKeys.length > 0) {
-    throw new Error(`Unknown props given: ${restPropsKeys.join(", ")}`)
-  }
-
   const locales = useLocales()
-  const [locale, setLocale] = useState()
+  const [locale, setLocale] = useState(config.getLocale())
+
   const actualLocales = useMemo(() => {
     const actualLocales = []
 
@@ -30,15 +25,19 @@ const WithTranslate = ({children, ...restProps}) => {
     return actualLocales
   }, [locale, locales])
 
-  const contextData = useMemo(() => ({locales: actualLocales}), [actualLocales])
+  const contextData = useMemo(() => ({locale, locales: actualLocales}), [actualLocales])
 
   const onChangeLocale = useCallback(({locale}) => {
-    console.log("onChangeLocale", args)
-
     setLocale(locale)
   }, [])
 
-  useEventEmitter(eventEmitter, "changeLocale", onChangeLocale)
+  useEventEmitter(events, "onLocaleChange", onChangeLocale)
+
+  const restPropsKeys = Object.keys(restProps)
+
+  if (restPropsKeys.length > 0) {
+    throw new Error(`Unknown props given: ${restPropsKeys.join(", ")}`)
+  }
 
   return (
     <TranslateContext.Provider value={contextData}>
@@ -48,12 +47,24 @@ const WithTranslate = ({children, ...restProps}) => {
 }
 
 const useTranslateExpo = () => {
+  const localeContext = useContext(TranslateContext)
   const locales = useLocales()
-  let preferredLocales
 
-  if (Array.isArray(locales)) {
-    preferredLocales = locales?.map((localeData) => localeData.languageCode)
-  }
+  const preferredLocales = useMemo(() => {
+    let preferredLocales = []
+
+    if (localeContext?.locale) {
+      preferredLocales.push(localeContext.locale)
+    }
+
+    if (Array.isArray(locales)) {
+      for (const localeData of locales) {
+        preferredLocales.push(localeData.languageCode)
+      }
+    }
+
+    return preferredLocales
+  }, [localeContext?.locale, locales])
 
   const currentTranslation = useCallback((msgId, args = {}) => {
     args.locales = preferredLocales