@graphcommerce/lingui-next 5.2.0-canary.8 → 6.0.0-canary.20

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## 6.0.0-canary.20
+
+## 5.2.0-canary.19
+
+## 5.2.0-canary.18
+
+## 5.2.0-canary.17
+
+## 5.2.0-canary.16
+
+## 5.2.0-canary.15
+
+## 5.2.0-canary.14
+
+## 5.2.0-canary.13
+
+## 5.2.0-canary.12
+
+## 5.2.0-canary.11
+
+## 5.2.0-canary.10
+
+## 5.2.0-canary.9
+
 ## 5.2.0-canary.8
 
 ## 5.2.0-canary.7

package/Config.graphqls

@@ -0,0 +1,13 @@
+extend input GraphCommerceI18nConfig {
+  """
+  Specify a custom locale for to load translations.
+  """
+  linguiLocale: String
+}
+
+# extend input GraphCommerceConfog {
+#   """
+#   By default the locale only will be used: locale: "en-us" => "en", but you can use the full locale: locale: "en-us" => "en-us"
+#   """
+#   linguiFullLocale: String
+# }

package/README.md

@@ -1,8 +1,8 @@
-# @graphcommerce/googlerecaptcha
+# @graphcommerce/lingui-next
 
-This package makes it easy to add Google Recaptcha v3 to GraphCommerce
+This package adds lingui to GraphCommerce
 
-### Usage
+## Installation
 
 1. Create a lingui.config.js with the lingui config.
    [example](../../examples/magento-graphcms/lingui.config.js)
@@ -14,7 +14,11 @@ This package makes it easy to add Google Recaptcha v3 to GraphCommerce
 4. Run `NODE_ENV=development yarn lingui extract` to extact messages for your
    locale.
 
-### Additing a new language
+## Configuration
 
-1. Add you new language to `lingui.config.js`
-2. Run `NODE_ENV=development yarn lingui extract`
+Configure the following ([configuration values](./Config.graphqls)) in your
+graphcommerce.config.js
+
+## Extracting messages
+
+Run `NODE_ENV=development yarn lingui extract`

package/components/LinguiProvider.tsx

@@ -1,3 +1,4 @@
+import { i18nConfig } from '@graphcommerce/next-ui'
 import { i18n, Messages } from '@lingui/core'
 import { I18nProvider, I18nProviderProps } from '@lingui/react'
 import { nl, en, fr } from 'make-plural/plurals'
@@ -19,17 +20,18 @@ i18n.loadLocaleData({
 })
 
 export function LinguiProvider(props: LinguiProviderProps) {
-  const { loader, ssrLoader, locale, ...i18nProviderPRops } = props
+  const { loader, ssrLoader, locale, ...i18nProviderProps } = props
+
+  const localeOnly = (locale && i18nConfig(locale)?.linguiLocale) ?? locale?.split('-')[0]
 
   useMemo(() => {
-    const localeOnly = locale?.split('-')[0]
     const data = globalThis.document?.getElementById('lingui')
 
     if (data?.lang === localeOnly && data.textContent) {
       // @todo: We're not loading the plurals dynamically, but we can't because it will load the complete module.
       i18n.load(localeOnly, JSON.parse(data.textContent) as Messages)
       i18n.activate(localeOnly)
-    } else if (i18n.locale !== locale) {
+    } else if (i18n.locale !== localeOnly) {
       if (typeof window === 'undefined') {
         const { messages } = ssrLoader(localeOnly)
         i18n.load(localeOnly, messages)
@@ -55,7 +57,7 @@ export function LinguiProvider(props: LinguiProviderProps) {
     }
     // We dont want to call this when the loader/ssrLoader changes, because it will cause a re-render.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [locale])
+  }, [localeOnly])
 
-  return <I18nProvider i18n={i18n} {...i18nProviderPRops} />
+  return <I18nProvider i18n={i18n} {...i18nProviderProps} />
 }

package/config.d.ts

@@ -1,4 +1,4 @@
-import { LinguiConfig } from '@lingui/conf'
+import type { LinguiConfig } from '@lingui/conf'
 /**
  * Augmenting the locale config to be compatible with GraphCommerce.
  *

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/lingui-next",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "5.2.0-canary.8",
+  "version": "6.0.0-canary.20",
   "sideEffects": false,
   "scripts": {
     "dev": "tsc -W"
@@ -15,18 +15,18 @@
     }
   },
   "dependencies": {
-    "make-plural": "6.2.2",
-    "@graphcommerce/next-config": "5.2.0-canary.8"
+    "@graphcommerce/next-config": "6.0.0-canary.20",
+    "make-plural": "6.2.2"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "5.2.0-canary.8",
-    "@graphcommerce/prettier-config-pwa": "5.2.0-canary.8",
-    "@graphcommerce/typescript-config-pwa": "5.2.0-canary.8",
+    "@graphcommerce/eslint-config-pwa": "6.0.0-canary.20",
+    "@graphcommerce/prettier-config-pwa": "6.0.0-canary.20",
+    "@graphcommerce/typescript-config-pwa": "6.0.0-canary.20",
     "@lingui/conf": "^3.14.0"
   },
   "peerDependencies": {
-    "@lingui/core": "^3.13.2",
     "@lingui/react": "^3.13.2",
+    "@lingui/core": "^3.13.2",
     "next": "^13.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"