Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Message when reloading multiple scripts with an error. #7031

Merged
merged 5 commits into from
Oct 1, 2024
Merged

Fix Message when reloading multiple scripts with an error. #7031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21c7e7f
Initial Commit
Asleeepp Sep 2, 2024
68c6483
get rid of lime
Asleeepp Sep 3, 2024
957a117
commit
Asleeepp Sep 13, 2024
1ff39a3
Update french.lang
Asleeepp Oct 1, 2024
3dc0edc
Merge branch 'dev/patch' into patch-fix-reload-message
UnderscoreTud Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/ch/njol/skript/SkriptCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
});
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/english.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ skript command:
aliases: the aliases
script: <gold>%s<reset>
scripts in folder: all scripts in <gold>%s<reset>
x scripts in folder: <gold>%2$s <lime>script¦¦s¦ in <gold>%1$s<reset>
x scripts in folder success: <gold>%2$s <lime>script¦¦s¦ in <gold>%1$s<reset>
x scripts in folder error: <gold>%2$s <light red>script¦¦s¦ in <gold>%1$s<reset>
empty folder: <gold>%s<reset> does not contain any enabled scripts.
enable:
all:
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/french.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ skript command:
aliases: les alias
script: <gold>%s<reset>
scripts in folder: tous les scripts dans <gold>%s<reset>
x scripts in folder: <gold>%2$s <lime>script¦¦s¦ dans <gold>%1$s<reset>
x scripts in folder success: <gold>%2$s <lime>script¦¦s¦ dans <gold>%1$s<reset>
x scripts in folder error: <gold>%2$s <light red>script¦¦s¦ dans <gold>%1$s<reset>
empty folder: <gold>%s<reset> ne contient aucun script activé.
enable:
all:
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/german.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ skript command:
aliases: die Itemnamen
script: <gold>%s<reset>
scripts in folder: alle Skripte in <gold>%s<reset>
x scripts in folder: <gold>%2$s <lime>Skript¦¦e¦ in <gold>%1$s<reset>
x scripts in folder success: <gold>%2$s <lime>Skript¦¦e¦ in <gold>%1$s<reset>
x scripts in folder error: <gold>%2$s <light red>Skript¦¦e¦ in <gold>%1$s<reset>
empty folder: <gold>%s<reset> enthält keine aktivierten Skripte.
enable:
all:
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/japanese.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ skript command:
aliases: エイリアス
script: <gold>%s<reset>
scripts in folder: <gold>%s<reset>フォルダ内の全てのスクリプト
x scripts in folder: <gold>%1$s<lime>フォルダ内の<gold>%2$s<reset>個のスクリプト
x scripts in folder success: <gold>%1$s<lime>フォルダ内の<gold>%2$s<reset>個のスクリプト
x scripts in folder error: <gold>%1$s<light red>フォルダ内の<gold>%2$s<reset>個のスクリプト
empty folder: 有効化されたスクリプトが<gold>%s<reset>フォルダ内にありませんでした。
enable:
all:
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/korean.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ skript command:
aliases: 별칭(aliases)
script: <gold>%s<reset>
scripts in folder: <gold>%s<reset>폴더 속 모든 스크립트
x scripts in folder: <gold>%1$s<lime> 폴더 속 <gold>%2$s<reset>개의 스크립트
x scripts in folder success: <gold>%1$s<lime> 폴더 속 <gold>%2$s<reset>개의 스크립트
x scripts in folder error: <gold>%1$s<light red> 폴더 속 <gold>%2$s<reset>개의 스크립트
empty folder: <gold>%s<reset>에 활성화된 스크립트가 없습니다.
enable:
all:
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/polish.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ skript command:
aliases: aliasy
script: <gold>%s<reset>
scripts in folder: wszystkie skrypty w <gold>%s<reset>
x scripts in folder: <gold>%2$s <lime>skrypt¦¦ów¦ w <gold>%1$s<reset>
x scripts in folder success: <gold>%2$s <lime>skrypt¦¦ów¦ w <gold>%1$s<reset>
x scripts in folder error: <gold>%2$s <light red>skrypt¦¦ów¦ w <gold>%1$s<reset>
empty folder: <gold>%s<reset> nie ma w sobie żadnych włączonych skryptów.
enable:
all:
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/russian.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ skript command:
aliases: алиасы
script: <gold>%s<reset>
scripts in folder: все скрипты в <gold>%s<reset>
x scripts in folder: <gold>%2$s <lime>скриптов в <gold>%1$s<reset>
x scripts in folder success: <gold>%2$s <lime>скриптов в <gold>%1$s<reset>
x scripts in folder error: <gold>%2$s <light red>скриптов в <gold>%1$s<reset>
empty folder: <gold>%s<reset> не содержит включенных скриптов.
enable:
all:
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/simplifiedchinese.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ skript command:
aliases: 其它配置
script: <gold>%s<reset>
scripts in folder: <gold>%s<reset>中的所有脚本
x scripts in folder: <gold>%1$s<reset>中的<gold>%2$s<reset>个脚本
x scripts in folder success: <gold>%1$s<reset>中的<gold>%2$s<lime>个脚本
x scripts in folder error: <gold>%1$s<reset>中的<gold>%2$s<light red>个脚本
empty folder: <gold>%s<reset>不包含任何已启用的脚本。
enable:
all:
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/turkish.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ skript command:
aliases: alias'lar
script: <gold>%s<reset>
scripts in folder: <gold>%s<reset> klasöründeki tüm script'ler
x scripts in folder: <gold>%1$s<reset> klasöründeki <gold>%2$s <lime>script
x scripts in folder success: <gold>%1$s<reset> klasöründeki <gold>%2$s <lime>script
x scripts in folder error: <gold>%1$s<reset> klasöründeki <gold>%2$s <light red>script
empty folder: <gold>%s<reset> aktif script içermiyor.
enable:
all:
Expand Down