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

Merge pull request #2765 from sgkoishi/general-devel

Browse source 
Minor i18n fix with interpolation
This commit is contained in:
Lucas Nicodemus 2022-10-28 16:10:04 -07:00 • committed by GitHub
commit ddf0844214
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 (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
players.Add(ply.Name);
}
@ -5352,7 +5355,7 @@ namespace TShockAPI
new PaginationTools.Settings
{
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.SendMessage(GetString("Authenticated as " + args.Player.Name + " successfully."), Color.LimeGreen);
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + ".");
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.UserAccounts.SetUserAccountUUID(account, args.Player.UUID);
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
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;
}