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

Use TheName macro and GrammarComponent (#1396)

Browse Source
This commit is contained in:
Hugal31
2020-07-17 10:44:32 +02:00
committed by GitHub
parent f313a9267a
commit a5051c549b
8 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
View File

@@ -120,7 +120,7 @@ namespace Content.Server.GameObjects.Components.Gravity
var notifyManager = IoCManager.Resolve<IServerNotifyManager>();
notifyManager.PopupMessage(Owner, eventArgs.User, Loc.GetString("You repair the gravity generator with the welder"));
notifyManager.PopupMessage(Owner, eventArgs.User, Loc.GetString("You repair {0:theName} with {1:theName}", Owner, eventArgs.Using));
return true;
}

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

@@ -101,7 +101,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
if (UsesRemaining <= 0)
{
user.PopupMessage(user, Loc.GetString($"The {Owner.Name} is empty!"));
user.PopupMessage(user, Loc.GetString("{0:TheName} is empty!", Owner));
return false;
}

4
Content.Server/GameObjects/Components/PottedPlantHideComponent.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Server.GameObjects.Components
if (size > MaxItemSize)
{
Owner.PopupMessage(eventArgs.User,
Loc.GetString("{0:TheName} is too big to fit in the plant!", eventArgs.Using.Name));
Loc.GetString("{0:TheName} is too big to fit in the plant!", eventArgs.Using));
return false;
}
@@ -57,7 +57,7 @@ namespace Content.Server.GameObjects.Components
return false;
}
Owner.PopupMessage(eventArgs.User, Loc.GetString("You hide {0:theName} in the plant.", eventArgs.Using.Name));
Owner.PopupMessage(eventArgs.User, Loc.GetString("You hide {0:theName} in the plant.", eventArgs.Using));
Rustle();
return true;
}

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

@@ -106,7 +106,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
{
sprite.LayerSetState(0, "burnt");
_notifyManager.PopupMessage(Owner, user, "The flash burns out!");
_notifyManager.PopupMessage(Owner, user, Loc.GetString("The flash burns out!"));
}
else if (!_flashing)
{
@@ -151,7 +151,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
if (entity != user)
{
_notifyManager.PopupMessage(user, entity, $"{user.Name} blinds you with the {Owner.Name}");
_notifyManager.PopupMessage(user, entity, Loc.GetString("{0:TheName} blinds you with {1:theName}", user, Owner));
}
}
@@ -166,7 +166,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
if (inDetailsRange)
{
message.AddMarkup(_localizationManager.GetString(
$"The flash has [color=green]{Uses}[/color] uses remaining."));
"The flash has [color=green]{0}[/color] uses remaining.", Uses));
}
}
}