From bf607d3490ac40f15416bc18419ce646acf7c2cf Mon Sep 17 00:00:00 2001 From: Cpt_NoHand <90973107+CptNoHand@users.noreply.github.com> Date: Thu, 1 Sep 2022 16:21:41 +0200 Subject: [PATCH 01/18] Update de.lua sounds better like this --- locale/de.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/de.lua b/locale/de.lua index 6efd915..2b4bffb 100644 --- a/locale/de.lua +++ b/locale/de.lua @@ -25,15 +25,15 @@ local Translations = { }, info = { received_paycheck = 'Du hast dein Gehalt in Höhe von $%{value} erhalten', - job_info = 'Job: %{value} | Dienstgrad: %{value2} | im Dienst: %{value3}', + job_info = 'Beruf: %{value} | Dienstgrad: %{value2} | im Dienst: %{value3}', gang_info = 'Gang: %{value} | Rang: %{value2}', - on_duty = 'Du bist nun im Dienst!', - off_duty = 'Du bist nun nicht mehr im Dienst!', - checking_ban = 'Hallo %s. Wir checken, ob du gebannt wurdest.', - join_server = 'Willkommen %s zu {Server Name}.', - checking_whitelisted = 'Hallo %s. Wir checken deine Erlaubnis.', + on_duty = 'Du bist jetzt im Dienst!', + off_duty = 'Du bist jetzt nicht mehr im Dienst!', + checking_ban = 'Hallo %s. Wir prüfen, ob du gebannt wurdest.', + join_server = 'Willkommen %s bei {Server Name}.', + checking_whitelisted = 'Hallo %s. Wir prüfen deine Erlaubnis.', exploit_banned = 'Du wurdest fürs Cheaten gebannt. Meld dich auf dem Discord: %{discord}', - exploit_dropped = 'Du wurdest gekickt für das Ausnutzen von Fehlern', + exploit_dropped = 'Du wurdest gekickt, für das Ausnutzen von Fehlern', }, command = { tp = { From c6bca6caa4c2c094e851a78b0acc3b630df379d8 Mon Sep 17 00:00:00 2001 From: kierwin1987 <37836859+kierwin1987@users.noreply.github.com> Date: Sat, 3 Sep 2022 22:01:40 +0200 Subject: [PATCH 02/18] Update cs.lua added command section and success section --- locale/cs.lua | 89 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/locale/cs.lua b/locale/cs.lua index 616c13d..2ebea1c 100644 --- a/locale/cs.lua +++ b/locale/cs.lua @@ -12,7 +12,11 @@ local Translations = { no_valid_license = 'Nebyla nalezena žádná platná Rockstar licence', not_whitelisted = 'Nejste na whitelistu' }, - success = {}, + success = { + server_opened = 'Server byl otevřen', + server_closed = 'Server byl uzavřen', + teleported_waypoint = 'Teleportováno na Waypoint.', + }, info = { received_paycheck = 'Obdrželi jste výplatu v hodnotě $%{value}', job_info = 'Práce: %{value} | Pozice: %{value2} | Ve službě: %{value3}', @@ -22,7 +26,88 @@ local Translations = { checking_ban = 'Ahoj %s. Kontrolujeme zda nejste zabanováni.', join_server = 'Vítejte %s na {Server Name}.', checking_whitelisted = 'Ahoj %s. Kontrolujeme zda máte přístup.' - } + }, + command = { + tp = { + help = 'Teleport k hráči nebo na souřadnice (Pouze Admin)', + params = { + x = { name = 'id/x', help = 'ID hráče or X pozice'}, + y = { name = 'y', help = 'Y pozice'}, + z = { name = 'z', help = 'Z pozice'}, + }, + }, + tpm = { help = 'TP Na Marker (pouze Admin)' }, + togglepvp = { help = 'Přepnutí PVP na serveru (Pouze Admin)' }, + addpermission = { + help = 'Dej hráči oprávnění (God Pouze)', + params = { + id = { name = 'id', help = 'ID hráčer' }, + permission = { name = 'permission', help = 'Úroveň oprávnění' }, + }, + }, + removepermission = { + help = 'Odstraň hráči oprávnění (God Pouze)', + params = { + id = { name = 'id', help = 'ID hráče' }, + permission = { name = 'permission', help = 'Úroveň oprávnění' }, + }, + }, + openserver = { help = 'Otevři server pro všechny (Pouze Admin)' }, + closeserver = { + help = 'Uzavři server pro všechny bez práv (Pouze Admin)', + params = { + reason = { name = 'reason', help = 'Důdov pro uzavření (optimální)' }, + }, + }, + car = { + help = 'Spawn Vozidla (Pouze Admin)', + params = { + model = { name = 'model', help = 'Jméno modelu vozidla' }, + }, + }, + dv = { help = 'Odstraň vozidlo (Pouze Admin)' }, + givemoney = { + help = 'Dej hráči peníze (Pouze Admin)', + params = { + id = { name = 'id', help = 'ID hráče' }, + moneytype = { name = 'moneytype', help = 'Typ (hotovost, banka, krypto)' }, + amount = { name = 'amount', help = 'Počet peněz' }, + }, + }, + setmoney = { + help = 'Nastav hráči peníze (Pouze Admin)', + params = { + id = { name = 'id', help = 'ID hráče' }, + moneytype = { name = 'moneytype', help = 'Typ (hotovost, banka, krypto)' }, + amount = { name = 'amount', help = 'Počet peněz' }, + }, + }, + job = { help = 'Zkontroluj si práci' }, + setjob = { + help = 'Nastav hráči práci (Pouze Admin)', + params = { + id = { name = 'id', help = 'ID hráče' }, + job = { name = 'job', help = 'Jméno práce' }, + grade = { name = 'grade', help = 'Jméno hodnosti' }, + }, + }, + gang = { help = 'Zkontroluj si gang' }, + setgang = { + help = 'Nastav hráči gang (Pouze Admin)', + params = { + id = { name = 'id', help = 'ID hráče' }, + gang = { name = 'gang', help = 'Jméno gangu' }, + grade = { name = 'grade', help = 'Pozice v gangu' }, + }, + }, + ooc = { help = 'OOC Chat' }, + me = { + help = 'Ukaž zprávu', + params = { + message = { name = 'message', help = 'Zpráva k odeslání' } + }, + }, + }, } Lang = Locale:new({ From 1a3aa824fafb7b02a2c3c9b8c0fb6883d94e9875 Mon Sep 17 00:00:00 2001 From: David Malchin Date: Sun, 4 Sep 2022 00:46:21 +0300 Subject: [PATCH 03/18] Add locale convar and locale fallback --- fxmanifest.lua | 3 ++- locale/ar.lua | 11 +++++++---- locale/bg.lua | 11 +++++++---- locale/cn.lua | 11 +++++++---- locale/cs.lua | 11 +++++++---- locale/da.lua | 11 +++++++---- locale/de.lua | 11 +++++++---- locale/ee.lua | 11 +++++++---- locale/en.lua | 2 +- locale/es.lua | 11 +++++++---- locale/et.lua | 11 +++++++---- locale/fa.lua | 11 +++++++---- locale/fi.lua | 11 +++++++---- locale/fr.lua | 11 +++++++---- locale/ge.lua | 11 +++++++---- locale/he.lua | 12 ++++++++---- locale/hu.lua | 11 +++++++---- locale/in.lua | 11 +++++++---- locale/is.lua | 11 +++++++---- locale/it.lua | 11 +++++++---- locale/lv.lua | 11 +++++++---- locale/nl.lua | 11 +++++++---- locale/pl.lua | 11 +++++++---- locale/pt-br.lua | 11 +++++++---- locale/pt.lua | 11 +++++++---- locale/ro.lua | 11 +++++++---- locale/rs.lua | 11 +++++++---- locale/ru.lua | 11 +++++++---- locale/sl.lua | 11 +++++++---- locale/sv.lua | 11 +++++++---- locale/th.lua | 11 +++++++---- locale/tr.lua | 11 +++++++---- locale/vn.lua | 11 +++++++---- shared/locale.lua | 11 ++++++++++- 34 files changed, 231 insertions(+), 127 deletions(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index f4f5cc7..4ffd5bc 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -7,7 +7,8 @@ version '1.1.0' shared_scripts { 'config.lua', 'shared/locale.lua', - 'locale/en.lua', -- replace with desired language + 'locale/en.lua', + 'locale/*.lua', 'shared/main.lua', 'shared/items.lua', 'shared/jobs.lua', diff --git a/locale/ar.lua b/locale/ar.lua index d324072..ee91e13 100644 --- a/locale/ar.lua +++ b/locale/ar.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'ar' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/bg.lua b/locale/bg.lua index 547139a..b2891f3 100644 --- a/locale/bg.lua +++ b/locale/bg.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) \ No newline at end of file +if GetConvar('qb_locale', 'en') == 'bg' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/cn.lua b/locale/cn.lua index b0dd4bb..19d23b7 100644 --- a/locale/cn.lua +++ b/locale/cn.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'cn' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/cs.lua b/locale/cs.lua index 616c13d..31f9780 100644 --- a/locale/cs.lua +++ b/locale/cs.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'cs' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/da.lua b/locale/da.lua index 8476592..ff5730c 100644 --- a/locale/da.lua +++ b/locale/da.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) \ No newline at end of file +if GetConvar('qb_locale', 'en') == 'da' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/de.lua b/locale/de.lua index 6efd915..74c851c 100644 --- a/locale/de.lua +++ b/locale/de.lua @@ -118,7 +118,10 @@ local Translations = { }, } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'de' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/ee.lua b/locale/ee.lua index 8bd5da0..5d57f0f 100644 --- a/locale/ee.lua +++ b/locale/ee.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'ee' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/en.lua b/locale/en.lua index bb5d8c3..a41748e 100644 --- a/locale/en.lua +++ b/locale/en.lua @@ -118,7 +118,7 @@ local Translations = { }, } -Lang = Locale:new({ +Lang = Lang or Locale:new({ phrases = Translations, warnOnMissing = true }) diff --git a/locale/es.lua b/locale/es.lua index 93e4efd..b55ff56 100644 --- a/locale/es.lua +++ b/locale/es.lua @@ -30,7 +30,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'es' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/et.lua b/locale/et.lua index 98802c9..803c4ab 100644 --- a/locale/et.lua +++ b/locale/et.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'et' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/fa.lua b/locale/fa.lua index f163a8c..1367dac 100644 --- a/locale/fa.lua +++ b/locale/fa.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'fa' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/fi.lua b/locale/fi.lua index 6797b2c..b4e4939 100644 --- a/locale/fi.lua +++ b/locale/fi.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'fi' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/fr.lua b/locale/fr.lua index 534fca8..3e011c3 100644 --- a/locale/fr.lua +++ b/locale/fr.lua @@ -120,7 +120,10 @@ local Translations = { }, } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'fr' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/ge.lua b/locale/ge.lua index 33b463a..e105039 100644 --- a/locale/ge.lua +++ b/locale/ge.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'ge' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/he.lua b/locale/he.lua index 7248f4b..fb84e7f 100644 --- a/locale/he.lua +++ b/locale/he.lua @@ -118,7 +118,11 @@ local Translations = { }, } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'he' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end + diff --git a/locale/hu.lua b/locale/hu.lua index ca832ef..a0cd8b9 100644 --- a/locale/hu.lua +++ b/locale/hu.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) \ No newline at end of file +if GetConvar('qb_locale', 'en') == 'hu' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/in.lua b/locale/in.lua index 3897291..ecb3403 100644 --- a/locale/in.lua +++ b/locale/in.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'in' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/is.lua b/locale/is.lua index 4d956ba..8384930 100644 --- a/locale/is.lua +++ b/locale/is.lua @@ -118,7 +118,10 @@ local Translations = { }, } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'is' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/it.lua b/locale/it.lua index 99ad1d6..ea81719 100644 --- a/locale/it.lua +++ b/locale/it.lua @@ -123,7 +123,10 @@ error = { }, } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'it' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/lv.lua b/locale/lv.lua index c7b4c38..fe4a9ab 100644 --- a/locale/lv.lua +++ b/locale/lv.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'lv' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/nl.lua b/locale/nl.lua index fd19d57..3d6e6bc 100644 --- a/locale/nl.lua +++ b/locale/nl.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'nl' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/pl.lua b/locale/pl.lua index 5e1704c..ab67f9b 100644 --- a/locale/pl.lua +++ b/locale/pl.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'pl' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/pt-br.lua b/locale/pt-br.lua index 9621437..782a4e8 100644 --- a/locale/pt-br.lua +++ b/locale/pt-br.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'pt-br' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/pt.lua b/locale/pt.lua index 0fc86a7..8cbfebf 100644 --- a/locale/pt.lua +++ b/locale/pt.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'pt' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/ro.lua b/locale/ro.lua index 162282f..d36cf65 100644 --- a/locale/ro.lua +++ b/locale/ro.lua @@ -115,7 +115,10 @@ local Translations = { }, } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'ro' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/rs.lua b/locale/rs.lua index bf20832..4dc9dc7 100644 --- a/locale/rs.lua +++ b/locale/rs.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'rs' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/ru.lua b/locale/ru.lua index 762899e..a4e5167 100644 --- a/locale/ru.lua +++ b/locale/ru.lua @@ -118,7 +118,10 @@ local Translations = { }, } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'ru' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/sl.lua b/locale/sl.lua index c9ed1ba..e1ead5c 100644 --- a/locale/sl.lua +++ b/locale/sl.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'sl' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/sv.lua b/locale/sv.lua index d43e289..2cad441 100644 --- a/locale/sv.lua +++ b/locale/sv.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'sv' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/th.lua b/locale/th.lua index c070c7a..f665d1f 100644 --- a/locale/th.lua +++ b/locale/th.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'th' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/tr.lua b/locale/tr.lua index 51e50d7..9acc97e 100644 --- a/locale/tr.lua +++ b/locale/tr.lua @@ -25,7 +25,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'tr' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/locale/vn.lua b/locale/vn.lua index 94003d5..f3ae841 100644 --- a/locale/vn.lua +++ b/locale/vn.lua @@ -19,7 +19,10 @@ local Translations = { } } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'vn' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end diff --git a/shared/locale.lua b/shared/locale.lua index c24376c..ce7b2f5 100644 --- a/shared/locale.lua +++ b/shared/locale.lua @@ -32,7 +32,13 @@ end --- @return Locale function Locale:new(opts) setmetatable(self, Locale) - self.warnOnMissing = opts.warnOnMissing or true + + self.fallback = opts.fallbackLang and Locale.new({}, { + warnOnMissing = false, + phrases = opts.fallbackLang.phrases, + }) or false + + self.warnOnMissing = type(opts.warnOnMissing) ~= 'boolean' and true or opts.warnOnMissing self.phrases = {} self:extend(opts.phrases or {}) @@ -98,6 +104,9 @@ function Locale:t(key, subs) if self.warnOnMissing then print(('^3Warning: Missing phrase for key: "%s"'):format(key)) end + if self.fallback then + return self.fallback:t(key, subs) + end result = key end From 6555673ad0c9186722270dc01d3cbc0f335f4b16 Mon Sep 17 00:00:00 2001 From: kierwin1987 <37836859+kierwin1987@users.noreply.github.com> Date: Sun, 4 Sep 2022 10:48:06 +0200 Subject: [PATCH 04/18] Revert "Update cs.lua" This reverts commit c6bca6caa4c2c094e851a78b0acc3b630df379d8. --- locale/cs.lua | 89 ++------------------------------------------------- 1 file changed, 2 insertions(+), 87 deletions(-) diff --git a/locale/cs.lua b/locale/cs.lua index 2ebea1c..616c13d 100644 --- a/locale/cs.lua +++ b/locale/cs.lua @@ -12,11 +12,7 @@ local Translations = { no_valid_license = 'Nebyla nalezena žádná platná Rockstar licence', not_whitelisted = 'Nejste na whitelistu' }, - success = { - server_opened = 'Server byl otevřen', - server_closed = 'Server byl uzavřen', - teleported_waypoint = 'Teleportováno na Waypoint.', - }, + success = {}, info = { received_paycheck = 'Obdrželi jste výplatu v hodnotě $%{value}', job_info = 'Práce: %{value} | Pozice: %{value2} | Ve službě: %{value3}', @@ -26,88 +22,7 @@ local Translations = { checking_ban = 'Ahoj %s. Kontrolujeme zda nejste zabanováni.', join_server = 'Vítejte %s na {Server Name}.', checking_whitelisted = 'Ahoj %s. Kontrolujeme zda máte přístup.' - }, - command = { - tp = { - help = 'Teleport k hráči nebo na souřadnice (Pouze Admin)', - params = { - x = { name = 'id/x', help = 'ID hráče or X pozice'}, - y = { name = 'y', help = 'Y pozice'}, - z = { name = 'z', help = 'Z pozice'}, - }, - }, - tpm = { help = 'TP Na Marker (pouze Admin)' }, - togglepvp = { help = 'Přepnutí PVP na serveru (Pouze Admin)' }, - addpermission = { - help = 'Dej hráči oprávnění (God Pouze)', - params = { - id = { name = 'id', help = 'ID hráčer' }, - permission = { name = 'permission', help = 'Úroveň oprávnění' }, - }, - }, - removepermission = { - help = 'Odstraň hráči oprávnění (God Pouze)', - params = { - id = { name = 'id', help = 'ID hráče' }, - permission = { name = 'permission', help = 'Úroveň oprávnění' }, - }, - }, - openserver = { help = 'Otevři server pro všechny (Pouze Admin)' }, - closeserver = { - help = 'Uzavři server pro všechny bez práv (Pouze Admin)', - params = { - reason = { name = 'reason', help = 'Důdov pro uzavření (optimální)' }, - }, - }, - car = { - help = 'Spawn Vozidla (Pouze Admin)', - params = { - model = { name = 'model', help = 'Jméno modelu vozidla' }, - }, - }, - dv = { help = 'Odstraň vozidlo (Pouze Admin)' }, - givemoney = { - help = 'Dej hráči peníze (Pouze Admin)', - params = { - id = { name = 'id', help = 'ID hráče' }, - moneytype = { name = 'moneytype', help = 'Typ (hotovost, banka, krypto)' }, - amount = { name = 'amount', help = 'Počet peněz' }, - }, - }, - setmoney = { - help = 'Nastav hráči peníze (Pouze Admin)', - params = { - id = { name = 'id', help = 'ID hráče' }, - moneytype = { name = 'moneytype', help = 'Typ (hotovost, banka, krypto)' }, - amount = { name = 'amount', help = 'Počet peněz' }, - }, - }, - job = { help = 'Zkontroluj si práci' }, - setjob = { - help = 'Nastav hráči práci (Pouze Admin)', - params = { - id = { name = 'id', help = 'ID hráče' }, - job = { name = 'job', help = 'Jméno práce' }, - grade = { name = 'grade', help = 'Jméno hodnosti' }, - }, - }, - gang = { help = 'Zkontroluj si gang' }, - setgang = { - help = 'Nastav hráči gang (Pouze Admin)', - params = { - id = { name = 'id', help = 'ID hráče' }, - gang = { name = 'gang', help = 'Jméno gangu' }, - grade = { name = 'grade', help = 'Pozice v gangu' }, - }, - }, - ooc = { help = 'OOC Chat' }, - me = { - help = 'Ukaž zprávu', - params = { - message = { name = 'message', help = 'Zpráva k odeslání' } - }, - }, - }, + } } Lang = Locale:new({ From 93ad2bcd338b4a7bcf566b0eb67d5b5e632933a3 Mon Sep 17 00:00:00 2001 From: kierwin1987 <37836859+kierwin1987@users.noreply.github.com> Date: Sun, 4 Sep 2022 10:48:30 +0200 Subject: [PATCH 05/18] Revert "Revert "Update cs.lua"" This reverts commit 6555673ad0c9186722270dc01d3cbc0f335f4b16. --- locale/cs.lua | 89 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/locale/cs.lua b/locale/cs.lua index 616c13d..2ebea1c 100644 --- a/locale/cs.lua +++ b/locale/cs.lua @@ -12,7 +12,11 @@ local Translations = { no_valid_license = 'Nebyla nalezena žádná platná Rockstar licence', not_whitelisted = 'Nejste na whitelistu' }, - success = {}, + success = { + server_opened = 'Server byl otevřen', + server_closed = 'Server byl uzavřen', + teleported_waypoint = 'Teleportováno na Waypoint.', + }, info = { received_paycheck = 'Obdrželi jste výplatu v hodnotě $%{value}', job_info = 'Práce: %{value} | Pozice: %{value2} | Ve službě: %{value3}', @@ -22,7 +26,88 @@ local Translations = { checking_ban = 'Ahoj %s. Kontrolujeme zda nejste zabanováni.', join_server = 'Vítejte %s na {Server Name}.', checking_whitelisted = 'Ahoj %s. Kontrolujeme zda máte přístup.' - } + }, + command = { + tp = { + help = 'Teleport k hráči nebo na souřadnice (Pouze Admin)', + params = { + x = { name = 'id/x', help = 'ID hráče or X pozice'}, + y = { name = 'y', help = 'Y pozice'}, + z = { name = 'z', help = 'Z pozice'}, + }, + }, + tpm = { help = 'TP Na Marker (pouze Admin)' }, + togglepvp = { help = 'Přepnutí PVP na serveru (Pouze Admin)' }, + addpermission = { + help = 'Dej hráči oprávnění (God Pouze)', + params = { + id = { name = 'id', help = 'ID hráčer' }, + permission = { name = 'permission', help = 'Úroveň oprávnění' }, + }, + }, + removepermission = { + help = 'Odstraň hráči oprávnění (God Pouze)', + params = { + id = { name = 'id', help = 'ID hráče' }, + permission = { name = 'permission', help = 'Úroveň oprávnění' }, + }, + }, + openserver = { help = 'Otevři server pro všechny (Pouze Admin)' }, + closeserver = { + help = 'Uzavři server pro všechny bez práv (Pouze Admin)', + params = { + reason = { name = 'reason', help = 'Důdov pro uzavření (optimální)' }, + }, + }, + car = { + help = 'Spawn Vozidla (Pouze Admin)', + params = { + model = { name = 'model', help = 'Jméno modelu vozidla' }, + }, + }, + dv = { help = 'Odstraň vozidlo (Pouze Admin)' }, + givemoney = { + help = 'Dej hráči peníze (Pouze Admin)', + params = { + id = { name = 'id', help = 'ID hráče' }, + moneytype = { name = 'moneytype', help = 'Typ (hotovost, banka, krypto)' }, + amount = { name = 'amount', help = 'Počet peněz' }, + }, + }, + setmoney = { + help = 'Nastav hráči peníze (Pouze Admin)', + params = { + id = { name = 'id', help = 'ID hráče' }, + moneytype = { name = 'moneytype', help = 'Typ (hotovost, banka, krypto)' }, + amount = { name = 'amount', help = 'Počet peněz' }, + }, + }, + job = { help = 'Zkontroluj si práci' }, + setjob = { + help = 'Nastav hráči práci (Pouze Admin)', + params = { + id = { name = 'id', help = 'ID hráče' }, + job = { name = 'job', help = 'Jméno práce' }, + grade = { name = 'grade', help = 'Jméno hodnosti' }, + }, + }, + gang = { help = 'Zkontroluj si gang' }, + setgang = { + help = 'Nastav hráči gang (Pouze Admin)', + params = { + id = { name = 'id', help = 'ID hráče' }, + gang = { name = 'gang', help = 'Jméno gangu' }, + grade = { name = 'grade', help = 'Pozice v gangu' }, + }, + }, + ooc = { help = 'OOC Chat' }, + me = { + help = 'Ukaž zprávu', + params = { + message = { name = 'message', help = 'Zpráva k odeslání' } + }, + }, + }, } Lang = Locale:new({ From 7aefc17c2b271f90725131efa497303b63e7f9ce Mon Sep 17 00:00:00 2001 From: Anton Stjernquist <32514829+antonstjernquist@users.noreply.github.com> Date: Wed, 7 Sep 2022 22:43:58 +0200 Subject: [PATCH 06/18] feat: send reason with event --- server/player.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/player.lua b/server/player.lua index 9ea25d8..cac2dfe 100644 --- a/server/player.lua +++ b/server/player.lua @@ -297,8 +297,8 @@ function QBCore.Player.CreatePlayer(PlayerData, Offline) TriggerEvent('qb-log:server:CreateLog', 'playermoney', 'AddMoney', 'lightgreen', '**' .. GetPlayerName(self.PlayerData.source) .. ' (citizenid: ' .. self.PlayerData.citizenid .. ' | id: ' .. self.PlayerData.source .. ')** $' .. amount .. ' (' .. moneytype .. ') added, new ' .. moneytype .. ' balance: ' .. self.PlayerData.money[moneytype] .. ' reason: ' .. reason) end TriggerClientEvent('hud:client:OnMoneyChange', self.PlayerData.source, moneytype, amount, false) - TriggerClientEvent('QBCore:Client:OnMoneyChange', self.PlayerData.source, moneytype, amount, "add") - TriggerEvent('QBCore:Server:OnMoneyChange', self.PlayerData.source, moneytype, amount, "add") + TriggerClientEvent('QBCore:Client:OnMoneyChange', self.PlayerData.source, moneytype, amount, "add", reason) + TriggerEvent('QBCore:Server:OnMoneyChange', self.PlayerData.source, moneytype, amount, "add", reason) end return true @@ -330,8 +330,8 @@ function QBCore.Player.CreatePlayer(PlayerData, Offline) if moneytype == 'bank' then TriggerClientEvent('qb-phone:client:RemoveBankMoney', self.PlayerData.source, amount) end - TriggerClientEvent('QBCore:Client:OnMoneyChange', self.PlayerData.source, moneytype, amount, "remove") - TriggerEvent('QBCore:Server:OnMoneyChange', self.PlayerData.source, moneytype, amount, "remove") + TriggerClientEvent('QBCore:Client:OnMoneyChange', self.PlayerData.source, moneytype, amount, "remove", reason) + TriggerEvent('QBCore:Server:OnMoneyChange', self.PlayerData.source, moneytype, amount, "remove", reason) end return true @@ -350,8 +350,8 @@ function QBCore.Player.CreatePlayer(PlayerData, Offline) self.Functions.UpdatePlayerData() TriggerEvent('qb-log:server:CreateLog', 'playermoney', 'SetMoney', 'green', '**' .. GetPlayerName(self.PlayerData.source) .. ' (citizenid: ' .. self.PlayerData.citizenid .. ' | id: ' .. self.PlayerData.source .. ')** $' .. amount .. ' (' .. moneytype .. ') set, new ' .. moneytype .. ' balance: ' .. self.PlayerData.money[moneytype] .. ' reason: ' .. reason) TriggerClientEvent('hud:client:OnMoneyChange', self.PlayerData.source, moneytype, math.abs(difference), difference < 0) - TriggerClientEvent('QBCore:Client:OnMoneyChange', self.PlayerData.source, moneytype, amount, "set") - TriggerEvent('QBCore:Server:OnMoneyChange', self.PlayerData.source, moneytype, amount, "set") + TriggerClientEvent('QBCore:Client:OnMoneyChange', self.PlayerData.source, moneytype, amount, "set", reason) + TriggerEvent('QBCore:Server:OnMoneyChange', self.PlayerData.source, moneytype, amount, "set", reason) end return true From 610ac2fa696fe90efdd1dbdac15501428feca57c Mon Sep 17 00:00:00 2001 From: Jean Carlos NUnez <3299025+jeann2013@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:25:14 -0500 Subject: [PATCH 07/18] update translate to Spanish --- locale/es.lua | 96 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 4 deletions(-) diff --git a/locale/es.lua b/locale/es.lua index b55ff56..0751e45 100644 --- a/locale/es.lua +++ b/locale/es.lua @@ -8,15 +8,20 @@ local Translations = { company_too_poor = 'Tu empleador está en bancarrota', item_not_exist = 'El objeto no existe', too_heavy = 'No hay espacio en tu inventario', + location_not_exist = 'La ubicación no existe', duplicate_license = 'Licencia de Rockstar duplicada', no_valid_license = 'No tienes una licencia de Rockstar válida', not_whitelisted = 'No tienes acceso a este servidor', server_already_open = 'El servidor ya está abierto', - server_already_closed = 'El servidor ya está cerrado' + server_already_closed = 'El servidor ya está cerrado', + no_permission = 'No tienes permisos para esto..', + no_waypoint = 'No hay waypoint establecido.', + tp_error = 'Error mientras se teletransporta.', }, success = { server_opened = 'El servidor ha sido abierto', - server_closed = 'El servidor ha sido cerrado' + server_closed = 'El servidor ha sido cerrado', + teleported_waypoint = 'Teletransportado a punto de encuentro.', }, info = { received_paycheck = 'Has recibido tu salario de $%{value}', @@ -26,8 +31,91 @@ local Translations = { off_duty = '¡Estás fuera de servicio!', checking_ban = 'Hola %s. Estamos revisando la lista de baneos.', join_server = 'Bienvenid@ a {Server Name}, %s.', - checking_whitelisted = 'Hola %s. Estamos revisando si tienes acceso a nuestro servidor.' - } + checking_whitelisted = 'Hola %s. Estamos revisando si tienes acceso a nuestro servidor.', + exploit_banned = 'Has sido expulsado por hacer trampas. Consulta nuestro Discord para más información: %{discord}', + exploit_dropped = 'Has sido expulsado por hacer trampas', + }, + command = { + tp = { + help = 'TP al jugador o a las coordenadas (sólo para admin)', + params = { + x = { name = 'id/x', help = 'ID de jugador o posición X'}, + y = { name = 'y', help = 'Y posición'}, + z = { name = 'z', help = 'Z posición'}, + }, + }, + tpm = { help = 'TP al marcador (sólo para admin)' }, + togglepvp = { help = 'Activar el PVP en el servidor (sólo para admin)' }, + addpermission = { + help = 'Dar permisos al jugador (sólo modo Dios)', + params = { + id = { name = 'id', help = 'ID del jugador' }, + permission = { name = 'Permiso', help = 'Nivel de permiso' }, + }, + }, + removepermission = { + help = 'Eliminar los permisos de los jugadores (sólo modo Dios)', + params = { + id = { name = 'id', help = 'ID del jugador' }, + permission = { name = 'permiso', help = 'Nivel de permiso' }, + }, + }, + openserver = { help = 'Abrir el servidor para todo el mundo (sólo para admin)' }, + closeserver = { + help = 'Cerrar el servidor para personas sin permisos (sólo para admin)', + params = { + reason = { name = 'razón', help = 'Motivo del cierre (opcional)' }, + }, + }, + car = { + help = 'Vehículo de desove (sólo para admin)', + params = { + model = { name = 'modelo', help = 'Nombre del modelo del vehículo' }, + }, + }, + dv = { help = 'Borrar vehículo (sólo para admin)' }, + givemoney = { + help = 'Dar dinero a un jugador (sólo para admin)', + params = { + id = { name = 'id', help = 'ID del jugador' }, + moneytype = { name = 'tipo de dinero', help = 'Tipo de dinero (efectivo, banco, cripto)' }, + amount = { name = 'amount', help = 'Cantidad de dinero' }, + }, + }, + setmoney = { + help = 'Establecer la cantidad de dinero de los jugadores (sólo para admin)', + params = { + id = { name = 'id', help = 'ID del jugador' }, + moneytype = { name = 'tipo de dinero', help = 'Tipo de dinero (efectivo, banco, cripto)' }, + amount = { name = 'cantidad', help = 'Cantidad de dinero' }, + }, + }, + job = { help = 'Compruebe su trabajo' }, + setjob = { + help = 'Establecer un trabajo de jugador (sólo para admin)', + params = { + id = { name = 'id', help = 'ID del jugador' }, + job = { name = 'trabajo', help = 'Nombre del trabajo' }, + grade = { name = 'grado', help = 'Grado de trabajo' }, + }, + }, + gang = { help = 'Comprueba tu banda' }, + setgang = { + help = 'Establecer una banda de jugadores (sólo para admin)', + params = { + id = { name = 'id', help = 'ID del jugador' }, + gang = { name = 'banda', help = 'Nombre de la banda' }, + grade = { name = 'grado', help = 'Grado de banda' }, + }, + }, + ooc = { help = 'Mensaje del chat OOC' }, + me = { + help = 'Mostrar mensaje local', + params = { + message = { name = 'mensaje', help = 'Mensaje a enviar' } + }, + }, + }, } if GetConvar('qb_locale', 'en') == 'es' then From 7ff469d9c496922f24b300006949f8a6d886e624 Mon Sep 17 00:00:00 2001 From: Jean Carlos NUnez <3299025+jeann2013@users.noreply.github.com> Date: Fri, 9 Sep 2022 10:10:06 -0500 Subject: [PATCH 08/18] fix translation not necessary --- locale/es.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/locale/es.lua b/locale/es.lua index 0751e45..0f3f8c2 100644 --- a/locale/es.lua +++ b/locale/es.lua @@ -50,27 +50,27 @@ local Translations = { help = 'Dar permisos al jugador (sólo modo Dios)', params = { id = { name = 'id', help = 'ID del jugador' }, - permission = { name = 'Permiso', help = 'Nivel de permiso' }, + permission = { name = 'permission', help = 'Nivel de permiso' }, }, }, removepermission = { help = 'Eliminar los permisos de los jugadores (sólo modo Dios)', params = { id = { name = 'id', help = 'ID del jugador' }, - permission = { name = 'permiso', help = 'Nivel de permiso' }, + permission = { name = 'permission', help = 'Nivel de permiso' }, }, }, openserver = { help = 'Abrir el servidor para todo el mundo (sólo para admin)' }, closeserver = { help = 'Cerrar el servidor para personas sin permisos (sólo para admin)', params = { - reason = { name = 'razón', help = 'Motivo del cierre (opcional)' }, + reason = { name = 'reason', help = 'Motivo del cierre (opcional)' }, }, }, car = { - help = 'Vehículo de desove (sólo para admin)', + help = 'Crear Vehículo (sólo para admin)', params = { - model = { name = 'modelo', help = 'Nombre del modelo del vehículo' }, + model = { name = 'model', help = 'Nombre del modelo del vehículo' }, }, }, dv = { help = 'Borrar vehículo (sólo para admin)' }, @@ -78,7 +78,7 @@ local Translations = { help = 'Dar dinero a un jugador (sólo para admin)', params = { id = { name = 'id', help = 'ID del jugador' }, - moneytype = { name = 'tipo de dinero', help = 'Tipo de dinero (efectivo, banco, cripto)' }, + moneytype = { name = 'moneytype', help = 'Tipo de dinero (efectivo, banco, cripto)' }, amount = { name = 'amount', help = 'Cantidad de dinero' }, }, }, @@ -86,8 +86,8 @@ local Translations = { help = 'Establecer la cantidad de dinero de los jugadores (sólo para admin)', params = { id = { name = 'id', help = 'ID del jugador' }, - moneytype = { name = 'tipo de dinero', help = 'Tipo de dinero (efectivo, banco, cripto)' }, - amount = { name = 'cantidad', help = 'Cantidad de dinero' }, + moneytype = { name = 'moneytype', help = 'Tipo de dinero (efectivo, banco, cripto)' }, + amount = { name = 'amount', help = 'Cantidad de dinero' }, }, }, job = { help = 'Compruebe su trabajo' }, @@ -95,8 +95,8 @@ local Translations = { help = 'Establecer un trabajo de jugador (sólo para admin)', params = { id = { name = 'id', help = 'ID del jugador' }, - job = { name = 'trabajo', help = 'Nombre del trabajo' }, - grade = { name = 'grado', help = 'Grado de trabajo' }, + job = { name = 'job', help = 'Nombre del trabajo' }, + grade = { name = 'grade', help = 'Grado de trabajo' }, }, }, gang = { help = 'Comprueba tu banda' }, @@ -104,15 +104,15 @@ local Translations = { help = 'Establecer una banda de jugadores (sólo para admin)', params = { id = { name = 'id', help = 'ID del jugador' }, - gang = { name = 'banda', help = 'Nombre de la banda' }, - grade = { name = 'grado', help = 'Grado de banda' }, + gang = { name = 'gang', help = 'Nombre de la banda' }, + grade = { name = 'grade', help = 'Grado de banda' }, }, }, ooc = { help = 'Mensaje del chat OOC' }, me = { help = 'Mostrar mensaje local', params = { - message = { name = 'mensaje', help = 'Mensaje a enviar' } + message = { name = 'message', help = 'Mensaje a enviar' } }, }, }, From 6164492a6a500eeb5953a7db8d13d40602007545 Mon Sep 17 00:00:00 2001 From: Cpt_NoHand <90973107+CptNoHand@users.noreply.github.com> Date: Fri, 9 Sep 2022 21:46:16 +0200 Subject: [PATCH 09/18] Update de.lua updated the duty notifications --- locale/de.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/de.lua b/locale/de.lua index 2b4bffb..436172f 100644 --- a/locale/de.lua +++ b/locale/de.lua @@ -27,8 +27,8 @@ local Translations = { received_paycheck = 'Du hast dein Gehalt in Höhe von $%{value} erhalten', job_info = 'Beruf: %{value} | Dienstgrad: %{value2} | im Dienst: %{value3}', gang_info = 'Gang: %{value} | Rang: %{value2}', - on_duty = 'Du bist jetzt im Dienst!', - off_duty = 'Du bist jetzt nicht mehr im Dienst!', + on_duty = 'Du befindest dich jetzt im Dienst!', + off_duty = 'Du befindest dich jetzt nicht mehr im Dienst!', checking_ban = 'Hallo %s. Wir prüfen, ob du gebannt wurdest.', join_server = 'Willkommen %s bei {Server Name}.', checking_whitelisted = 'Hallo %s. Wir prüfen deine Erlaubnis.', From fec6b290d57cbe741177d1aab60f421a89a5d5fb Mon Sep 17 00:00:00 2001 From: buntyverma69 <72088153+buntyverma69@users.noreply.github.com> Date: Sun, 11 Sep 2022 20:33:27 +0530 Subject: [PATCH 10/18] add missing oxygen tank tube item --- shared/items.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/items.lua b/shared/items.lua index 3c5cee1..747de2c 100644 --- a/shared/items.lua +++ b/shared/items.lua @@ -379,7 +379,8 @@ QBShared.Items = { ['dendrogyra_coral'] = {['name'] = 'dendrogyra_coral', ['label'] = 'Dendrogyra', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'dendrogyra_coral.png', ['unique'] = false, ['useable'] = false, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'Its also known as pillar coral'}, ['antipatharia_coral'] = {['name'] = 'antipatharia_coral', ['label'] = 'Antipatharia', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'antipatharia_coral.png', ['unique'] = false, ['useable'] = false, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'Its also known as black corals or thorn corals'}, ['diving_gear'] = {['name'] = 'diving_gear', ['label'] = 'Diving Gear', ['weight'] = 30000, ['type'] = 'item', ['image'] = 'diving_gear.png', ['unique'] = true, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'An oxygen tank and a rebreather'}, - + ['diving_fill'] = {['name'] = 'diving_fill', ['label'] = 'Diving Tube', ['weight'] = 3000, ['type'] = 'item', ['image'] = 'diving_tube.png', ['unique'] = true, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['discription'] = 'An oxygen tube and a rebreather'}, + -- Other Tools ['casinochips'] = {['name'] = 'casinochips', ['label'] = 'Casino Chips', ['weight'] = 0, ['type'] = 'item', ['image'] = 'casinochips.png', ['unique'] = false, ['useable'] = false, ['shouldClose'] = false, ['combinable'] = nil, ['description'] = 'Chips For Casino Gambling'}, ['stickynote'] = {['name'] = 'stickynote', ['label'] = 'Sticky note', ['weight'] = 0, ['type'] = 'item', ['image'] = 'stickynote.png', ['unique'] = true, ['useable'] = false, ['shouldClose'] = false, ['combinable'] = nil, ['description'] = 'Sometimes handy to remember something :)'}, From 314af274e3adceb286391d38038f9b92f3f81ba1 Mon Sep 17 00:00:00 2001 From: Cpt_NoHand <90973107+CptNoHand@users.noreply.github.com> Date: Sun, 11 Sep 2022 17:31:35 +0200 Subject: [PATCH 11/18] Update de.lua --- locale/de.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/de.lua b/locale/de.lua index 1375062..feced89 100644 --- a/locale/de.lua +++ b/locale/de.lua @@ -27,8 +27,8 @@ local Translations = { received_paycheck = 'Du hast dein Gehalt in Höhe von $%{value} erhalten', job_info = 'Beruf: %{value} | Dienstgrad: %{value2} | im Dienst: %{value3}', gang_info = 'Gang: %{value} | Rang: %{value2}', - on_duty = 'Du befindest dich jetzt im Dienst!', - off_duty = 'Du befindest dich jetzt nicht mehr im Dienst!', + on_duty = 'Du befindest dich nun im Dienst!', + off_duty = 'Du befindest dich nun nicht mehr im Dienst!', checking_ban = 'Hallo %s. Wir prüfen, ob du gebannt wurdest.', join_server = 'Willkommen %s bei {Server Name}.', checking_whitelisted = 'Hallo %s. Wir prüfen deine Erlaubnis.', From 280ab56ca45fe4a8055e49e1bff13f474d231921 Mon Sep 17 00:00:00 2001 From: kierwin1987 <37836859+kierwin1987@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:08:24 +0200 Subject: [PATCH 12/18] Update cs.lua --- locale/cs.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/cs.lua b/locale/cs.lua index 55912c0..199faac 100644 --- a/locale/cs.lua +++ b/locale/cs.lua @@ -31,7 +31,7 @@ local Translations = { tp = { help = 'Teleport k hráči nebo na souřadnice (Pouze Admin)', params = { - x = { name = 'id/x', help = 'ID hráče or X pozice'}, + x = { name = 'id/x', help = 'ID hráče nebo X pozice'}, y = { name = 'y', help = 'Y pozice'}, z = { name = 'z', help = 'Z pozice'}, }, @@ -39,14 +39,14 @@ local Translations = { tpm = { help = 'TP Na Marker (pouze Admin)' }, togglepvp = { help = 'Přepnutí PVP na serveru (Pouze Admin)' }, addpermission = { - help = 'Dej hráči oprávnění (God Pouze)', + help = 'Udělení hráči oprávnění (God Pouze)', params = { - id = { name = 'id', help = 'ID hráčer' }, + id = { name = 'id', help = 'ID hráče' }, permission = { name = 'permission', help = 'Úroveň oprávnění' }, }, }, removepermission = { - help = 'Odstraň hráči oprávnění (God Pouze)', + help = 'Odeber hráči oprávnění (God Pouze)', params = { id = { name = 'id', help = 'ID hráče' }, permission = { name = 'permission', help = 'Úroveň oprávnění' }, From 068a5c4bad8d7f3a72ad07dd409f6a2d4d9a397b Mon Sep 17 00:00:00 2001 From: Kenneth Iversen Date: Tue, 13 Sep 2022 19:34:28 +0200 Subject: [PATCH 13/18] Added norwegian language file --- locale/no.lua | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 locale/no.lua diff --git a/locale/no.lua b/locale/no.lua new file mode 100644 index 0000000..3f621be --- /dev/null +++ b/locale/no.lua @@ -0,0 +1,124 @@ +local Translations = { + error = { + not_online = 'Spiller ikke online', + wrong_format = 'Ugyldig format', + missing_args = 'Ikke alle argumenter er lagt inn (x, y, z)', + missing_args2 = 'Alle argumenter må fylles ut!', + no_access = 'Ingen tilgang til denne kommandoen', + company_too_poor = 'Arbeidsgiveren din er blakk', + item_not_exist = 'Gjenstand finnes ikke', + too_heavy = 'Lommene er fulle', + location_not_exist = 'Plassering finnes ikke', + duplicate_license = 'Duplikat Rockstar-lisens funnet', + no_valid_license = 'Ingen gyldig Rockstar-lisens funnet', + not_whitelisted = 'Du har ikke tilgang til serveren', + server_already_open = 'Serveren er allerede åpen', + server_already_closed = 'Serveren er allerede stengt', + no_permission = 'Du har ikke tillatelser for dette..', + no_waypoint = 'Ingen veipunkt satt.', + tp_error = 'Feil under teleportering.', + }, + success = { + server_opened = 'Serveren er åpnet', + server_closed = 'Serveren er stengt', + teleported_waypoint = 'Teleporter til veipunkt.', + }, + info = { + received_paycheck = 'Du mottok lønnsslippen din på kr %{value}', + job_info = 'Jobb: %{value} | Grad: %{value2} | vakt: %{value3}', + gang_info = 'Gjeng: %{value} | Grad: %{value2}', + on_duty = 'Du er nå på vakt!', + off_duty = 'Du er nå av vakt!', + checking_ban = 'Hei %s. Vi sjekker om du er utestengt.', + join_server = 'Velkommen %s til {Server Name}.', + checking_whitelisted = 'Hei %s. Vi sjekker tilganger.', + exploit_banned = 'Du har blitt utestengt for juks. Sjekk vår Discord for mer informasjon: %{discord}', + exploit_dropped = 'Du har blitt sparket for utnyttelse', + }, + command = { + tp = { + help = 'TP til spiller eller koordinater (kun admin)', + params = { + x = { name = 'id/x', help = 'ID for spiller eller X-posisjon'}, + y = { name = 'y', help = 'Y posisjon'}, + z = { name = 'z', help = 'Z posisjon'}, + }, + }, + tpm = { help = 'TP Til Marker (kun admin)' }, + togglepvp = { help = 'Slå PVP på serveren (kun admin)' }, + addpermission = { + help = 'Gi spillertillatelser (Kun gud)', + params = { + id = { name = 'id', help = 'ID på spiller' }, + permission = { name = 'permission', help = 'Tillatelsesnivå }, + }, + }, + removepermission = { + help = 'Fjern spillertillatelser (kun gud)', + params = { + id = { name = 'id', help = 'ID på spiller' }, + permission = { name = 'permission', help = 'Tillatelsesnivå' }, + }, + }, + openserver = { help = 'Åpne serveren for alle (kun admin)' }, + closeserver = { + help = 'Lukk serveren for personer uten tillatelser (kun admin)', + params = { + reason = { name = 'reason', help = 'Årsak til stenging (valgfritt)' }, + }, + }, + car = { + help = 'Spawn Vehicle (kun admin)', + params = { + model = { name = 'model', help = 'Modellnavn på kjøretøyet' }, + }, + }, + dv = { help = 'Slett kjøretøy (kun admin)' }, + givemoney = { + help = 'Gi en spiller penger (kun admin)', + params = { + id = { name = 'id', help = 'ID på spiller' }, + moneytype = { name = 'moneytype', help = 'Penge type (cash, bank, crypto)' }, + amount = { name = 'amount', help = 'Penge beløp' }, + }, + }, + setmoney = { + help = 'Angi spillerens pengebeløp (kun admin)', + params = { + id = { name = 'id', help = 'ID på spiller' }, + moneytype = { name = 'moneytype', help = 'Penge type (cash, bank, crypto)' }, + amount = { name = 'amount', help = 'Penge beløp' }, + }, + }, + job = { help = 'Sjekk din jobb' }, + setjob = { + help = 'Sett en spillerjobb (kun admin)', + params = { + id = { name = 'id', help = 'ID på spiller' }, + job = { name = 'job', help = 'Jobb navn' }, + grade = { name = 'grade', help = 'Jobb grad' }, + }, + }, + gang = { help = 'Sjekk din gjeng' }, + setgang = { + help = 'Sett en spillergjeng (kun admin)', + params = { + id = { name = 'id', help = 'ID på spiller' }, + gang = { name = 'gang', help = 'Gjeng navn' }, + grade = { name = 'grade', help = 'Gjeng grad' }, + }, + }, + ooc = { help = 'UAK Chat Melding' }, + me = { + help = 'Vis lokal melding', + params = { + message = { name = 'message', help = 'Melding å sende' } + }, + }, + }, +} + +Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true +}) From 7a71ee70445a738111700fda0228243e6b0fe68d Mon Sep 17 00:00:00 2001 From: Kenneth Iversen Date: Tue, 13 Sep 2022 19:37:54 +0200 Subject: [PATCH 14/18] Added norwegian language file --- locale/no.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/no.lua b/locale/no.lua index 3f621be..23eb2bb 100644 --- a/locale/no.lua +++ b/locale/no.lua @@ -50,7 +50,7 @@ local Translations = { help = 'Gi spillertillatelser (Kun gud)', params = { id = { name = 'id', help = 'ID på spiller' }, - permission = { name = 'permission', help = 'Tillatelsesnivå }, + permission = { name = 'permission', help = 'Tillatelsesnivå '}, }, }, removepermission = { From b4d92b82314f1bca9ac90708c06c4601a26ba90f Mon Sep 17 00:00:00 2001 From: Kenneth Iversen Date: Wed, 14 Sep 2022 10:24:56 +0200 Subject: [PATCH 15/18] Enabled auto-switching --- locale/no.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/locale/no.lua b/locale/no.lua index 23eb2bb..cc7694e 100644 --- a/locale/no.lua +++ b/locale/no.lua @@ -118,7 +118,10 @@ local Translations = { }, } -Lang = Locale:new({ - phrases = Translations, - warnOnMissing = true -}) +if GetConvar('qb_locale', 'en') == 'no' then + Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true, + fallbackLang = Lang, + }) +end \ No newline at end of file From ba021defa7a2a85368d524f318b01ef34076959f Mon Sep 17 00:00:00 2001 From: Mohamed Shaheen <69500158+aboshaheen553@users.noreply.github.com> Date: Mon, 19 Sep 2022 02:01:13 +0200 Subject: [PATCH 16/18] fix --- locale/ar.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/ar.lua b/locale/ar.lua index ee91e13..d4243b5 100644 --- a/locale/ar.lua +++ b/locale/ar.lua @@ -17,8 +17,8 @@ local Translations = { received_paycheck = '$%{value} لقد استملت راتبك الشهري', job_info = '%{value} | %{value2} | %{value3}', gang_info = '%{value} | %{value2}', - on_duty = 'انت الان خارج الخدمة', - off_duty = 'انت الان في الخدمة', + on_duty = 'انت الان في الخدمة', + off_duty = 'انت الان خارج الخدمة', checking_ban = 'نحن نتحقق اذا كنت محجوب من السيرفر. %s مرحبا', join_server = '{Server Name} قي %s مرحبا', checking_whitelisted = 'نتحقق ما اذا كان مسموح لك بالدخول %s مرحبا ' From 47909ec878f6879f068e4780dc55bfc659ab75df Mon Sep 17 00:00:00 2001 From: Antsuplarts <101698580+Antsuplarts@users.noreply.github.com> Date: Mon, 19 Sep 2022 07:01:37 -0700 Subject: [PATCH 17/18] Update et.lua I have updated the estonian translation --- locale/et.lua | 101 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 4 deletions(-) diff --git a/locale/et.lua b/locale/et.lua index 803c4ab..1b8a244 100644 --- a/locale/et.lua +++ b/locale/et.lua @@ -8,11 +8,21 @@ local Translations = { company_too_poor = 'Teie tööandja on võlgades', item_not_exist = 'Asi ei eksisteeri', too_heavy = 'Inventuur on liiga täis', + location_not_exist = 'Asukoht ei eksisteeri', duplicate_license = 'Leiti Rockstari litsentsi duplikaat', no_valid_license = 'Kehtivat Rockstari litsentsi ei leitud', - not_whitelisted = 'Te ei ole selle serveri jaoks Allowlisted' + not_whitelisted = 'Te ei ole selle serveri jaoks Allowlisted', + server_already_open = 'Server on juba avatud', + server_already_closed = 'Server on juba suletud', + no_permission = 'Teil pole selleks õigusi..', + no_waypoint = 'Ühtegi punkti ei ole märgitud.', + tp_error = 'Teleportimise viga.', + }, + success = { + server_opened = 'Server on avatud', + server_closed = 'Server on suletud', + teleported_waypoint = 'Teleporteerusid punktile.', }, - success = {}, info = { received_paycheck = 'Saite oma palga $%{value}', job_info = 'Töö: %{value} | Auaste: %{value2} | Tööpostil: %{value3}', @@ -21,8 +31,91 @@ local Translations = { off_duty = 'Sa kirjutasid ennast töölt vabaks!', checking_ban = 'Tere %s. Me kontrollime, kas olete keelustatud.', join_server = 'Tere tulemast %s serverisse {Server Name}.', - checking_whitelisted = 'Tere %s. Kontrollime teie Allowlisti staatust.' - } + checking_whitelisted = 'Tere %s. Kontrollime teie Allowlisti staatust.', + exploit_banned = 'Olete saanud petmise eest mängukeelu. Lisateabe saamiseks vaadake meie Discordi: %{discord}', + exploit_dropped = 'Sind visati serverist välja petmise tõttu.', + }, + command = { + tp = { + help = 'TP mängijale või koordinaatidele (ainult administraator)', + params = { + x = { name = 'id/x', help = 'ID mängija või X positsioon'}, + y = { name = 'y', help = 'Y positsioon'}, + z = { name = 'z', help = 'Z positsioon'}, + }, + }, + tpm = { help = 'TP Markerile (ainult administraator)' }, + togglepvp = { help = 'PVP serveris sisse- ja väljalülitamine (ainult administraator)' }, + addpermission = { + help = 'Andke mängijale õigused (ainult jumal)', + params = { + id = { name = 'id', help = 'mängija ID' }, + permission = { name = 'permission', help = 'Permission level' }, + }, + }, + removepermission = { + help = 'Eemaldage mängija õigused (ainult jumal)', + params = { + id = { name = 'id', help = 'mängija ID' }, + permission = { name = 'õigused', help = 'Õiguse tase' }, + }, + }, + openserver = { help = 'Ava server kõigile (ainult administraator)' }, + closeserver = { + help = 'Sulgege server ilma õigusteta inimeste jaoks (ainult administraator)', + params = { + reason = { name = 'põhjus', help = 'Sulgemise põhjus (valikuline)' }, + }, + }, + car = { + help = 'Sõiduki loomine (ainult administraator)', + params = { + model = { name = 'mudel', help = 'Sõiduki mudeli nimi' }, + }, + }, + dv = { help = 'Sõiduki kustutamine (ainult administraator)' }, + givemoney = { + help = 'Mängija rahasumma määramine (ainult administraator), + params = { + id = { name = 'id', help = 'Mängija ID' }, + moneytype = { name = 'rahatüüp', help = 'Raha liik (sularaha, pank, krüpto)' }, + amount = { name = 'kogus', help = 'Rahasumma' }, + }, + }, + setmoney = { + help = 'Mängija rahasumma määramine (ainult administraator)', + params = { + id = { name = 'id', help = 'Mängija ID' }, + moneytype = { name = 'rahatüüp', help = 'Raha liik (sularaha, pank, krüpto)' }, + amount = { name = 'kogus', help = 'Rahasumma' }, + }, + }, + job = { help = 'Kontrollige oma töödkohta' }, + setjob = { + help = 'Mängijale töökoha määramine (ainult administraator)', + params = { + id = { name = 'id', help = 'Mängija ID' }, + job = { name = 'töö', help = 'Töökoha nimi' }, + grade = { name = 'tase', help = 'Tüükoha tase' }, + }, + }, + gang = { help = 'Kontrollige oma grupeeringut' }, + setgang = { + help = 'Määra mängija grupeeringu (ainult administraator)', + params = { + id = { name = 'id', help = 'Player ID' }, + gang = { name = 'tase', help = 'Grupeeringu nimi' }, + grade = { name = 'tase', help = 'Grupeeringu tase' }, + }, + }, + ooc = { help = 'OOC vestlussõnum' }, + me = { + help = 'Kuva kohalikud sõnumid', + params = { + message = { name = 'sõnum', help = 'Sõnum saatmiseks' } + }, + }, + }, } if GetConvar('qb_locale', 'en') == 'et' then From c6e121b6839aefd3032a1cb3753961d934cc3910 Mon Sep 17 00:00:00 2001 From: Antsuplarts <101698580+Antsuplarts@users.noreply.github.com> Date: Mon, 19 Sep 2022 07:15:08 -0700 Subject: [PATCH 18/18] Update et.lua --- locale/et.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/et.lua b/locale/et.lua index 1b8a244..fb95250 100644 --- a/locale/et.lua +++ b/locale/et.lua @@ -75,7 +75,7 @@ local Translations = { }, dv = { help = 'Sõiduki kustutamine (ainult administraator)' }, givemoney = { - help = 'Mängija rahasumma määramine (ainult administraator), + help = 'Mängija rahasumma määramine (ainult administraator)', params = { id = { name = 'id', help = 'Mängija ID' }, moneytype = { name = 'rahatüüp', help = 'Raha liik (sularaha, pank, krüpto)' },