Merge pull request #17 from jamazzz/main

updated locales and config files

locales/en.json

@@ -1,10 +1,9 @@
 {
     "locale-unit-test": "This is a test string",
-    "place_object": "-- Place Object --  \n",
     "place_object_place": "[E] Place  \n",
     "place_object_cancel": "[X] Cancel  \n",
-    "place_object_scroll_up": "[SCROLL UP] Change Heading  \n",
-    "place_object_scroll_down": "[SCROLL DOWN] Change Heading",
+    "place_object_scroll_up": "[SCROLL UP] Turn right  \n",
+    "place_object_scroll_down": "[SCROLL DOWN] Turn left",
     "enter_text": "Enter Text",
     "no_prop_defined": "You didnt define any object to place"
 }

locales/pt.json

@@ -0,0 +1,9 @@
+{
+    "locale-unit-test": "Isto é apenas uma string de teste",
+    "place_object_place": "[E] Colocar  \n",
+    "place_object_cancel": "[X] Cancelar  \n",
+    "place_object_scroll_up": "[SCROLL UP] Direita\n",
+    "place_object_scroll_down": "[SCROLL DOWN] Esquerda",
+    "enter_text": "Inserir Texto",
+    "no_prop_defined": "Não definiu nenhum objeto para colocar"
+}

modules/locales/shared.lua

@@ -40,7 +40,7 @@ function Language.Locale(str, ...)
     return locale
 end
 
-if BridgeSharedConfig.DebugLevel == 3 then
+if BridgeSharedConfig.DebugLevel == 2 then
     -- if outside this resource, use local whatever = Require("modules/locales/shared.lua")
     -- whatever.Locales("some-index-in-language-.json-file")
     -- Files must be stored in "locales" folder, within the resource.

modules/notify/client.lua

@@ -6,17 +6,17 @@ Notify.SendNotify = function(message, type, time)
     time = time or 3000
     if notifyType == 'qb' then
         return TriggerEvent('QBCore:Notify', message, 'primary', time)
-    elseif notifyType == 'mythic_notify' then
+    elseif notifyType == 'mythic' then
         return exports['mythic_notify']:SendAlert('inform', message, time)
     elseif notifyType == 'pNotify' then
         return exports['pNotify']:SendNotification({ text = message, type = type, timeout = time, layout = 'centerRight' })
-    elseif notifyType == 'esx_notify' then
+    elseif notifyType == 'esx' then
         return ESX.ShowNotification(message, type, time)
     elseif notifyType == 'ox' then
         return exports.ox_lib:notify({ description = message, type = type, position = 'center-left' })
     elseif notifyType == 't-notify' then
         return exports['t-notify']:Alert({ style = 'info', message = message, duration = time, })
-    elseif notifyType == 'wasabi_notify' then
+    elseif notifyType == 'wasabi' then
         return exports.wasabi_notify:notify(type, message, time, type)
     elseif notifyType == 'lab' then
         return exports['swe-notify']:SendNotification(message, time, type)

modules/target/ox_target/client.lua

@@ -2,7 +2,7 @@ if GetResourceState('ox_target') ~= 'started' then return end
 
 local targetDebug = false
 local function detectDebugEnabled()
-    if BridgeClientConfig.DebugLevel == 3 then
+    if BridgeClientConfig.DebugLevel == 2 then
         targetDebug = true
     end
 end

modules/target/qb-target/client.lua

@@ -2,7 +2,7 @@ if GetResourceState('qb-target') ~= 'started' or GetResourceState('ox_target') =
 
 local targetDebug = false
 local function detectDebugEnabled()
-    if BridgeClientConfig.DebugLevel == 3 then
+    if BridgeClientConfig.DebugLevel == 2 then
         targetDebug = true
     end
 end

modules/utility/client/object_Placer.lua

@@ -5,7 +5,6 @@ lib.locale()
 
 -- Object placer --
 local placementText = {
-    locale('place_object'),
     locale('place_object_place'),
     locale('place_object_cancel'),
     locale('place_object_scroll_up'),

settings/clientConfig.lua

@@ -1,10 +1,10 @@
 BridgeClientConfig = {}
-BridgeClientConfig.NotifySystem    = "ox"         -- Change this to your notification system (ox/qb/esx?)
-BridgeClientConfig.ZoneSystem      = "ox"         -- Change this to your dialog system (ox/poly)
-BridgeClientConfig.InputSystem     = "auto"         -- Change this to your Input system (ox/qb)
-BridgeClientConfig.MenuSystem      = "auto"       -- Change this to your Menu system (ox/qb)
-BridgeClientConfig.ProgressBar     = "ox"         -- Change this to your preferred progress bar (ox/qb)
-BridgeClientConfig.DebugLevel      = 3            -- Change this to your Debug level, 1 for none, 2 for some, 3 for all data
-BridgeClientConfig.ShowHelpText    = "ox"         --
+BridgeClientConfig.DebugLevel      = 2            -- Debug level, 0 for none, 1 for some, 2 for all data
+BridgeClientConfig.NotifySystem    = "ox"         -- [ ox | qb | esx | mythic | pNotify | t-notify | wasabi | lab | custom ]
+BridgeClientConfig.ShowHelpText    = "ox"         -- [ox | jg | qb | lab | custom ]
+BridgeClientConfig.InputSystem     = "auto"       -- [ auto | ox | qb ]
+BridgeClientConfig.MenuSystem      = "auto"       -- [ auto | ox | qb ]
+BridgeClientConfig.ZoneSystem      = "ox"         -- [ ox | poly ]
+BridgeClientConfig.ProgressBar     = "ox"         -- [ ox | qb ]
 
 return BridgeClientConfig

settings/serverConfig.lua

@@ -1,5 +1,5 @@
 BridgeServerConfig = {}
-BridgeServerConfig.LogSystem = "builtin" -- "builtin", "qb", "ox"
+BridgeServerConfig.LogSystem = "builtin" -- [ builtin | qb | ox ]
 BridgeServerConfig.WebhookURL = "PUT_WEBHOOK_URL_HERE"
 BridgeServerConfig.WebhookImage = "https://cdn.discordapp.com/avatars/299410129982455808/31ce635662206e8bd0132c34ce9ce683?size=1024"
 BridgeServerConfig.MaxInventorySlots = 50

settings/sharedConfig.lua

@@ -1,5 +1,5 @@
 BridgeSharedConfig = {}
 BridgeSharedConfig.Lang          = "auto"        -- Change this to your preferred language (must match the locale file name ex. en or fr etc)
-BridgeSharedConfig.DebugLevel    = 3            -- Change this to your Debug level, 1 for none, 2 for some, 3 for all data
+BridgeSharedConfig.DebugLevel    = 2             -- Change this to your Debug level, 0 for none, 1 for some, 2 for all data
 
 return BridgeSharedConfig