Skip to content

Commit 03b4ebb

Browse files
authored
Fix Message when reloading multiple scripts with an error. (#7031)
1 parent 03cd121 commit 03b4ebb

File tree

10 files changed

+23
-10
lines changed

10 files changed

+23
-10
lines changed

src/main/java/ch/njol/skript/SkriptCommand.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,11 @@ else if (args[1].equalsIgnoreCase("aliases")) {
200200
if (scriptInfo.files == 0) {
201201
info(sender, "reload.empty folder", fileName);
202202
} else {
203-
reloaded(sender, logHandler, timingLogHandler, "x scripts in folder", fileName, scriptInfo.files);
203+
if (logHandler.numErrors() == 0) {
204+
reloaded(sender, logHandler, timingLogHandler, "x scripts in folder success", fileName, scriptInfo.files);
205+
} else {
206+
reloaded(sender, logHandler, timingLogHandler, "x scripts in folder error", fileName, scriptInfo.files);
207+
}
204208
}
205209
});
206210
}

src/main/resources/lang/english.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ skript command:
6868
aliases: the aliases
6969
script: <gold>%s<reset>
7070
scripts in folder: all scripts in <gold>%s<reset>
71-
x scripts in folder: <gold>%2$s <lime>script¦¦s¦ in <gold>%1$s<reset>
71+
x scripts in folder success: <gold>%2$s <lime>script¦¦s¦ in <gold>%1$s<reset>
72+
x scripts in folder error: <gold>%2$s <light red>script¦¦s¦ in <gold>%1$s<reset>
7273
empty folder: <gold>%s<reset> does not contain any enabled scripts.
7374
enable:
7475
all:

src/main/resources/lang/french.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ skript command:
6868
aliases: les alias
6969
script: <gold>%s<reset>
7070
scripts in folder: tous les scripts dans <gold>%s<reset>
71-
x scripts in folder: <gold>%2$s <lime>script¦¦s¦ dans <gold>%1$s<reset>
71+
x scripts in folder success: <gold>%2$s <lime>script¦¦s¦ dans <gold>%1$s<reset>
72+
x scripts in folder error: <gold>%2$s <light red>script¦¦s¦ dans <gold>%1$s<reset>
7273
empty folder: <gold>%s<reset> ne contient aucun script activé.
7374
enable:
7475
all:

src/main/resources/lang/german.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ skript command:
6868
aliases: die Itemnamen
6969
script: <gold>%s<reset>
7070
scripts in folder: alle Skripte in <gold>%s<reset>
71-
x scripts in folder: <gold>%2$s <lime>Skript¦¦e¦ in <gold>%1$s<reset>
71+
x scripts in folder success: <gold>%2$s <lime>Skript¦¦e¦ in <gold>%1$s<reset>
72+
x scripts in folder error: <gold>%2$s <light red>Skript¦¦e¦ in <gold>%1$s<reset>
7273
empty folder: <gold>%s<reset> enthält keine aktivierten Skripte.
7374
enable:
7475
all:

src/main/resources/lang/japanese.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ skript command:
6868
aliases: エイリアス
6969
script: <gold>%s<reset>
7070
scripts in folder: <gold>%s<reset>フォルダ内の全てのスクリプト
71-
x scripts in folder: <gold>%1$s<lime>フォルダ内の<gold>%2$s<reset>個のスクリプト
71+
x scripts in folder success: <gold>%1$s<lime>フォルダ内の<gold>%2$s<reset>個のスクリプト
72+
x scripts in folder error: <gold>%1$s<light red>フォルダ内の<gold>%2$s<reset>個のスクリプト
7273
empty folder: 有効化されたスクリプトが<gold>%s<reset>フォルダ内にありませんでした。
7374
enable:
7475
all:

src/main/resources/lang/korean.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ skript command:
6868
aliases: 별칭(aliases)
6969
script: <gold>%s<reset>
7070
scripts in folder: <gold>%s<reset>폴더 속 모든 스크립트
71-
x scripts in folder: <gold>%1$s<lime> 폴더 속 <gold>%2$s<reset>개의 스크립트
71+
x scripts in folder success: <gold>%1$s<lime> 폴더 속 <gold>%2$s<reset>개의 스크립트
72+
x scripts in folder error: <gold>%1$s<light red> 폴더 속 <gold>%2$s<reset>개의 스크립트
7273
empty folder: <gold>%s<reset>에 활성화된 스크립트가 없습니다.
7374
enable:
7475
all:

src/main/resources/lang/polish.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ skript command:
6868
aliases: aliasy
6969
script: <gold>%s<reset>
7070
scripts in folder: wszystkie skrypty w <gold>%s<reset>
71-
x scripts in folder: <gold>%2$s <lime>skrypt¦¦ów¦ w <gold>%1$s<reset>
71+
x scripts in folder success: <gold>%2$s <lime>skrypt¦¦ów¦ w <gold>%1$s<reset>
72+
x scripts in folder error: <gold>%2$s <light red>skrypt¦¦ów¦ w <gold>%1$s<reset>
7273
empty folder: <gold>%s<reset> nie ma w sobie żadnych włączonych skryptów.
7374
enable:
7475
all:

src/main/resources/lang/russian.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ skript command:
6868
aliases: алиасы
6969
script: <gold>%s<reset>
7070
scripts in folder: все скрипты в <gold>%s<reset>
71-
x scripts in folder: <gold>%2$s <lime>скриптов в <gold>%1$s<reset>
71+
x scripts in folder success: <gold>%2$s <lime>скриптов в <gold>%1$s<reset>
72+
x scripts in folder error: <gold>%2$s <light red>скриптов в <gold>%1$s<reset>
7273
empty folder: <gold>%s<reset> не содержит включенных скриптов.
7374
enable:
7475
all:

src/main/resources/lang/simplifiedchinese.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ skript command:
6868
aliases: 其它配置
6969
script: <gold>%s<reset>
7070
scripts in folder: <gold>%s<reset>中的所有脚本
71-
x scripts in folder: <gold>%1$s<reset>中的<gold>%2$s<reset>个脚本
71+
x scripts in folder success: <gold>%1$s<reset>中的<gold>%2$s<lime>个脚本
72+
x scripts in folder error: <gold>%1$s<reset>中的<gold>%2$s<light red>个脚本
7273
empty folder: <gold>%s<reset>不包含任何已启用的脚本。
7374
enable:
7475
all:

src/main/resources/lang/turkish.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ skript command:
6666
aliases: alias'lar
6767
script: <gold>%s<reset>
6868
scripts in folder: <gold>%s<reset> klasöründeki tüm script'ler
69-
x scripts in folder: <gold>%1$s<reset> klasöründeki <gold>%2$s <lime>script
69+
x scripts in folder success: <gold>%1$s<reset> klasöründeki <gold>%2$s <lime>script
70+
x scripts in folder error: <gold>%1$s<reset> klasöründeki <gold>%2$s <light red>script
7071
empty folder: <gold>%s<reset> aktif script içermiyor.
7172
enable:
7273
all:

0 commit comments

Comments
 (0)