Merge branch 'release/1.0.5'

Author: nekofar

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.0.5] - 2023-07-28
+
+### <!-- 02 -->Bug Fixes
+
+- Remove close function from locale switcher component
+
+### <!-- 04 -->Refactor
+
+- Improve code formatting and remove unused import
+- Simplify locale switching logic in `useLocaleSwitcher`
+
 ## [1.0.4] - 2023-07-28
 
 ### <!-- 01 -->Features

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextjs-lingui-template",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/components/locale-switcher.tsx

@@ -45,7 +45,6 @@ export function LocaleSwitcher() {
                     )}
                     onClick={() => {
                       changeLocale(locale)
-                      close()
                     }}
                   >
                     {getLocaleName(locale)}

src/hooks/use-locale-switcher.ts

@@ -8,21 +8,22 @@ export function useLocaleSwitcher() {
   const locale = useLocale()
 
   const changeLocale = useCallback(
-    async (nextLocale: Locale) => {
+    (nextLocale: Locale) => {
       if (!nextLocale || nextLocale === locale) {
         return
       }
 
-      let pathName = router.pathname
-      Object.keys(router.query).forEach((k) => {
-        if (k === 'locale') {
-          pathName = pathName.replace(`[${k}]`, nextLocale)
-          return
-        }
-        pathName = pathName.replace(`[${k}]`, <string>router.query[k])
-      })
+      const pathName = Object.keys(router.query).reduce(
+        (currentPathName, k) => {
+          if (k === 'locale') {
+            return currentPathName.replace(`[${k}]`, nextLocale)
+          }
+          return currentPathName.replace(`[${k}]`, String(router.query[k]))
+        },
+        router.pathname,
+      )
 
-      await router.replace(pathName)
+      router.replace(pathName)
     },
     [locale, router],
   )

src/hooks/use-locale.ts

@@ -1,4 +1,4 @@
-import { getLocale,Locale } from '@/utils/locales'
+import { getLocale, Locale } from '@/utils/locales'
 import { useRouter } from 'next/router'
 
 export function useLocale(): Locale {

src/pages/index.ts

@@ -1,5 +1,4 @@
-import {defaultLocale, getLocale, loadCatalog} from '@/utils/locales'
-import { GetStaticPropsContext } from 'next'
+import { getLocale, loadCatalog } from '@/utils/locales'
 import { useRouter } from 'next/router'
 import { useEffect } from 'react'