themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Minor i18n fix with interpolation

Browse source 
The extractor handle the concatenate incorrectly
This commit is contained in:
SGKoishi 2022-10-28 14:01:20 -07:00
parent 80736028df
commit 6c3415d86b
No known key found for this signature in database
GPG key ID: 8FFC399070653828
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/Commands.cs
View file

@ -5341,7 +5341,10 @@ namespace TShockAPI
if (ply != null && ply.Active) if (ply != null && ply.Active)
{ {
if (displayIdsRequested) if (displayIdsRequested)
players.Add(GetString($"{ply.Name} (Index: {ply.Index}{(ply.Account != null ? ", Account ID: " + ply.Account.ID : "")})")); if (ply.Account != null)
players.Add(GetString($"{ply.Name} (Index: {ply.Index}, Account ID: {ply.Account.ID})"));
else
players.Add(GetString($"{ply.Name} (Index: {ply.Index})"));
else else
players.Add(ply.Name); players.Add(ply.Name);
} }
@ -5352,7 +5355,7 @@ namespace TShockAPI
new PaginationTools.Settings new PaginationTools.Settings
{ {
IncludeHeader = false, IncludeHeader = false,
FooterFormat = GetString($"Type {Specifier}who {(displayIdsRequested ? "-i" : string.Empty)}{Specifier} for more.") FooterFormat = GetString($"Type {Specifier}who {(displayIdsRequested ? "-i" : string.Empty)} for more.")
} }
); );
} }

6
TShockAPI/GetDataHandlers.cs
View file

@ -3189,13 +3189,13 @@ namespace TShockAPI
args.Player.IsDisabledForBannedWearable = false; args.Player.IsDisabledForBannedWearable = false;
args.Player.SendMessage(GetString("Authenticated as " + args.Player.Name + " successfully."), Color.LimeGreen); args.Player.SendMessage(GetString($"Authenticated as {args.Player.Name} successfully."), Color.LimeGreen);
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + "."); TShock.Log.ConsoleInfo($"{args.Player.Name} authenticated successfully as user {args.Player.Name}.");
TShock.UserAccounts.SetUserAccountUUID(account, args.Player.UUID); TShock.UserAccounts.SetUserAccountUUID(account, args.Player.UUID);
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
return true; return true;
} }
args.Player.Kick("Your password did not match this character's password.", true, true); args.Player.Kick(GetString("Your password did not match this character's password."), true, true);
return true; return true;
} }