Merge pull request #45 from Gellipapa/main

🔧 fix(Translation locales)
esx-framework · Apr 29, 2023 · 3ea5e48 · 3ea5e48
2 parents ba1999b + bebf169
commit 3ea5e48
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/shared/config.lua b/shared/config.lua
@@ -1,5 +1,5 @@
 Config = {
-    Lang = GetConvar('esx:locale', 'en'):upper(), -- If you want to change UI language texts you can do it here: web/src/assets/translate.json !!IMPORTANT that this can only be modified with the unbuilt version.
+    Locale = GetConvar('esx:locale', 'en'), -- If you want to change UI language texts you can do it here: web/src/assets/translate.json !!IMPORTANT that this can only be modified with the unbuilt version.
     Colors = {
         Info = {
             ['money-text-color'] = "#4d6973",

diff --git a/web/src/App.jsx b/web/src/App.jsx
@@ -43,7 +43,7 @@ function App() {
                     value ? open() : close()
                     break;
                 case "SET_CONFIG_DATA":
-                    setLang(value["Lang"])
+                    setLang(value["Locale"])
                     setUpdateLang(true)
                     setDefaultConfigs(value)
                     const speedoColors = handleLocalStorage("speedoColors","get")

diff --git a/web/src/Utils/Translate.js b/web/src/Utils/Translate.js
@@ -7,7 +7,7 @@ import TranslateData from '../assets/translate.json';
  * @param defaultKey (optional) return default string if doesn't exist key
  * @return {*}
  */
-let lang = "EN"
+let lang = "en"
 export const translate = (translateKey,translateObjectName = "General",defaultKey = null) =>{
     if(!TranslateData[lang][translateObjectName][translateKey.toLowerCase()]){
         console.warn(`Doesn't exist translate key: ${translateKey.toLowerCase()} in ${translateObjectName} translate object`)
@@ -17,10 +17,10 @@ export const translate = (translateKey,translateObjectName = "General",defaultKe
 }
 
 export function setLang(currentLang){
-    let newLang = currentLang.length > 0 ? currentLang : "EN"
+    let newLang = currentLang.length > 0 ? currentLang : "en"
     if(!TranslateData[currentLang]){
         console.warn(`There is no such language type!  Current language type: ${currentLang} If you want add other lang you can do here: web/src/assets/translate.json !!IMPORTANT this file only see with the unbuilt version.`)
-        newLang = "EN"
+        newLang = "en"
     }
     lang = newLang
 }
diff --git a/web/src/assets/Components/SettingsPanel/SettingsPanel.jsx b/web/src/assets/Components/SettingsPanel/SettingsPanel.jsx
@@ -147,7 +147,7 @@ export const SettingsPanel = () =>{
 
     return(
         <>
-            <div class={`relative bg-[#17191A] w-[600px] h-[650px] rounded-[25px] ease-in duration-500 z-30 ${showPanel() ? 'slideDown' : 'slideUp'}`}>
+            <div class={`relative bg-[#17191A] w-[600px] rounded-[25px] pb-4 ease-in duration-500 z-30 ${showPanel() ? 'slideDown' : 'slideUp'}`}>
                 <MainPage currentPath={currentPath} onMenuClick={handleMenuClick}/>
                 <SaveResetButtons toggleShowPanel={toggleShowPanel} showEdit={showEdit()} currentSelectedMenu={selectedMenuName()} selectedName={currentSelectedElementName()} onSaveAndResetButtonClick={handleClickSaveAndReset}/>
                 <Routes>

diff --git a/web/src/assets/translate.json b/web/src/assets/translate.json
@@ -1,5 +1,5 @@
 {
-  "EN": {
+  "en": {
     "General": {
       "status": "Status",
       "speedo": "Speedometer",
@@ -64,7 +64,7 @@
       "passengerspeedo":"Passenger speedo ON/OFF"
     }
   },
-  "DE": {
+  "de": {
     "General": {
       "status": "Status",
       "speedo": "Geschwindigkeitszähler",
@@ -129,7 +129,7 @@
       "passengerspeedo":"Beifahrer Tacho AN/AUS"
     }
   },
-  "HU": {
+  "hu": {
     "General": {
       "status": "Státusz",
       "speedo": "Sebességmérő",
@@ -194,7 +194,7 @@
       "passengerspeedo":"Kilóméter óra anyós ülésen BE/KI"
     }
   },
-  "SR": {
+  "sr": {
     "General": {
       "status": "Status",
       "speedo": "Brzinometar",

diff --git a/web/src/index.css b/web/src/index.css
@@ -27,7 +27,7 @@
   }
 
   .speedo {
-    @apply absolute bottom-0 right-8
+    @apply absolute bottom-4 right-8
   }
 
 }