From b4983d8cfd5f37c71f64df6698df24ca2670d09c Mon Sep 17 00:00:00 2001 From: jamazzz <114000467+jamazzz@users.noreply.github.com> Date: Wed, 29 Jan 2025 01:35:13 +0000 Subject: [PATCH 1/5] feat: pt locale --- locales/pt.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 locales/pt.json diff --git a/locales/pt.json b/locales/pt.json new file mode 100644 index 0000000..04cad87 --- /dev/null +++ b/locales/pt.json @@ -0,0 +1,10 @@ +{ + "locale-unit-test": "Isto é apenas uma string de teste", + "place_object": "-- Colocar Objeto -- \n", + "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" +} \ No newline at end of file From d9f4a7aaebb8afffae86ffedad15fd4745b5c38f Mon Sep 17 00:00:00 2001 From: jamazzz <114000467+jamazzz@users.noreply.github.com> Date: Wed, 29 Jan 2025 01:36:05 +0000 Subject: [PATCH 2/5] update: scroll direction locale --- locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en.json b/locales/en.json index 81b84f1..b5ee582 100644 --- a/locales/en.json +++ b/locales/en.json @@ -3,8 +3,8 @@ "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] Right \n", + "place_object_scroll_down": "[SCROLL DOWN] Left", "enter_text": "Enter Text", "no_prop_defined": "You didnt define any object to place" } \ No newline at end of file From d18c5cfe2c19d7f942d6946392471690dc7e2f9a Mon Sep 17 00:00:00 2001 From: jamazzz <114000467+jamazzz@users.noreply.github.com> Date: Wed, 29 Jan 2025 01:37:00 +0000 Subject: [PATCH 3/5] update: add missing options --- modules/locales/shared.lua | 2 +- modules/notify/client.lua | 6 +++--- modules/target/ox_target/client.lua | 2 +- modules/target/qb-target/client.lua | 2 +- settings/clientConfig.lua | 14 +++++++------- settings/serverConfig.lua | 2 +- settings/sharedConfig.lua | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/locales/shared.lua b/modules/locales/shared.lua index 7983b10..5769c70 100644 --- a/modules/locales/shared.lua +++ b/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. diff --git a/modules/notify/client.lua b/modules/notify/client.lua index 67a810d..4cebfdc 100644 --- a/modules/notify/client.lua +++ b/modules/notify/client.lua @@ -7,16 +7,16 @@ Notify.SendNotify = function(message, type, time) if notifyType == 'qb' then return TriggerEvent('QBCore:Notify', message, 'primary', time) elseif notifyType == 'mythic_notify' then - return exports['mythic_notify']:SendAlert('inform', message, time) + return exports['mythic']: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) diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua index e14021c..bcb2a75 100644 --- a/modules/target/ox_target/client.lua +++ b/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 diff --git a/modules/target/qb-target/client.lua b/modules/target/qb-target/client.lua index 3ebb5d8..cefff29 100644 --- a/modules/target/qb-target/client.lua +++ b/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 diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index cb3776c..7183189 100644 --- a/settings/clientConfig.lua +++ b/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 \ No newline at end of file diff --git a/settings/serverConfig.lua b/settings/serverConfig.lua index 932de94..4ef1c58 100644 --- a/settings/serverConfig.lua +++ b/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 diff --git a/settings/sharedConfig.lua b/settings/sharedConfig.lua index ff661f3..e30285a 100644 --- a/settings/sharedConfig.lua +++ b/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 \ No newline at end of file From 6cbb5a72f7e64155e8fdefd5683d73ff77507545 Mon Sep 17 00:00:00 2001 From: jamazzz <114000467+jamazzz@users.noreply.github.com> Date: Wed, 29 Jan 2025 01:54:27 +0000 Subject: [PATCH 4/5] update: remove place_object locale --- locales/en.json | 5 ++--- locales/pt.json | 3 +-- modules/utility/client/object_Placer.lua | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/locales/en.json b/locales/en.json index b5ee582..938e08e 100644 --- a/locales/en.json +++ b/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] Right \n", - "place_object_scroll_down": "[SCROLL DOWN] Left", + "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" } \ No newline at end of file diff --git a/locales/pt.json b/locales/pt.json index 04cad87..498a81f 100644 --- a/locales/pt.json +++ b/locales/pt.json @@ -1,9 +1,8 @@ { "locale-unit-test": "Isto é apenas uma string de teste", - "place_object": "-- Colocar Objeto -- \n", "place_object_place": "[E] Colocar \n", "place_object_cancel": "[X] Cancelar \n", - "place_object_scroll_up": "[SCROLL UP] Direita\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" diff --git a/modules/utility/client/object_Placer.lua b/modules/utility/client/object_Placer.lua index 7a40b17..73fd0c2 100644 --- a/modules/utility/client/object_Placer.lua +++ b/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'), From b8bc4f24d3580d6600d08894a321fd1c61b3a610 Mon Sep 17 00:00:00 2001 From: jamazzz <114000467+jamazzz@users.noreply.github.com> Date: Thu, 30 Jan 2025 19:03:58 +0000 Subject: [PATCH 5/5] fix: mythic_notify --- modules/notify/client.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/notify/client.lua b/modules/notify/client.lua index 4cebfdc..23308ef 100644 --- a/modules/notify/client.lua +++ b/modules/notify/client.lua @@ -6,8 +6,8 @@ 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 - return exports['mythic']:SendAlert('inform', message, time) + 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' then