Hide ru locale (#186)

* Remove locale auto detect * Hide ru locale --------- Co-authored-by: Maksim Sitnikov <[email protected]>
gravity-ui · Mar 22, 2024 · 5e06b7c · 5e06b7c
1 parent 75940c7
commit 5e06b7c
Show file tree

Hide file tree

Showing 23 changed files with 60 additions and 55 deletions.
diff --git a/next-i18next.config.js b/next-i18next.config.js
@@ -1,6 +1,6 @@
 module.exports = {
     i18n: {
-        locales: ['en', 'ru'],
+        locales: ['en' /*, 'ru'*/],
         defaultLocale: 'en',
         defaultNS: 'common',
         ignoreJSONStructure: false,

diff --git a/...ale]/components/[libId]/[componentId].tsx → ...ale]/components/[libId]/[componentId].tsx b/...ale]/components/[libId]/[componentId].tsx → ...ale]/components/[libId]/[componentId].tsx
@@ -2,13 +2,13 @@ import {GetStaticPaths, GetStaticPathsResult, GetStaticProps} from 'next';
 import React from 'react';
 import {Section} from 'src/components/NavigationLayout/types';
 
-import {Component} from '../../../../components/Component/Component';
-import {ComponentsLayout} from '../../../../components/ComponentsLayout/ComponentsLayout';
-import {Layout} from '../../../../components/Layout/Layout';
-import {libs} from '../../../../content/components';
-import {useLocaleRedirect} from '../../../../hooks/useLocaleRedirect';
-import {getLibComponents} from '../../../../utils';
-import {getI18nPaths, getI18nProps} from '../../../../utils/i18next';
+import {Component} from '../../../components/Component/Component';
+import {ComponentsLayout} from '../../../components/ComponentsLayout/ComponentsLayout';
+import {Layout} from '../../../components/Layout/Layout';
+import {libs} from '../../../content/components';
+import {useLocaleRedirect} from '../../../hooks/useLocaleRedirect';
+import {getLibComponents} from '../../../utils';
+import {getI18nPaths, getI18nProps} from '../../../utils/i18next';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     const paths = getI18nPaths().reduce<GetStaticPathsResult['paths']>((acc, localeItem) => {

diff --git a/...ges/[locale]/components/[libId]/index.tsx → src/[locale]/components/[libId]/index.tsx b/...ges/[locale]/components/[libId]/index.tsx → src/[locale]/components/[libId]/index.tsx
@@ -3,9 +3,9 @@ import {useTranslation} from 'next-i18next';
 import {useRouter} from 'next/router';
 import React from 'react';
 
-import {Layout} from '../../../../components/Layout/Layout';
-import {libs} from '../../../../content/components';
-import {getI18nPaths, getI18nProps, getLocaleLink} from '../../../../utils';
+import {Layout} from '../../../components/Layout/Layout';
+import {libs} from '../../../content/components';
+import {getI18nPaths, getI18nProps, getLocaleLink} from '../../../utils';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     const paths = getI18nPaths().reduce<GetStaticPathsResult['paths']>((acc, localeItem) => {

diff --git a/src/pages/[locale]/components/index.tsx → src/[locale]/components/index.tsx b/src/pages/[locale]/components/index.tsx → src/[locale]/components/index.tsx
@@ -3,9 +3,9 @@ import {useTranslation} from 'next-i18next';
 import {useRouter} from 'next/router';
 import React from 'react';
 
-import {Layout} from '../../../components/Layout/Layout';
-import {libs} from '../../../content/components';
-import {getI18nPaths, getI18nProps, getLocaleLink} from '../../../utils';
+import {Layout} from '../../components/Layout/Layout';
+import {libs} from '../../content/components';
+import {getI18nPaths, getI18nProps, getLocaleLink} from '../../utils';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     return {

diff --git a/...ocale]/design/[sectionId]/[articleId].tsx → ...ocale]/design/[sectionId]/[articleId].tsx b/...ocale]/design/[sectionId]/[articleId].tsx → ...ocale]/design/[sectionId]/[articleId].tsx
@@ -2,12 +2,12 @@ import {GetStaticPaths, GetStaticPathsResult, GetStaticProps} from 'next';
 import React from 'react';
 import {Section} from 'src/components/NavigationLayout/types';
 
-import {DesignArticle} from '../../../../components/DesignArticle/DesignArticle';
-import {DesignLayout} from '../../../../components/DesignLayout/DesignLayout';
-import {Layout} from '../../../../components/Layout/Layout';
-import {sections as designSections} from '../../../../content/design';
-import {useLocaleRedirect} from '../../../../hooks/useLocaleRedirect';
-import {getI18nPaths, getI18nProps} from '../../../../utils/i18next';
+import {DesignArticle} from '../../../components/DesignArticle/DesignArticle';
+import {DesignLayout} from '../../../components/DesignLayout/DesignLayout';
+import {Layout} from '../../../components/Layout/Layout';
+import {sections as designSections} from '../../../content/design';
+import {useLocaleRedirect} from '../../../hooks/useLocaleRedirect';
+import {getI18nPaths, getI18nProps} from '../../../utils/i18next';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     const paths = getI18nPaths().reduce<GetStaticPathsResult['paths']>((acc, localeItem) => {

diff --git a/...ges/[locale]/design/[sectionId]/index.tsx → src/[locale]/design/[sectionId]/index.tsx b/...ges/[locale]/design/[sectionId]/index.tsx → src/[locale]/design/[sectionId]/index.tsx
@@ -3,9 +3,9 @@ import {useTranslation} from 'next-i18next';
 import {useRouter} from 'next/router';
 import React from 'react';
 
-import {Layout} from '../../../../components/Layout/Layout';
-import {sections} from '../../../../content/design';
-import {getI18nPaths, getI18nProps, getLocaleLink} from '../../../../utils';
+import {Layout} from '../../../components/Layout/Layout';
+import {sections} from '../../../content/design';
+import {getI18nPaths, getI18nProps, getLocaleLink} from '../../../utils';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     const paths = getI18nPaths().reduce<GetStaticPathsResult['paths']>((acc, localeItem) => {

diff --git a/src/pages/[locale]/design/index.tsx → src/[locale]/design/index.tsx b/src/pages/[locale]/design/index.tsx → src/[locale]/design/index.tsx
@@ -3,9 +3,9 @@ import {useTranslation} from 'next-i18next';
 import {useRouter} from 'next/router';
 import React from 'react';
 
-import {Layout} from '../../../components/Layout/Layout';
-import {sections} from '../../../content/design';
-import {getI18nPaths, getI18nProps, getLocaleLink} from '../../../utils';
+import {Layout} from '../../components/Layout/Layout';
+import {sections} from '../../content/design';
+import {getI18nPaths, getI18nProps, getLocaleLink} from '../../utils';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     return {

diff --git a/src/pages/[locale]/icons.tsx → src/[locale]/icons.tsx b/src/pages/[locale]/icons.tsx → src/[locale]/icons.tsx
@@ -2,10 +2,10 @@ import {GetStaticPaths, GetStaticProps} from 'next';
 import {useRouter} from 'next/router';
 import React from 'react';
 
-import {Icons} from '../../components/Icons';
-import {Layout} from '../../components/Layout/Layout';
-import {useLocaleRedirect} from '../../hooks/useLocaleRedirect';
-import {getI18nPaths, getI18nProps} from '../../utils/i18next';
+import {Icons} from '../components/Icons';
+import {Layout} from '../components/Layout/Layout';
+import {useLocaleRedirect} from '../hooks/useLocaleRedirect';
+import {getI18nPaths, getI18nProps} from '../utils/i18next';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     return {

diff --git a/src/pages/[locale]/index.tsx → src/[locale]/index.tsx b/src/pages/[locale]/index.tsx → src/[locale]/index.tsx
@@ -1,9 +1,9 @@
 import {GetStaticPaths, GetStaticProps} from 'next';
 
-import {Landing} from '../../components/Landing/Landing';
-import {Layout} from '../../components/Layout/Layout';
-import {useLocaleRedirect} from '../../hooks/useLocaleRedirect';
-import {getI18nPaths, getI18nProps} from '../../utils/i18next';
+import {Landing} from '../components/Landing/Landing';
+import {Layout} from '../components/Layout/Layout';
+import {useLocaleRedirect} from '../hooks/useLocaleRedirect';
+import {getI18nPaths, getI18nProps} from '../utils/i18next';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     return {

diff --git a/src/pages/[locale]/libraries/[libId].tsx → src/[locale]/libraries/[libId].tsx b/src/pages/[locale]/libraries/[libId].tsx → src/[locale]/libraries/[libId].tsx
@@ -1,9 +1,9 @@
 import {GetStaticPaths, GetStaticPathsResult, GetStaticProps} from 'next';
 
-import {Layout} from '../../../components/Layout/Layout';
-import {Library} from '../../../components/Library/Library';
-import {useLocaleRedirect} from '../../../hooks/useLocaleRedirect';
-import {getI18nPaths, getI18nProps, getLibById, getLibsList} from '../../../utils';
+import {Layout} from '../../components/Layout/Layout';
+import {Library} from '../../components/Library/Library';
+import {useLocaleRedirect} from '../../hooks/useLocaleRedirect';
+import {getI18nPaths, getI18nProps, getLibById, getLibsList} from '../../utils';
 
 const libs = getLibsList();
 

diff --git a/src/pages/[locale]/libraries/index.tsx → src/[locale]/libraries/index.tsx b/src/pages/[locale]/libraries/index.tsx → src/[locale]/libraries/index.tsx
@@ -1,10 +1,10 @@
 import {GetStaticPaths, GetStaticProps} from 'next';
 import {useTranslation} from 'next-i18next';
 
-import {Layout} from '../../../components/Layout/Layout';
-import {Libraries} from '../../../components/Libraries/Libraries';
-import {useLocaleRedirect} from '../../../hooks/useLocaleRedirect';
-import {getI18nPaths, getI18nProps} from '../../../utils/i18next';
+import {Layout} from '../../components/Layout/Layout';
+import {Libraries} from '../../components/Libraries/Libraries';
+import {useLocaleRedirect} from '../../hooks/useLocaleRedirect';
+import {getI18nPaths, getI18nProps} from '../../utils/i18next';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     return {

diff --git a/src/components/Menu/LocalePicker/LocalePicker.tsx b/src/components/Menu/LocalePicker/LocalePicker.tsx
@@ -13,6 +13,10 @@ export const LocalePicker: React.FC = () => {
     const {i18n} = useTranslation();
     const router = useRouter();
 
+    if (i18nextConfig.i18n.locales.length < 2) {
+        return null;
+    }
+
     return (
         <div className={b()}>
             <RadioButton

diff --git a/src/hooks/useLocaleRedirect.tsx b/src/hooks/useLocaleRedirect.tsx
@@ -18,9 +18,10 @@ export const useLocaleRedirect = () => {
 
         const localStorageLocale = localStorage.getItem(LOCALE_LOCAL_STORAGE_KEY);
 
-        const correctLocale = localStorageLocale
-            ? localStorageLocale
-            : i18nextConfig.i18n.defaultLocale;
+        const correctLocale =
+            localStorageLocale && i18nextConfig.i18n.locales.includes(localStorageLocale)
+                ? localStorageLocale
+                : i18nextConfig.i18n.defaultLocale;
 
         if (currentLocale !== correctLocale) {
             const currentPath = router.asPath;

diff --git a/src/pages/components/[libId]/[componentId].tsx b/src/pages/components/[libId]/[componentId].tsx
@@ -1,8 +1,8 @@
 // Support for default locale without path prefix
 import {GetStaticPaths} from 'next';
 
+import {ComponentPage, getStaticProps} from '../../../[locale]/components/[libId]/[componentId]';
 import {libs} from '../../../content/components';
-import {ComponentPage, getStaticProps} from '../../[locale]/components/[libId]/[componentId]';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     return {

diff --git a/src/pages/components/[libId]/index.tsx b/src/pages/components/[libId]/index.tsx
@@ -1,8 +1,8 @@
 // Support for default locale without path prefix
 import {GetStaticPaths} from 'next';
 
+import {LibraryComponentsPage, getStaticProps} from '../../../[locale]/components/[libId]';
 import {libs} from '../../../content/components';
-import {LibraryComponentsPage, getStaticProps} from '../../[locale]/components/[libId]';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     const paths = libs.map((libItem) => ({

diff --git a/src/pages/components/index.tsx b/src/pages/components/index.tsx
@@ -1,2 +1,2 @@
 // Support for default locale without path prefix
-export {default, getStaticProps} from '../[locale]/components';
+export {default, getStaticProps} from '../../[locale]/components';
diff --git a/src/pages/design/[sectionId]/[articleId].tsx b/src/pages/design/[sectionId]/[articleId].tsx
@@ -1,8 +1,8 @@
 // Support for default locale without path prefix
 import {GetStaticPaths} from 'next';
 
+import {ArticlePage, getStaticProps} from '../../../[locale]/design/[sectionId]/[articleId]';
 import {sections as designSections} from '../../../content/design';
-import {ArticlePage, getStaticProps} from '../../[locale]/design/[sectionId]/[articleId]';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     return {

diff --git a/src/pages/design/[sectionId]/index.tsx b/src/pages/design/[sectionId]/index.tsx
@@ -1,8 +1,8 @@
 // Support for default locale without path prefix
 import {GetStaticPaths} from 'next';
 
+import {DesignSectionPage, getStaticProps} from '../../../[locale]/design/[sectionId]';
 import {sections} from '../../../content/design';
-import {DesignSectionPage, getStaticProps} from '../../[locale]/design/[sectionId]';
 
 export const getStaticPaths: GetStaticPaths = async () => {
     return {

diff --git a/src/pages/design/index.tsx b/src/pages/design/index.tsx
@@ -1,2 +1,2 @@
 // Support for default locale without path prefix
-export {default, getStaticProps} from '../[locale]/design';
+export {default, getStaticProps} from '../../[locale]/design';
diff --git a/src/pages/icons.tsx b/src/pages/icons.tsx
@@ -1,2 +1,2 @@
 // Support for default locale without path prefix
-export {default, getStaticProps} from './[locale]/icons';
+export {default, getStaticProps} from '../[locale]/icons';
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,2 +1,2 @@
 // Support for default locale without path prefix
-export {default, getStaticProps} from './[locale]/index';
+export {default, getStaticProps} from '../[locale]/index';
diff --git a/src/pages/libraries/[libId].tsx b/src/pages/libraries/[libId].tsx
@@ -1,8 +1,8 @@
 // Support for default locale without path prefix
 import {GetStaticPaths} from 'next';
 
+import {LibraryPage, getStaticProps} from '../../[locale]/libraries/[libId]';
 import {getLibsList} from '../../utils';
-import {LibraryPage, getStaticProps} from '../[locale]/libraries/[libId]';
 
 const libs = getLibsList();
 

diff --git a/src/pages/libraries/index.tsx b/src/pages/libraries/index.tsx
@@ -1,2 +1,2 @@
 // Support for default locale without path prefix
-export {default, getStaticProps} from '../[locale]/libraries';
+export {default, getStaticProps} from '../../[locale]/libraries';