Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fluent Localisation Fixes (#3344)

Browse Source 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
Remie Richards
2021-02-22 00:07:46 +00:00
committed by GitHub
parent 63947a6d35
commit 85916b87b4
31 changed files with 276 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Threading;
using System.Threading.Tasks;
using Content.Server.GameObjects.EntitySystems.DoAfter;
@@ -80,12 +80,26 @@ namespace Content.Server.GameObjects.Components.Items.RCD
int mode = (int) _mode; //Firstly, cast our RCDmode mode to an int (enums are backed by ints anyway by default)
mode = (++mode) % _modes.Length; //Then, do a rollover on the value so it doesnt hit an invalid state
_mode = (RcdMode) mode; //Finally, cast the newly acquired int mode to an RCDmode so we can use it.
Owner.PopupMessage(eventArgs.User, Loc.GetString("The RCD is now set to {0} mode.", _mode)); //Prints an overhead message above the RCD
Owner.PopupMessage(eventArgs.User,
Loc.GetString(
"rcd-component-change-mode",
("mode", _mode.ToString())
)
); //Prints an overhead message above the RCD
}
public void Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(Loc.GetString("It's currently on {0} mode, and holds {1} charges.",_mode.ToString(), _ammo));
if (inDetailsRange)
{
message.AddMarkup(
Loc.GetString(
"rcd-component-examine-detail-count",
("mode", _mode),
("ammoCount", _ammo)
)
);
}
}
async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)

6
Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
@@ -90,7 +90,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
{
if (_utensilsNeeded != UtensilType.None)
{
eventArgs.User.PopupMessage(Loc.GetString("You need to use a {0} to eat that!", _utensilsNeeded));
eventArgs.User.PopupMessage(Loc.GetString("food-you-need-utensil", ("utensil", _utensilsNeeded)));
return false;
}
@@ -160,7 +160,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
if (!types.HasFlag(_utensilsNeeded))
{
trueTarget.PopupMessage(user, Loc.GetString("You need to be holding a {0} to eat that!", _utensilsNeeded));
trueTarget.PopupMessage(user, Loc.GetString("food-you-need-to-hold-utensil", ("utensil", _utensilsNeeded)));
return false;
}
}

25
Content.Server/GameObjects/Components/Stack/StackComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
@@ -107,12 +107,21 @@ namespace Content.Server.GameObjects.Components.Stack
if (stack.AvailableSpace == 0)
{
eventArgs.Using.SpawnTimer(300, () => popupPos.PopupMessage(eventArgs.User, "Stack is now full."));
eventArgs.Using.SpawnTimer(
300,
() => popupPos.PopupMessage(
eventArgs.User,
Loc.GetString("stack-component-becomes-full")
)
);
}
}
else if (toTransfer == 0 && stack.AvailableSpace == 0)
{
popupPos.PopupMessage(eventArgs.User, "Stack is already full.");
popupPos.PopupMessage(
eventArgs.User,
Loc.GetString("stack-component-already-full")
);
}
return true;
@@ -122,9 +131,13 @@ namespace Content.Server.GameObjects.Components.Stack
{
if (inDetailsRange)
{
message.AddMarkup(Loc.GetPluralString(
"There is [color=lightgray]1[/color] thing in the stack",
"There are [color=lightgray]{0}[/color] things in the stack.", Count, Count));
message.AddMarkup(
Loc.GetString(
"stack-component-examine-detail-count",
("count", Count),
("markupCountColor", "lightgray")
)
);
}
}
}

20
Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Content.Server.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces;
@@ -91,8 +91,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
if (--Uses == 0)
{
sprite.LayerSetState(0, "burnt");
Owner.PopupMessage(user, Loc.GetString("The flash burns out!"));
Owner.PopupMessage(user, Loc.GetString("flash-component-becomes-empty"));
}
else if (!_flashing)
{
@@ -136,7 +135,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
if (entity != user)
{
user.PopupMessage(entity, Loc.GetString("{0:TheName} blinds you with {1:theName}", user, Owner));
user.PopupMessage(entity,
Loc.GetString(
"flash-component-user-blinds-you",
("user", user)
)
);
}
}
@@ -144,7 +148,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
{
if (!HasUses)
{
message.AddText("It's burnt out.");
message.AddText(Loc.GetString("flash-component-examine-empty"));
return;
}
@@ -152,9 +156,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
{
message.AddMarkup(
Loc.GetString(
"The flash has [color=green]{0}[/color] {1} remaining.",
Uses,
Loc.GetPluralString("use", "uses", Uses)
"flash-component-examine-detail-count",
("count", Uses),
("markupCountColor", "green")
)
);
}