From 46b2413820482b72006a6678feddf3962b576ba2 Mon Sep 17 00:00:00 2001 From: Debian Date: Sat, 30 Aug 2025 09:36:35 +0000 Subject: [PATCH] i18n for not valid message and fix message error --- [core]/es_extended/locales/cs.lua | 1 + [core]/es_extended/locales/el.lua | 1 + [core]/es_extended/locales/fi.lua | 1 + [core]/es_extended/locales/he.lua | 1 + [core]/es_extended/locales/hu.lua | 1 + [core]/es_extended/locales/id.lua | 1 + [core]/es_extended/locales/it.lua | 1 + [core]/es_extended/locales/nl.lua | 1 + [core]/es_extended/locales/pl.lua | 1 + [core]/es_extended/locales/sl.lua | 1 + [core]/es_extended/locales/sr.lua | 1 + [core]/es_extended/locales/sv.lua | 1 + [core]/es_extended/locales/tr.lua | 1 + [core]/es_extended/locales/zh-cn.lua | 1 + [core]/es_extended/server/functions.lua | 2 +- [core]/es_extended/server/modules/commands.lua | 2 +- 16 files changed, 16 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/locales/cs.lua b/[core]/es_extended/locales/cs.lua index ca567e92..33268d1f 100644 --- a/[core]/es_extended/locales/cs.lua +++ b/[core]/es_extended/locales/cs.lua @@ -62,6 +62,7 @@ return { ["command_setgroup_group"] = "Název skupiny", ["commanderror_argumentmismatch"] = "Chybný počet hodnot (správně %s, potřebných %s)", ["commanderror_argumentmismatch_number"] = "Chybně zadaná hodnot #%s (správně, špatně)", + ["commanderror_argumentmismatch_positive_number"] = "Chybně zadaná hodnota #%s (zadáno záporné/nula, požadováno kladné číslo)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (passed number, wanted string)", ["commanderror_invaliditem"] = "Špatný předmět", ["commanderror_invalidweapon"] = "Špatná zbraň", diff --git a/[core]/es_extended/locales/el.lua b/[core]/es_extended/locales/el.lua index c24310e2..25c004cc 100644 --- a/[core]/es_extended/locales/el.lua +++ b/[core]/es_extended/locales/el.lua @@ -67,6 +67,7 @@ return { ["commanderror_argumentmismatch"] = "Μη έγκυρος αριθμός ορισμάτων (δόθηκαν %s, αναμενόμενα %s)", ["commanderror_argumentmismatch_number"] = "Μη έγκυρος τύπος δεδομένων για το όρισμα #%s (δόθηκε συμβολοσειρά, αναμενόμενος αριθμός)", ["commanderror_argumentmismatch_string"] = "Μη έγκυρος τύπος δεδομένων για το όρισμα #%s (δόθηκε αριθμός, αναμενόμενη συμβολοσειρά)", + ["commanderror_argumentmismatch_positive_number"] = "Μη έγκυρος τύπος δεδομένων για το όρισμα #%s (δόθηκε αρνητικός/μηδέν, αναμενόμενος θετικός αριθμός)", ["commanderror_invaliditem"] = "Μη έγκυρο αντικείμενο", ["commanderror_invalidweapon"] = "Μη έγκυρο όπλο", ["commanderror_console"] = "Η εντολή δεν μπορεί να εκτελεστεί από την κονσόλα", diff --git a/[core]/es_extended/locales/fi.lua b/[core]/es_extended/locales/fi.lua index ceb76da4..822622c5 100644 --- a/[core]/es_extended/locales/fi.lua +++ b/[core]/es_extended/locales/fi.lua @@ -58,6 +58,7 @@ return { ["commanderror_argumentmismatch"] = "Argumenttien määrä ei täsmää (hyväksytty %s, haluttu %s)", ["commanderror_argumentmismatch_number"] = "Argumentin #%s tyyppi ei täsmää (syötetty merkkijono, haluttu numero)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (passed number, wanted string)", + ["commanderror_argumentmismatch_positive_number"] = "Virheellinen argumentti #%s tietotyyppi (annettu negatiivinen/nolla, haluttu positiivinen luku)", ["commanderror_invaliditem"] = "Virheellinen esineen nimi", ["commanderror_invalidweapon"] = "Virheellinen ase", ["commanderror_console"] = "Komentoa ei voi suorittaa konsolissa", diff --git a/[core]/es_extended/locales/he.lua b/[core]/es_extended/locales/he.lua index b11f3d31..ff2cd1aa 100644 --- a/[core]/es_extended/locales/he.lua +++ b/[core]/es_extended/locales/he.lua @@ -67,6 +67,7 @@ return { ["commanderror_argumentmismatch"] = "כמות וסוגי הארגומנטים אינם תואמים (נשלח %s, נדרש %s)", ["commanderror_argumentmismatch_number"] = "טיפוס ארגומנט #%s לא תקין (נשלח מחרוזת, נדרש מספר)", ["commanderror_argumentmismatch_string"] = "טיפוס ארגומנט #%s לא תקין (נשלח מספר, נדרש מחרוזת)", + ["commanderror_argumentmismatch_positive_number"] = "טיפוס ארגומנט #%s לא תקין (נשלח שלילי/אפס, נדרש מספר חיובי)", ["commanderror_invaliditem"] = "שם פריט לא חוקי", ["commanderror_invalidweapon"] = "נשק לא חוקי", ["commanderror_console"] = "לא ניתן להפעיל פקודה מהקונסול", diff --git a/[core]/es_extended/locales/hu.lua b/[core]/es_extended/locales/hu.lua index b0e05f76..8b05ea28 100644 --- a/[core]/es_extended/locales/hu.lua +++ b/[core]/es_extended/locales/hu.lua @@ -63,6 +63,7 @@ return { ["commanderror_argumentmismatch"] = "Érvénytelen argumentumszám (%s megadva, %s szükséges)", ["commanderror_argumentmismatch_number"] = "Érvénytelen argumentum #%s adat típus (szöveg megadva, szám szükséges)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (passed number, wanted string)", + ["commanderror_argumentmismatch_positive_number"] = "Érvénytelen argumentum #%s adattípus (negatív/nulla átadva, pozitív szám szükséges)", ["commanderror_invaliditem"] = "Érvénytelen tárgy", ["commanderror_invalidweapon"] = "Érvénytelen fegyver", ["commanderror_console"] = "Parancs nem használható konzolból", diff --git a/[core]/es_extended/locales/id.lua b/[core]/es_extended/locales/id.lua index f64361d2..22592d7d 100644 --- a/[core]/es_extended/locales/id.lua +++ b/[core]/es_extended/locales/id.lua @@ -67,6 +67,7 @@ return { ["commanderror_argumentmismatch"] = "Jumlah Argument Salah (passed %s, wanted %s)", ["commanderror_argumentmismatch_number"] = "Argument #%s salah tipe data (passed string, wanted number)", ["commanderror_argumentmismatch_string"] = "Argument #%s salah tipe data (passed number, wanted string)", + ["commanderror_argumentmismatch_positive_number"] = "Argument #%s salah tipe data (diberikan negatif/nol, diinginkan angka positif)", ["commanderror_invaliditem"] = "Barang salah", ["commanderror_invalidweapon"] = "Senjata salah", ["commanderror_console"] = "Perintah tidak dapat dieksekusi dari console", diff --git a/[core]/es_extended/locales/it.lua b/[core]/es_extended/locales/it.lua index 80378e1c..7bb56dc9 100644 --- a/[core]/es_extended/locales/it.lua +++ b/[core]/es_extended/locales/it.lua @@ -67,6 +67,7 @@ return { ["commanderror_argumentmismatch"] = "Conta argomenti non valida (passati %s, richiesti %s)", ["commanderror_argumentmismatch_number"] = "Argomento #%s di tipologia errata (passato testo, richiesto numero)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (passed number, wanted string)", + ["commanderror_argumentmismatch_positive_number"] = "Argomento #%s tipo di dato non valido (passato negativo/zero, richiesto numero positivo)", ["commanderror_invaliditem"] = "Oggetto non valido", ["commanderror_invalidweapon"] = "Arma non valida", ["commanderror_console"] = "Comando non eseguibile dalla console", diff --git a/[core]/es_extended/locales/nl.lua b/[core]/es_extended/locales/nl.lua index b03c1f9e..0ffaba44 100644 --- a/[core]/es_extended/locales/nl.lua +++ b/[core]/es_extended/locales/nl.lua @@ -59,6 +59,7 @@ return { ["commanderror_argumentmismatch"] = "Ongeldig aantal argumenten (geslaagd %s, gezocht %s)", ["commanderror_argumentmismatch_number"] = "Ongeldig argument #%s gegevenstype (doorgegeven string, gewenst nummer)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (doorgegeven string, gewenst nummer)", + ["commanderror_argumentmismatch_positive_number"] = "Ongeldig Argument #%s gegevenstype (doorgegeven negatief/nul, gewenst positief getal)", ["commanderror_invaliditem"] = "Ongeldig item", ["commanderror_invalidweapon"] = "Ongeldig wapen", ["commanderror_console"] = "Command kan niet worden uitgevoerd vanaf console.", diff --git a/[core]/es_extended/locales/pl.lua b/[core]/es_extended/locales/pl.lua index aa12acd2..5a85a92b 100644 --- a/[core]/es_extended/locales/pl.lua +++ b/[core]/es_extended/locales/pl.lua @@ -57,6 +57,7 @@ return { ["commanderror_argumentmismatch"] = "nieprawiłowa ilość argumentów (przeszło %s, wymagane %s)", ["commanderror_argumentmismatch_number"] = "nieprawidłowy typ argumentu #%s (przeszedł tekst, wymagany numer)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (passed number, wanted string)", + ["commanderror_argumentmismatch_positive_number"] = "Nieprawidłowy argument #%s typ danych (przekazano ujemny/zero, oczekiwano liczby dodatniej)", ["commanderror_invaliditem"] = "nieprawidłowa nazwa przedmiotu", ["commanderror_invalidweapon"] = "nieprawidłowa broń", ["commanderror_console"] = "podana komenda nie może zostać uruchomiona przez konsole", diff --git a/[core]/es_extended/locales/sl.lua b/[core]/es_extended/locales/sl.lua index 1d607c02..37093f6a 100644 --- a/[core]/es_extended/locales/sl.lua +++ b/[core]/es_extended/locales/sl.lua @@ -63,6 +63,7 @@ return { ["commanderror_argumentmismatch"] = "Neveljavno stetje argumentov (podano %s, zeleno %s)", ["commanderror_argumentmismatch_number"] = "Neveljaven podatkovni tip argumenta #%s (posredovan niz, zeleno stevilo)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (passed number, wanted string)", + ["commanderror_argumentmismatch_positive_number"] = "Neveljaven argument #%s tip podatkov (podano negativno/nič, zahtevano pozitivno število)", ["commanderror_invaliditem"] = "Neveljaven element", ["commanderror_invalidweapon"] = "Neveljavno orozje", ["commanderror_console"] = "Ukaza ni mogoce izvesti s konzole", diff --git a/[core]/es_extended/locales/sr.lua b/[core]/es_extended/locales/sr.lua index 2eece0a8..010cf04f 100644 --- a/[core]/es_extended/locales/sr.lua +++ b/[core]/es_extended/locales/sr.lua @@ -63,6 +63,7 @@ return { ["commanderror_argumentmismatch"] = "Nevazeci broj argumenata (položio %s, željeno %s)", ["commanderror_argumentmismatch_number"] = "Nevažeći argument #%s tip podataka (položeno, željeno)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (passed number, wanted string)", + ["commanderror_argumentmismatch_positive_number"] = "Nevaljan argument #%s tip podataka (prosleđen negativan/nula, potreban pozitivan broj)", ["commanderror_invaliditem"] = "Nevažeći item", ["commanderror_invalidweapon"] = "Nevažeće oružje", ["commanderror_console"] = "Komanda se ne može izvršiti iz konzole", diff --git a/[core]/es_extended/locales/sv.lua b/[core]/es_extended/locales/sv.lua index ad1c073c..fa2b8c4a 100644 --- a/[core]/es_extended/locales/sv.lua +++ b/[core]/es_extended/locales/sv.lua @@ -67,6 +67,7 @@ return { ["commanderror_argumentmismatch"] = "Invalid Argument Count (passed %s, wanted %s)", ["commanderror_argumentmismatch_number"] = "Invalid Argument #%s data type (passed string, wanted number)", ["commanderror_argumentmismatch_string"] = "Invalid Argument #%s data type (passed number, wanted string)", + ["commanderror_argumentmismatch_positive_number"] = "Ogiltigt argument #%s datatyp (skickade negativt/noll, ville ha positivt tal)", ["commanderror_invaliditem"] = "Ogiltigt föremål", ["commanderror_invalidweapon"] = "Ogiltigt vapen", ["commanderror_console"] = "Kommandot kan inte användas i konsolen", diff --git a/[core]/es_extended/locales/tr.lua b/[core]/es_extended/locales/tr.lua index fc97415a..30b2abb6 100644 --- a/[core]/es_extended/locales/tr.lua +++ b/[core]/es_extended/locales/tr.lua @@ -67,6 +67,7 @@ return { ["commanderror_argumentmismatch"] = "Geçersiz Argüman Sayısı (Verilen %s, İstenen %s)", ["commanderror_argumentmismatch_number"] = "Geçersiz Argüman #%s Veri Tipi (Verilen Metin, İstenen Sayı)", ["commanderror_argumentmismatch_string"] = "Geçersiz Argüman #%s Veri Tipi (Verilen Sayı, İstenen Metin)", + ["commanderror_argumentmismatch_positive_number"] = "Geçersiz Argüman #%s Veri Tipi (Verilen Negatif/Sıfır, İstenen Pozitif Sayı)", ["commanderror_invaliditem"] = "Geçersiz Eşya", ["commanderror_invalidweapon"] = "Geçersiz Silah", ["commanderror_console"] = "Komut Konsoldan Çalıştırılamaz", diff --git a/[core]/es_extended/locales/zh-cn.lua b/[core]/es_extended/locales/zh-cn.lua index 55534cf5..ab678c46 100644 --- a/[core]/es_extended/locales/zh-cn.lua +++ b/[core]/es_extended/locales/zh-cn.lua @@ -67,6 +67,7 @@ return { ["commanderror_argumentmismatch"] = "参数数量错误 (需%s个, 输入%s个)", ["commanderror_argumentmismatch_number"] = "参数#%s类型不符 (需数字类型)", ["commanderror_argumentmismatch_string"] = "参数#%s类型不符 (需文本类型)", + ["commanderror_argumentmismatch_positive_number"] = "参数#%s类型不符 (传入负数/零，需要正数)", ["commanderror_invaliditem"] = "错误: 无效物品标识", ["commanderror_invalidweapon"] = "错误: 无效武器标识", ["commanderror_console"] = "控制台无法执行此指令", diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index 0d5b7cf2..68eed5c2 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -151,7 +151,7 @@ function ESX.RegisterCommand(name, group, cb, allowConsole, suggestion) local candidate = newArgs[v.name] local ok, res = pcall(v.isValid, candidate) if not ok or res ~= true then - error = v.error or TranslateCap("commanderror_argumentmismatch_" .. (v.name or tostring(k)), k) + error = v.error or TranslateCap("commanderror_argumentmismatch") end end diff --git a/[core]/es_extended/server/modules/commands.lua b/[core]/es_extended/server/modules/commands.lua index 39c547a9..f79af2ca 100644 --- a/[core]/es_extended/server/modules/commands.lua +++ b/[core]/es_extended/server/modules/commands.lua @@ -315,7 +315,7 @@ if not Config.CustomInventory then { name = "item", help = TranslateCap("command_giveitem_item"), type = "item" }, { name = "count", help = TranslateCap("command_giveitem_count"), type = "number", isValid = function (countValue) return countValue > 0 - end }, + end, error = TranslateCap("commanderror_argumentmismatch_positive_number", "count")}, }, } )