From 21c7e7f7f452a5a0f7d6df2aac09afe36dbde355 Mon Sep 17 00:00:00 2001 From: Asleepp <119438940+Asleeepp@users.noreply.github.com> Date: Mon, 2 Sep 2024 20:48:48 -0300 Subject: [PATCH 1/4] Initial Commit --- src/main/resources/lang/english.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang index 43e417be1a9..65f2383ae45 100644 --- a/src/main/resources/lang/english.lang +++ b/src/main/resources/lang/english.lang @@ -68,7 +68,7 @@ skript command: aliases: the aliases script: %s scripts in folder: all scripts in %s - x scripts in folder: %2$s script¦¦s¦ in %1$s + x scripts in folder: %2$s script¦¦s¦ in %1$s empty folder: %s does not contain any enabled scripts. enable: all: From 68c64837f9dedfc84b3fb4f2e27890058f7b3e70 Mon Sep 17 00:00:00 2001 From: Asleepp <119438940+Asleeepp@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:14:53 -0300 Subject: [PATCH 2/4] get rid of lime --- src/main/resources/lang/english.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang index 65f2383ae45..61e339327a4 100644 --- a/src/main/resources/lang/english.lang +++ b/src/main/resources/lang/english.lang @@ -68,7 +68,7 @@ skript command: aliases: the aliases script: %s scripts in folder: all scripts in %s - x scripts in folder: %2$s script¦¦s¦ in %1$s + x scripts in folder: %2$s script¦¦s¦ in %1$s empty folder: %s does not contain any enabled scripts. enable: all: From 957a117b2a88e1aa91d86e72dcbd2f4eccee822c Mon Sep 17 00:00:00 2001 From: Asleepp <119438940+Asleeepp@users.noreply.github.com> Date: Fri, 13 Sep 2024 19:54:43 -0300 Subject: [PATCH 3/4] commit --- src/main/java/ch/njol/skript/SkriptCommand.java | 6 +++++- src/main/resources/lang/english.lang | 3 ++- src/main/resources/lang/french.lang | 3 ++- src/main/resources/lang/german.lang | 3 ++- src/main/resources/lang/japanese.lang | 3 ++- src/main/resources/lang/korean.lang | 3 ++- src/main/resources/lang/polish.lang | 3 ++- src/main/resources/lang/russian.lang | 3 ++- src/main/resources/lang/simplifiedchinese.lang | 3 ++- src/main/resources/lang/turkish.lang | 3 ++- 10 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java index 0bc25391267..5ff02ffb71c 100644 --- a/src/main/java/ch/njol/skript/SkriptCommand.java +++ b/src/main/java/ch/njol/skript/SkriptCommand.java @@ -200,7 +200,11 @@ else if (args[1].equalsIgnoreCase("aliases")) { if (scriptInfo.files == 0) { info(sender, "reload.empty folder", fileName); } else { - reloaded(sender, logHandler, timingLogHandler, "x scripts in folder", fileName, scriptInfo.files); + if (logHandler.numErrors() == 0) { + reloaded(sender, logHandler, timingLogHandler, "x scripts in folder success", fileName, scriptInfo.files); + } else { + reloaded(sender, logHandler, timingLogHandler, "x scripts in folder error", fileName, scriptInfo.files); + } } }); } diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang index 61e339327a4..edc760276d0 100644 --- a/src/main/resources/lang/english.lang +++ b/src/main/resources/lang/english.lang @@ -68,7 +68,8 @@ skript command: aliases: the aliases script: %s scripts in folder: all scripts in %s - x scripts in folder: %2$s script¦¦s¦ in %1$s + x scripts in folder success: %2$s script¦¦s¦ in %1$s + x scripts in folder error: %2$s script¦¦s¦ in %1$s empty folder: %s does not contain any enabled scripts. enable: all: diff --git a/src/main/resources/lang/french.lang b/src/main/resources/lang/french.lang index 242bd42ef30..eba86174791 100644 --- a/src/main/resources/lang/french.lang +++ b/src/main/resources/lang/french.lang @@ -68,7 +68,8 @@ skript command: aliases: les alias script: %s scripts in folder: tous les scripts dans %s - x scripts in folder: %2$s script¦¦s¦ dans %1$s + x scripts in folder success: %2$s script¦¦s¦ dans %1$s + x scripts in folder success: %2$s script¦¦s¦ dans %1$s empty folder: %s ne contient aucun script activé. enable: all: diff --git a/src/main/resources/lang/german.lang b/src/main/resources/lang/german.lang index bd86b3db992..52e006f7c4b 100644 --- a/src/main/resources/lang/german.lang +++ b/src/main/resources/lang/german.lang @@ -68,7 +68,8 @@ skript command: aliases: die Itemnamen script: %s scripts in folder: alle Skripte in %s - x scripts in folder: %2$s Skript¦¦e¦ in %1$s + x scripts in folder success: %2$s Skript¦¦e¦ in %1$s + x scripts in folder error: %2$s Skript¦¦e¦ in %1$s empty folder: %s enthält keine aktivierten Skripte. enable: all: diff --git a/src/main/resources/lang/japanese.lang b/src/main/resources/lang/japanese.lang index aa2081b17b2..8a7f1b907bc 100644 --- a/src/main/resources/lang/japanese.lang +++ b/src/main/resources/lang/japanese.lang @@ -68,7 +68,8 @@ skript command: aliases: エイリアス script: %s scripts in folder: %sフォルダ内の全てのスクリプト - x scripts in folder: %1$sフォルダ内の%2$s個のスクリプト + x scripts in folder success: %1$sフォルダ内の%2$s個のスクリプト + x scripts in folder error: %1$sフォルダ内の%2$s個のスクリプト empty folder: 有効化されたスクリプトが%sフォルダ内にありませんでした。 enable: all: diff --git a/src/main/resources/lang/korean.lang b/src/main/resources/lang/korean.lang index fdbf38a32b3..dbbcb028af6 100644 --- a/src/main/resources/lang/korean.lang +++ b/src/main/resources/lang/korean.lang @@ -68,7 +68,8 @@ skript command: aliases: 별칭(aliases) script: %s scripts in folder: %s폴더 속 모든 스크립트 - x scripts in folder: %1$s 폴더 속 %2$s개의 스크립트 + x scripts in folder success: %1$s 폴더 속 %2$s개의 스크립트 + x scripts in folder error: %1$s 폴더 속 %2$s개의 스크립트 empty folder: %s에 활성화된 스크립트가 없습니다. enable: all: diff --git a/src/main/resources/lang/polish.lang b/src/main/resources/lang/polish.lang index 52ed35ec973..6c73f4f3742 100644 --- a/src/main/resources/lang/polish.lang +++ b/src/main/resources/lang/polish.lang @@ -68,7 +68,8 @@ skript command: aliases: aliasy script: %s scripts in folder: wszystkie skrypty w %s - x scripts in folder: %2$s skrypt¦¦ów¦ w %1$s + x scripts in folder success: %2$s skrypt¦¦ów¦ w %1$s + x scripts in folder error: %2$s skrypt¦¦ów¦ w %1$s empty folder: %s nie ma w sobie żadnych włączonych skryptów. enable: all: diff --git a/src/main/resources/lang/russian.lang b/src/main/resources/lang/russian.lang index 8986c2cf429..b45880da823 100644 --- a/src/main/resources/lang/russian.lang +++ b/src/main/resources/lang/russian.lang @@ -68,7 +68,8 @@ skript command: aliases: алиасы script: %s scripts in folder: все скрипты в %s - x scripts in folder: %2$s скриптов в %1$s + x scripts in folder success: %2$s скриптов в %1$s + x scripts in folder error: %2$s скриптов в %1$s empty folder: %s не содержит включенных скриптов. enable: all: diff --git a/src/main/resources/lang/simplifiedchinese.lang b/src/main/resources/lang/simplifiedchinese.lang index b502f9068aa..67edca415ba 100644 --- a/src/main/resources/lang/simplifiedchinese.lang +++ b/src/main/resources/lang/simplifiedchinese.lang @@ -68,7 +68,8 @@ skript command: aliases: 其它配置 script: %s scripts in folder: %s中的所有脚本 - x scripts in folder: %1$s中的%2$s个脚本 + x scripts in folder success: %1$s中的%2$s个脚本 + x scripts in folder error: %1$s中的%2$s个脚本 empty folder: %s不包含任何已启用的脚本。 enable: all: diff --git a/src/main/resources/lang/turkish.lang b/src/main/resources/lang/turkish.lang index ca8cad7b9c5..fc2ffdcaaca 100644 --- a/src/main/resources/lang/turkish.lang +++ b/src/main/resources/lang/turkish.lang @@ -66,7 +66,8 @@ skript command: aliases: alias'lar script: %s scripts in folder: %s klasöründeki tüm script'ler - x scripts in folder: %1$s klasöründeki %2$s script + x scripts in folder success: %1$s klasöründeki %2$s script + x scripts in folder error: %1$s klasöründeki %2$s script empty folder: %s aktif script içermiyor. enable: all: From 1ff39a335830357811821105cb5037f1ef7b3ba6 Mon Sep 17 00:00:00 2001 From: Asleepp <119438940+Asleeepp@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:28:03 -0300 Subject: [PATCH 4/4] Update french.lang Co-authored-by: Patrick Miller --- src/main/resources/lang/french.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/lang/french.lang b/src/main/resources/lang/french.lang index eba86174791..43204c403d8 100644 --- a/src/main/resources/lang/french.lang +++ b/src/main/resources/lang/french.lang @@ -69,7 +69,7 @@ skript command: script: %s scripts in folder: tous les scripts dans %s x scripts in folder success: %2$s script¦¦s¦ dans %1$s - x scripts in folder success: %2$s script¦¦s¦ dans %1$s + x scripts in folder error: %2$s script¦¦s¦ dans %1$s empty folder: %s ne contient aucun script activé. enable: all: