tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow ownerless ids to show in pda (#3693)

Browse Source 
* Allow ownerless ids to show in pda

* use new localization, and null coalesce

* Adjust localization naming
This commit is contained in:
NIXC
2021-03-31 07:29:57 -06:00
committed by GitHub
parent 84ff928175
commit e842df84fa
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs
View File

@@ -102,23 +102,23 @@ namespace Content.Client.GameObjects.Components.PDA
if (msg.PDAOwnerInfo.ActualOwnerName != null) if (msg.PDAOwnerInfo.ActualOwnerName != null)
{ {
_menu.PDAOwnerLabel.SetMarkup(Loc.GetString("Owner: [color=white]{0}[/color]", _menu.PDAOwnerLabel.SetMarkup(Loc.GetString("comp-pda-ui-owner",
msg.PDAOwnerInfo.ActualOwnerName)); ("ActualOwnerName", msg.PDAOwnerInfo.ActualOwnerName)));
} }
if (msg.PDAOwnerInfo.JobTitle == null || msg.PDAOwnerInfo.IdOwner == null)
if (msg.PDAOwnerInfo.IdOwner != null || msg.PDAOwnerInfo.JobTitle != null)
{ {
_menu.IDInfoLabel.SetMarkup(Loc.GetString("ID:")); _menu.IDInfoLabel.SetMarkup(Loc.GetString("comp-pda-ui",
("Owner",msg.PDAOwnerInfo.IdOwner ?? "Unknown"),
("JobTitle",msg.PDAOwnerInfo.JobTitle ?? "Unassigned")));
} }
else else
{ {
_menu.IDInfoLabel.SetMarkup(Loc.GetString( _menu.IDInfoLabel.SetMarkup(Loc.GetString("comp-pda-ui-blank"));
"ID: [color=white]{0}[/color], [color=yellow]{1}[/color]",
msg.PDAOwnerInfo.IdOwner,
msg.PDAOwnerInfo.JobTitle));
} }
_menu.EjectIDButton.Visible = msg.PDAOwnerInfo.IdOwner != null; _menu.EjectIDButton.Visible = msg.PDAOwnerInfo.IdOwner != null || msg.PDAOwnerInfo.JobTitle != null;
_menu.EjectPenButton.Visible = msg.HasPen; _menu.EjectPenButton.Visible = msg.HasPen;
if (msg.Account != null) if (msg.Account != null)

11
Resources/Locale/en-US/components/pda-component.ftl Normal file
View File

@@ -0,0 +1,11 @@
### UI
# For the PDA screen
comp-pda-ui = ID: [color=white]{$Owner}[/color], [color=yellow]{$JobTitle}[/color]
comp-pda-ui-blank = ID:
comp-pda-ui-owner = Owner: [color=white]{$ActualOwnerName}[/color]