From 1979dc148bb4b0feba767c40db2dacd4a5874c68 Mon Sep 17 00:00:00 2001 From: StrixLuca <110634650+StrixLuca@users.noreply.github.com> Date: Fri, 9 Feb 2024 20:22:48 +0100 Subject: [PATCH 1/4] change to lib --- client/main.lua | 42 +++++++++++++++++++----------------------- fxmanifest.lua | 9 ++++----- locales/ar.lua | 32 -------------------------------- locales/cs.lua | 37 ------------------------------------- locales/en.json | 25 +++++++++++++++++++++++++ locales/en.lua | 29 ----------------------------- locales/es.lua | 31 ------------------------------- locales/fr.lua | 32 -------------------------------- locales/nl.json | 25 +++++++++++++++++++++++++ locales/nl.lua | 33 --------------------------------- 10 files changed, 73 insertions(+), 222 deletions(-) delete mode 100644 locales/ar.lua delete mode 100644 locales/cs.lua create mode 100644 locales/en.json delete mode 100644 locales/en.lua delete mode 100644 locales/es.lua delete mode 100644 locales/fr.lua create mode 100644 locales/nl.json delete mode 100644 locales/nl.lua diff --git a/client/main.lua b/client/main.lua index 11b122f..bbc8053 100644 --- a/client/main.lua +++ b/client/main.lua @@ -48,7 +48,7 @@ local function registerEntranceTarget() icon = 'fa-solid fa-house', type = 'client', event = 'qbx_recyclejob:client:target:enterLocation', - label = Lang:t("text.enter_warehouse"), + label = locale("text.enter_warehouse"), distance = 1 }, }, @@ -60,7 +60,7 @@ local function registerEntranceTarget() size = vec3(4.7, 1.7, 3.75), debug = config.debugPoly, onEnter = function() - lib.showTextUI(Lang:t("text.point_enter_warehouse")) + lib.showTextUI(locale("text.point_enter_warehouse")) end, onExit = function() lib.hideTextUI() @@ -90,7 +90,7 @@ local function registerExitTarget() icon = 'fa-solid fa-house', type = 'client', event = 'qbx_recyclejob:client:target:exitLocation', - label = Lang:t("text.exit_warehouse"), + label = locale("text.exit_warehouse"), distance = 1 }, }, @@ -102,7 +102,7 @@ local function registerExitTarget() size = vec3(1.55, 4.95, 3.75), debug = config.debugPoly, onEnter = function() - lib.showTextUI(Lang:t("text.point_exit_warehouse")) + lib.showTextUI(locale("text.point_exit_warehouse")) end, onExit = function() lib.hideTextUI() @@ -133,10 +133,10 @@ end local function getDutyTargetText() if config.useTarget then - local text = onDuty and Lang:t("text.clock_out") or Lang:t("text.clock_in") + local text = onDuty and locale("text.clock_out") or locale("text.clock_in") return text else - local text = onDuty and Lang:t("text.point_clock_out") or Lang:t("text.point_clock_in") + local text = onDuty and locale("text.point_clock_out") or locale("text.point_clock_in") return text end end @@ -218,7 +218,7 @@ local function registerDeliveryTarget() icon = 'fa-solid fa-house', type = 'client', event = 'qbx_recyclejob:client:target:dropPackage', - label = Lang:t("text.hand_in_package"), + label = locale("text.hand_in_package"), distance = 1 }, }, @@ -230,7 +230,7 @@ local function registerDeliveryTarget() size = vec3(0.95, 1.25, 2.5), debug = config.debugPoly, onEnter = function() - lib.showTextUI(Lang:t("text.point_hand_in_package")) + lib.showTextUI(locale("text.point_hand_in_package")) end, onExit = function() lib.hideTextUI() @@ -268,16 +268,12 @@ local function destroyInsideZones() destroyDeliveryTarget() end -local function loadAnimDict(dict) - while (not HasAnimDictLoaded(dict)) do - RequestAnimDict(dict) - Wait(5) - end -end + local function scrapAnim() local time = 5 - loadAnimDict('mp_car_bomb') + + lib.requestAnimDict('mp_car_bomb') TaskPlayAnim(cache.ped, 'mp_car_bomb', 'car_bomb_mechanic', 3.0, 3.0, -1, 16, 0, false, false, false) local openingDoor = true @@ -403,7 +399,7 @@ function RegisterPickupTarget(coords) icon = 'fa-solid fa-house', type = 'client', event = 'qbx_recyclejob:client:target:pickupPackage', - label = Lang:t("text.get_package"), + label = locale("text.get_package"), distance = 1 }, }, @@ -415,7 +411,7 @@ function RegisterPickupTarget(coords) size = vec3(2.4, 2.45, 4.0), debug = config.debugPoly, onEnter = function() - lib.showTextUI(Lang:t("text.point_get_package")) + lib.showTextUI(locale("text.point_get_package")) end, onExit = function() lib.hideTextUI() @@ -455,10 +451,10 @@ RegisterNetEvent('qbx_recyclejob:client:target:toggleDuty', function() onDuty = not onDuty if onDuty then - exports.qbx_core:Notify(Lang:t("success.you_have_been_clocked_in"), 'success') + exports.qbx_core:Notify(locale("success.you_have_been_clocked_in"), 'success') getRandomPackage() else - exports.qbx_core:Notify(Lang:t("error.you_have_clocked_out"), 'error') + exports.qbx_core:Notify(locale("error.you_have_clocked_out"), 'error') destroyPickupTarget() end @@ -479,7 +475,7 @@ RegisterNetEvent('qbx_recyclejob:client:target:pickupPackage', function() if lib.progressBar({ duration = config.pickupActionDuration, - label = Lang:t("text.picking_up_the_package"), + label = locale("text.picking_up_the_package"), useWhileDead = false, canCancel = true, disable = { @@ -496,7 +492,7 @@ RegisterNetEvent('qbx_recyclejob:client:target:pickupPackage', function() destroyPickupTarget() registerDeliveryTarget() else - exports.qbx_core:Notify(Lang:t('error.canceled'), 'error') + exports.qbx_core:Notify(locale('error.canceled'), 'error') end end) @@ -511,7 +507,7 @@ RegisterNetEvent('qbx_recyclejob:client:target:dropPackage', function() if lib.progressBar({ duration = config.deliveryActionDuration, - label = Lang:t("text.unpacking_the_package"), + label = locale("text.unpacking_the_package"), useWhileDead = false, canCancel = true, disable = { @@ -525,7 +521,7 @@ RegisterNetEvent('qbx_recyclejob:client:target:dropPackage', function() TriggerServerEvent('qbx_recycle:server:getItem') getRandomPackage() else - exports.qbx_core:Notify(Lang:t('error.canceled'), 'error') + exports.qbx_core:Notify(locale('error.canceled'), 'error') end end) diff --git a/fxmanifest.lua b/fxmanifest.lua index b68090f..1cf18df 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -4,12 +4,11 @@ game 'gta5' description 'qbx_recyclejob' repository 'https://github.com/Qbox-project/qbx_recyclejob' version '2.1.0' +ox_lib 'locale' -shared_script { +shared_scripts { '@ox_lib/init.lua', - '@qbx_core/shared/locale.lua', - 'locales/en.lua', - 'locales/*.lua', + '@qbx_core/modules/lib.lua', } server_scripts { @@ -22,7 +21,7 @@ client_scripts { files { 'config/client.lua', + 'locales/*.json', } - lua54 'yes' use_experimental_fxv2_oal 'yes' \ No newline at end of file diff --git a/locales/ar.lua b/locales/ar.lua deleted file mode 100644 index bdd2b90..0000000 --- a/locales/ar.lua +++ /dev/null @@ -1,32 +0,0 @@ -local Translations = { - success = { - you_have_been_clocked_in = 'لقد تم تسجيل دخولك', - }, - text = { - point_enter_warehouse = '[E] أدخل المستودع', - enter_warehouse= 'أدخل المستودع', - exit_warehouse= 'خروج من المستودع', - point_exit_warehouse = '[E] مستودع الخروج', - clock_out = 'تسجيل خروج', - point_clock_out = '[E] - تسجيل خروج', - clock_in = 'تسجيل دخول', - point_clock_in = '[E] - تسجيل دخول', - hand_in_package = 'تسليم حزمة', - point_hand_in_package = '[E] تسليم حزمة', - get_package = 'احصل على الحزمة', - point_get_package = '[E] احصل على الحزمة', - picking_up_the_package = 'استلام الطرد', - unpacking_the_package = 'تفريغ حزمة', - }, - error = { - you_have_clocked_out = 'لقد تم تسجيل خروج' - }, -} - -if GetConvar('qb_locale', 'en') == 'ar' then - Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true, - fallbackLang = Lang, - }) -end \ No newline at end of file diff --git a/locales/cs.lua b/locales/cs.lua deleted file mode 100644 index f2135ba..0000000 --- a/locales/cs.lua +++ /dev/null @@ -1,37 +0,0 @@ -local Translations = { - success = { - you_have_been_clocked_in = "Jste přihlášeni do práce", - }, - text = { - point_enter_warehouse = "[E] Vstoupit do skladiště", - enter_warehouse = "Vstoupit do skladiště", - exit_warehouse = "Opustit skladiště", - point_exit_warehouse = "[E] Opustit skladiště", - clock_out = "[E] Odhlásit se", - clock_in = "[E] Přihlásit se", - hand_in_package = "Odevzdat balíček", - point_hand_in_package = "[E] Odevzdat balíček", - get_package = "Získat balíček", - point_get_package = "[E] Získat balíček", - picking_up_the_package = "Zvedání balíčku", - unpacking_the_package = "Rozbalování balíčku", - }, - error = { - you_have_clocked_out = "Jste odhlášeni", - }, -} - -Lang = Lang or Locale:new({ - phrases = Translations, - warnOnMissing = true -}) - - -if GetConvar('qb_locale', 'en') == 'cs' then - Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true, - fallbackLang = Lang, - }) -end ---translate by stepan_valic \ No newline at end of file diff --git a/locales/en.json b/locales/en.json new file mode 100644 index 0000000..0becb4f --- /dev/null +++ b/locales/en.json @@ -0,0 +1,25 @@ +{ + "success": { + "you_have_been_clocked_in": "You Have Been Clocked In" + }, + "text": { + "point_enter_warehouse": "[E] - Enter Warehouse", + "enter_warehouse": "Enter Warehouse", + "exit_warehouse": "Exit Warehouse", + "point_exit_warehouse": "[E] - Exit Warehouse", + "clock_out": "Clock Out", + "point_clock_out": "[E] - Clock Out", + "clock_in": "Clock In", + "point_clock_in": "[E] - Clock In", + "hand_in_package": "Hand In Package", + "point_hand_in_package": "[E] - Hand In Package", + "get_package": "Get Package", + "point_get_package": "[E] - Get Package", + "picking_up_the_package": "Picking up the package", + "unpacking_the_package": "Unpacking the package" + }, + "error": { + "you_have_clocked_out": "You Have Clocked Out" + } + } + \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua deleted file mode 100644 index 92af1ea..0000000 --- a/locales/en.lua +++ /dev/null @@ -1,29 +0,0 @@ -local Translations = { - success = { - you_have_been_clocked_in = 'You Have Been Clocked In', - }, - text = { - point_enter_warehouse = '[E] - Enter Warehouse', - enter_warehouse = 'Enter Warehouse', - exit_warehouse = 'Exit Warehouse', - point_exit_warehouse = '[E] - Exit Warehouse', - clock_out = 'Clock Out', - point_clock_out = '[E] - Clock Out', - clock_in = 'Clock In', - point_clock_in = '[E] - Clock In', - hand_in_package = 'Hand In Package', - point_hand_in_package = '[E] - Hand In Package', - get_package = 'Get Package', - point_get_package = '[E] - Get Package', - picking_up_the_package = 'Picking up the package', - unpacking_the_package = 'Unpacking the package', - }, - error = { - you_have_clocked_out = 'You Have Clocked Out' - }, -} - -Lang = Lang or Locale:new({ - phrases = Translations, - warnOnMissing = true -}) \ No newline at end of file diff --git a/locales/es.lua b/locales/es.lua deleted file mode 100644 index f23551e..0000000 --- a/locales/es.lua +++ /dev/null @@ -1,31 +0,0 @@ -local Translations = { - success = { - you_have_been_clocked_in = 'Has registrado la entrada', - }, - text = { - point_enter_warehouse = '[E] Entrar al almacén', - enter_warehouse= 'Entrar al almacén', - exit_warehouse= 'Salir del almacén', - point_exit_warehouse = '[E] Salir del almacén', - clock_out = 'Marcar la salida', - point_clock_out = '[E] - Marcar la salida', - clock_in = 'Marcar la entrada', - point_clock_in = '[E] - Marcar la entrada', - hand_in_package = 'Paquete de mano', - point_hand_in_package = '[E] Paquete de mano', - get_package = 'Obtener paquete', - point_get_package = '[E] Obtener paquete', - picking_up_the_package = 'Recogiendo el paquete', - unpacking_the_package = 'Desempacando', - }, - error = { - you_have_clocked_out = 'Has registrado la salida' - }, -} - -if GetConvar('qb_locale', 'en') == 'es' then - Lang = Lang or Locale:new({ - phrases = Translations, - warnOnMissing = true - }) -end \ No newline at end of file diff --git a/locales/fr.lua b/locales/fr.lua deleted file mode 100644 index eee4d6f..0000000 --- a/locales/fr.lua +++ /dev/null @@ -1,32 +0,0 @@ -local Translations = { - success = { - you_have_been_clocked_in = 'Vous avez pris votre service', - }, - text = { - point_enter_warehouse = '[E] Entrer dans l\'entrepôt', - enter_warehouse= 'Entrer dans l\'entrepôt', - exit_warehouse= 'Sortir de l\'entrepôt', - point_exit_warehouse = '[E] Sortir de l\'entrepôt', - clock_out = 'Quitter son service', - point_clock_out = '[E] - Quitter son service', - clock_in = 'Prendre son service', - point_clock_in = '[E] - Prendre son service', - hand_in_package = 'Donner la boite', - point_hand_in_package = '[E] Donner la boite', - get_package = 'Prendre une boite', - point_get_package = '[E] Prendre une boite', - picking_up_the_package = 'Prend une boite..', - unpacking_the_package = 'Déballe la boite..', - }, - error = { - you_have_clocked_out = 'Vous avez quitté votre service!' - }, -} - -if GetConvar('qb_locale', 'en') == 'fr' then - Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true, - fallbackLang = Lang, - }) -end \ No newline at end of file diff --git a/locales/nl.json b/locales/nl.json new file mode 100644 index 0000000..5f3672d --- /dev/null +++ b/locales/nl.json @@ -0,0 +1,25 @@ +{ + "success": { + "you_have_been_clocked_in": "Je bent ingeklokt" + }, + "text": { + "point_exit_warehouse": "[E] Verlaat magazijn", + "point_enter_warehouse": "[E] Betreed magazijn", + "enter_warehouse": "Betreed magazijn", + "exit_warehouse": "Verlaat magazijn", + "clock_in": "Klok in", + "point_clock_in": "[E] - Klok in", + "clock_out": "Klok uit", + "point_clock_out": "[E] - Klok uit", + "point_hand_in_package": "[E] Pakket inleveren", + "hand_in_package": "Pakket inleveren", + "point_get_package": "[E] Pak pakket", + "get_package": "Pak pakket", + "picking_up_the_package": "Pakket oppakken", + "unpacking_the_package": "Pakket uitpakken" + }, + "error": { + "you_have_clocked_out": "Je bent uitgeklokt" + } + } + \ No newline at end of file diff --git a/locales/nl.lua b/locales/nl.lua deleted file mode 100644 index c4bbe4b..0000000 --- a/locales/nl.lua +++ /dev/null @@ -1,33 +0,0 @@ -local Translations = { - success = { - you_have_been_clocked_in = 'Je bent ingeklokt', - }, - text = { - point_exit_warehouse = '[E] Verlaat magazijn', - point_enter_warehouse = '[E] Betreed magazijn', - enter_warehouse= 'Betreed magazijn', - exit_warehouse= 'Verlaat magazijn', - clock_in = 'Klok in', - point_clock_in = '[E] - Klok in', - clock_out = 'Klok uit', - point_clock_out = '[E] - Klok uit', - point_hand_in_package = '[E] Pakket inleveren', - hand_in_package = 'Pakket inleveren', - point_get_package = '[E] Pak pakket', - get_package = 'Pak pakket', - picking_up_the_package = 'Pakket oppakken', - unpacking_the_package = 'Pakket uitpakken', - }, - error = { - you_have_clocked_out = 'Je bent uitgeklokt' - }, -} - - -if GetConvar('qb_locale', 'en') == 'nl' then - Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true, - fallbackLang = Lang, - }) -end \ No newline at end of file From 5c486e6be082496e1603e0eec55082d14fd22a00 Mon Sep 17 00:00:00 2001 From: StrixLuca <110634650+StrixLuca@users.noreply.github.com> Date: Fri, 9 Feb 2024 20:27:16 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f24c232..95fc89f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# qbx-recyclejob +# qbx_recyclejob Recycling Job For QBOX Project From 886371c9492c6852544aa76362cc03dedd8d8c90 Mon Sep 17 00:00:00 2001 From: solareon <769465+solareon@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:26:29 +0000 Subject: [PATCH 3/4] fix: missing locales --- locales/ar.json | 24 ++++++++++++++++++++++++ locales/cs.json | 22 ++++++++++++++++++++++ locales/es.json | 24 ++++++++++++++++++++++++ locales/fr.json | 24 ++++++++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 locales/ar.json create mode 100644 locales/cs.json create mode 100644 locales/es.json create mode 100644 locales/fr.json diff --git a/locales/ar.json b/locales/ar.json new file mode 100644 index 0000000..f681a82 --- /dev/null +++ b/locales/ar.json @@ -0,0 +1,24 @@ +{ + "success": { + "you_have_been_clocked_in": "لقد تم تسجيل دخولك" + }, + "text": { + "point_enter_warehouse": "[E] أدخل المستودع", + "enter_warehouse": "أدخل المستودع", + "exit_warehouse": "خروج من المستودع", + "point_exit_warehouse": "[E] مستودع الخروج", + "clock_out": "تسجيل خروج", + "point_clock_out": "[E] - تسجيل خروج", + "clock_in": "تسجيل دخول", + "point_clock_in": "[E] - تسجيل دخول", + "hand_in_package": "تسليم حزمة", + "point_hand_in_package": "[E] تسليم حزمة", + "get_package": "احصل على الحزمة", + "point_get_package": "[E] احصل على الحزمة", + "picking_up_the_package": "استلام الطرد", + "unpacking_the_package": "تفريغ حزمة" + }, + "error": { + "you_have_clocked_out": "لقد تم تسجيل خروج" + } +} \ No newline at end of file diff --git a/locales/cs.json b/locales/cs.json new file mode 100644 index 0000000..3d0b122 --- /dev/null +++ b/locales/cs.json @@ -0,0 +1,22 @@ +{ + "success": { + "you_have_been_clocked_in": "Jste přihlášeni do práce" + }, + "text": { + "point_enter_warehouse": "[E] Vstoupit do skladiště", + "enter_warehouse": "Vstoupit do skladiště", + "exit_warehouse": "Opustit skladiště", + "point_exit_warehouse": "[E] Opustit skladiště", + "clock_out": "[E] Odhlásit se", + "clock_in": "[E] Přihlásit se", + "hand_in_package": "Odevzdat balíček", + "point_hand_in_package": "[E] Odevzdat balíček", + "get_package": "Získat balíček", + "point_get_package": "[E] Získat balíček", + "picking_up_the_package": "Zvedání balíčku", + "unpacking_the_package": "Rozbalování balíčku" + }, + "error": { + "you_have_clocked_out": "Jste odhlášeni" + } +} \ No newline at end of file diff --git a/locales/es.json b/locales/es.json new file mode 100644 index 0000000..0b8a3c3 --- /dev/null +++ b/locales/es.json @@ -0,0 +1,24 @@ +{ + "success": { + "you_have_been_clocked_in": "Has registrado la entrada" + }, + "text": { + "point_enter_warehouse": "[E] Entrar al almacén", + "enter_warehouse": "Entrar al almacén", + "exit_warehouse": "Salir del almacén", + "point_exit_warehouse": "[E] Salir del almacén", + "clock_out": "Marcar la salida", + "point_clock_out": "[E] - Marcar la salida", + "clock_in": "Marcar la entrada", + "point_clock_in": "[E] - Marcar la entrada", + "hand_in_package": "Paquete de mano", + "point_hand_in_package": "[E] Paquete de mano", + "get_package": "Obtener paquete", + "point_get_package": "[E] Obtener paquete", + "picking_up_the_package": "Recogiendo el paquete", + "unpacking_the_package": "Desempacando" + }, + "error": { + "you_have_clocked_out": "Has registrado la salida" + } +} \ No newline at end of file diff --git a/locales/fr.json b/locales/fr.json new file mode 100644 index 0000000..2b57125 --- /dev/null +++ b/locales/fr.json @@ -0,0 +1,24 @@ +{ + "success": { + "you_have_been_clocked_in": "Vous avez pris votre service" + }, + "text": { + "point_enter_warehouse": "[E] Entrer dans l'entrepôt", + "enter_warehouse": "Entrer dans l'entrepôt", + "exit_warehouse": "Sortir de l'entrepôt", + "point_exit_warehouse": "[E] Sortir de l'entrepôt", + "clock_out": "Quitter son service", + "point_clock_out": "[E] - Quitter son service", + "clock_in": "Prendre son service", + "point_clock_in": "[E] - Prendre son service", + "hand_in_package": "Donner la boite", + "point_hand_in_package": "[E] Donner la boite", + "get_package": "Prendre une boite", + "point_get_package": "[E] Prendre une boite", + "picking_up_the_package": "Prend une boite..", + "unpacking_the_package": "Déballe la boite.." + }, + "error": { + "you_have_clocked_out": "Vous avez quitté votre service!" + } +} \ No newline at end of file From a04fe2599fc4abfad94fc1567a63f8c130e7daae Mon Sep 17 00:00:00 2001 From: solareon <769465+solareon@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:26:39 +0000 Subject: [PATCH 4/4] fix: indentation --- client/main.lua | 2 -- fxmanifest.lua | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index bbc8053..8a6fc47 100644 --- a/client/main.lua +++ b/client/main.lua @@ -268,8 +268,6 @@ local function destroyInsideZones() destroyDeliveryTarget() end - - local function scrapAnim() local time = 5 diff --git a/fxmanifest.lua b/fxmanifest.lua index 1cf18df..d9134c6 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -4,11 +4,12 @@ game 'gta5' description 'qbx_recyclejob' repository 'https://github.com/Qbox-project/qbx_recyclejob' version '2.1.0' + ox_lib 'locale' shared_scripts { '@ox_lib/init.lua', - '@qbx_core/modules/lib.lua', + '@qbx_core/modules/lib.lua', } server_scripts { @@ -20,8 +21,9 @@ client_scripts { } files { - 'config/client.lua', - 'locales/*.json', + 'config/client.lua', + 'locales/*.json', } + lua54 'yes' use_experimental_fxv2_oal 'yes' \ No newline at end of file