fix for latest ox_lib build

SOH69 · Dec 11, 2023 · b56d9a1 · b56d9a1
1 parent 4d99c5c
commit b56d9a1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/client/event.lua b/client/event.lua
@@ -40,7 +40,7 @@ RegisterNetEvent('mm_radio:client:use', function()
         time = Radio:CalculateTimeToDisplay(),
         street = Radio:getCrossroads(),
         maxChannel = Shared.MaxFrequency,
-        locale = Radio.locale.ui
+        locale = Radio.locale
     })
 
     updateTime()

diff --git a/client/function.lua b/client/function.lua
@@ -85,7 +85,7 @@ function Radio:update()
         userData = Radio.userData,
         time = self:CalculateTimeToDisplay(),
         street = self:getCrossroads(),
-        locale = self.locale.ui
+        locale = self.locale
     })
 end
 

diff --git a/ui/src/components/body.svelte b/ui/src/components/body.svelte
@@ -56,11 +56,11 @@
         </div>
         <div class="flex flex-col">
             {#if $RADIODATA.onRadio}
-                <div class="text-white text-[1.5vh] font-bold">{$RADIODATA.locale.header}</div>
-                <div class="text-white text-[1vh] font-medium">{$RADIODATA.locale.frequency}: {$RADIODATA.channel} MHz</div>
-                <button class="bg-[#FF453AFF] w-full h-[2vh] text-white rounded-[0.3vw] font-bold flex justify-center items-center text-[1vh] mt-1" on:click={() => SendNUI('leave')}>{$RADIODATA.locale.disconnect}</button>
+                <div class="text-white text-[1.5vh] font-bold">{$RADIODATA.locale['ui.header']}</div>
+                <div class="text-white text-[1vh] font-medium">{$RADIODATA.locale['ui.frequency']}: {$RADIODATA.channel} MHz</div>
+                <button class="bg-[#FF453AFF] w-full h-[2vh] text-white rounded-[0.3vw] font-bold flex justify-center items-center text-[1vh] mt-1" on:click={() => SendNUI('leave')}>{$RADIODATA.locale['ui.disconnect']}</button>
             {:else}
-                <div class="text-white text-[1.5vh] font-bold">{$RADIODATA.locale.notconnected}</div>
+                <div class="text-white text-[1.5vh] font-bold">{$RADIODATA.locale['ui.notconnected']}</div>
             {/if}
         </div>
     </div>
@@ -81,15 +81,15 @@
     <div class="w-full rounded-[0.3vw] bg-[#18162F] flex py-4 text-white drop-shadow-md justify-between">
         <button class="grow flex flex-col justify-center items-center gap-[0.5vh]" on:click={changeTab('channel')}>
             <i class="fa-solid fa-list-ul"></i>
-            <span class="text-[0.8vh]">{$RADIODATA.locale.channels}</span>
+            <span class="text-[0.8vh]">{$RADIODATA.locale['ui.channels']}</span>
         </button>
         <button class="grow flex flex-col justify-center items-center gap-[0.5vh]" on:click={changeTab('connect')}>
             <i class="fa-solid fa-walkie-talkie"></i>
-            <span class="text-[0.8vh]">{$RADIODATA.locale.radio}</span>
+            <span class="text-[0.8vh]">{$RADIODATA.locale['ui.radio']}</span>
         </button>
         <button class="grow flex flex-col justify-center items-center gap-[0.5vh]" style="color:{$RADIODATA.onRadio? 'white':'#AAAFB4'}" disabled="{!$RADIODATA.onRadio}" on:click={changeTab('members')}>
             <i class="fa-solid fa-user-tag"></i>
-            <span class="text-[0.8vh]">{$RADIODATA.locale.members}</span>
+            <span class="text-[0.8vh]">{$RADIODATA.locale['ui.members']}</span>
         </button>
     </div>
 

diff --git a/ui/src/components/channel.svelte b/ui/src/components/channel.svelte
@@ -18,10 +18,10 @@
 <div class="w-full h-[4vh] bg-[#18162F] flex px-4 pt-2 gap-[1vh]">
     <button class="flex flex-col items-center justify-center grow gap-[0.2vh]" style="color: {currenttab=='favourite'? "white":"#212146"};" on:click={() => changeTab('favourite')}>
         <i class="fa-solid fa-star text-[1.8vh]"></i>
-        <span class="text-[0.8vh]">{$RADIODATA.locale.favorites}</span>
+        <span class="text-[0.8vh]">{$RADIODATA.locale['ui.favorites']}</span>
     </button> 
     <button class="flex flex-col items-center justify-center grow gap-[0.2vh]" style="color: {currenttab=='recomended'? "white":"#212146"};" on:click={() => changeTab('recomended')}>
         <i class="fa-solid fa-clock text-[1.8vh]"></i>
-        <span class="text-[0.8vh]">{$RADIODATA.locale.recommended}</span>
+        <span class="text-[0.8vh]">{$RADIODATA.locale['ui.recommended']}</span>
     </button>  
 </div>
diff --git a/ui/src/components/connect.svelte b/ui/src/components/connect.svelte
@@ -63,7 +63,7 @@
             <span>0</span>
         </button>
         <button class="w-[4.5vh] h-[4.5vh] rounded-full bg-[#18162F] flex justify-center items-center" on:click={() => removeNumber()}>
-            <span class="text-[1vh]">{$RADIODATA.locale.clear}</span>
+            <span class="text-[1vh]">{$RADIODATA.locale['ui.clear']}</span>
         </button>
     </div>
 </div>
diff --git a/ui/src/components/playerlist.svelte b/ui/src/components/playerlist.svelte
@@ -28,6 +28,6 @@
     </div>
 
     <div class="w-full h-[4] px-4">
-        <button class="w-full py-3 bg-[#18162F] flex justify-center items-center gap-[1vh] text-white text-[1vh] rounded-[0.3vw] font-bold drop-shadow-md" on:click={()=> showPlayerList()}>{$SHOWPLAYERLIST? $RADIODATA.locale.hide_overlay:$RADIODATA.locale.show_overlay}</button>
+        <button class="w-full py-3 bg-[#18162F] flex justify-center items-center gap-[1vh] text-white text-[1vh] rounded-[0.3vw] font-bold drop-shadow-md" on:click={()=> showPlayerList()}>{$SHOWPLAYERLIST? $RADIODATA.locale['ui.hide_overlay']:$RADIODATA.locale['ui.show_overlay']}</button>
     </div>
 {/if}