Quellcode durchsuchen

修改语言 侧边栏

zhejiushizhuce vor 2 Jahren
Ursprung
Commit
89c17d5114

+ 1 - 1
src/components/AutoWinList/index.jsx

@@ -175,7 +175,7 @@ const AutoWinList=({data})=>{
         if (container.rollTimer!=null)clearTimeout(container.rollTimer)
         container.rollTimer=setTimeout(function () {
             startRoll();
-        },1000);
+        },2000);
     }
     const initRollList=()=>{
         if (containerRef==null)return;

+ 2 - 0
src/features/mainSlice.js

@@ -238,6 +238,8 @@ const reducerRoutes=(state,action)=>{
                 if(user.Phone!==""&&user.Phone.startsWith(user.RegisterLocation)){
                     hasPhone=1;
                 }
+                //同步lang
+                if (user.DefaultLanguage!=null)i18n.setLocalLangFromS(user.DefaultLanguage);
                 checkChannel(user);
             }
         }

+ 1 - 2
src/layout/Sidebar/index.jsx

@@ -273,7 +273,6 @@ const Sidebar = () => {
             ):renderIconLink(link,styles);
         return linkItem
     }
-
     const renderRLink=(link)=>{
         let isActive=checkPath(link);
         let ispop=link.type===ROUTE_TYPE_POP||link.type===ROUTE_TYPE_POP_OR_FULL||link.type===ROUTE_TYPE_OUTLINK;
@@ -281,7 +280,7 @@ const Sidebar = () => {
         let linktxt=(
             <>
                 <SvgIcon className={"icon"} herf={link.icon}/>
-                {i18n.t(`${link.title}`)}
+                <span>{i18n.t(`${link.title}`)}</span>
             </>
         )
         let target=link.type===ROUTE_TYPE_OUTLINK?"_blank":"";

+ 6 - 0
src/layout/Sidebar/styles.js

@@ -260,6 +260,12 @@ const SingleLink=styled.div`
     gap: 12px;
     padding: 0.825rem 0.825rem !important;
     align-items: center;
+    white-space: normal;
+    span {
+      overflow: hidden;
+      max-height: 2.5rem;
+      max-width: calc(100% + 0.825rem*2);
+    }
     .icon {
         display: flex;
         align-items: center;

+ 10 - 5
src/locales/index.js

@@ -14,11 +14,6 @@ const resources = {
         name:"English",
         translation: en,
     },
-    ru: {
-        key:"ru_RU",
-        name:"Русский",
-        translation: ru,
-    },
     // zh: {
     //     translation: zh
     // }
@@ -31,6 +26,11 @@ const resources = {
         key:"es_MX",
         name:"Español",
         translation:es
+    },
+    ru: {
+        key:"ru_RU",
+        name:"Русский",
+        translation: ru,
     }
 }
 const dlang="en";
@@ -78,4 +78,9 @@ i18n.getAllLangs=()=>{
     }
     return langs;
 }
+//同步lang 从服务器
+i18n.setLocalLangFromS=(language)=>{
+    if (resources[language]==null)return;
+    i18n.setLocalLanguage(language);
+}
 export default i18n;