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

Add Id in ban message #2472

Merged
merged 3 commits into from
Jan 11, 2025
Merged

Add Id in ban message #2472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08b1157
add ban id
Werzet Jan 10, 2025
df44a6e
fix msg order
Werzet Jan 10, 2025
d71c8be
clean up
Werzet Jan 10, 2025
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
1 change: 1 addition & 0 deletions Content.Server/Database/ServerBanDef.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public string FormatBanMessage(IConfigurationManager cfg, ILocalizationManager l

return $"""
{loc.GetString("ban-banned-1")}
{loc.GetString("ban-banned-8", ("banId", Id.HasValue ? Id.Value : "-"))}
{loc.GetString("ban-banned-4", ("admin", BanningAdminName ?? "Console"))}
{loc.GetString("ban-banned-6", ("round", StatedRound != 0 ? StatedRound : loc.GetString("ban-banned-7")))}
{loc.GetString("ban-banned-2", ("reason", Reason))}
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/connection-messages.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ban-banned-1 = You, or another user of this computer or connection, are banned f
ban-banned-2 = The ban reason is: "{$reason}"
ban-banned-3 = If you don't agree with the sanction, you can apeal it in our Discord: https://discord.gg/ss220
ban-banned-4 = Attempts to circumvent this ban such as creating a new account will be logged.
ban-banned-8 = Ban number: { $banId }

soft-player-cap-full = The server is full!
panic-bunker-account-denied = This server is in panic bunker mode, often enabled as a precaution against raids. New connections by accounts not meeting certain requirements are temporarily not accepted. Try again later
Expand Down
3 changes: 2 additions & 1 deletion Resources/Locale/ru-RU/connection-messages.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cmd-whitelistremove-not-found = Не удалось найти игрока '{ $
cmd-whitelistremove-arg-player = [player]
cmd-kicknonwhitelisted-desc = Кикнуть всег игроков не в белом списке с сервера.
cmd-kicknonwhitelisted-help = Использование: kicknonwhitelisted
ban-banned-permanent = Этот бан можно только обжаловать. Для этого посетите { $link }.
ban-banned-permanent = Вы забанены навсегда.
ban-banned-permanent-appeal = Этот бан можно только обжаловать. Для этого посетите { $link }.
ban-expires = Вы получили бан на { $duration } минут, и он истечёт { $time } по UTC (для московского времени добавьте 3 часа).
ban-banned-1 = Вам, или другому пользователю этого компьютера или соединения, запрещено здесь играть.
Expand All @@ -34,6 +34,7 @@ ban-banned-4 = Наказание выдано администратором: "
ban-banned-5 = Попытки обойти этот бан, например, путём создания нового аккаунта, будут фиксироваться.
ban-banned-6 = Номер раунда: { $round }
ban-banned-7 = не указано
ban-banned-8 = Номер бана: { $banId }

soft-player-cap-full = Сервер заполнен!
panic-bunker-account-denied = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже
Expand Down
Loading