Convert AgentIDCard message to use a Fluent selector (#36263)

Convert AgentIDCard message to use a selector

diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index a38aefce9354b4ebcc189e80af2f3ff515b1e440..9ede128a5a5e100c4de15e56a8463660ec0f0587 100644 (file)
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -42,21 +42,9 @@ namespace Content.Server.Access.Systems
             access.Tags.UnionWith(targetAccess.Tags);
             var addedLength = access.Tags.Count - beforeLength;
 
-            if (addedLength == 0)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("agent-id-no-new", ("card", args.Target)), args.Target.Value, args.User);
-                return;
-            }
-
-            Dirty(uid, access);
-
-            if (addedLength == 1)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("agent-id-new-1", ("card", args.Target)), args.Target.Value, args.User);
-                return;
-            }
-
             _popupSystem.PopupEntity(Loc.GetString("agent-id-new", ("number", addedLength), ("card", args.Target)), args.Target.Value, args.User);
+            if (addedLength > 0)
+                Dirty(uid, access);
         }
 
         private void AfterUIOpen(EntityUid uid, AgentIDCardComponent component, AfterActivatableUIOpenEvent args)

diff --git a/Resources/Locale/en-US/access/components/agent-id-card-component.ftl b/Resources/Locale/en-US/access/components/agent-id-card-component.ftl
index 17a92f60129680691dc35fc108351b34d582067f..5e1e3cd7cfe53e2a31332e54e680be59476dfbdd 100644 (file)
--- a/Resources/Locale/en-US/access/components/agent-id-card-component.ftl
+++ b/Resources/Locale/en-US/access/components/agent-id-card-component.ftl
@@ -1,6 +1,9 @@
-agent-id-no-new = Didn't gain any new accesses from {THE($card)}.
-agent-id-new-1 = Gained one new access from {THE($card)}.
-agent-id-new = Gained {$number} new accesses from {THE($card)}.
+agent-id-new = { $number ->
+    [0] Didn't gain any new accesses from {THE($card)}.
+    [one] Gained one new access from {THE($card)}.
+   *[other] Gained {$number} new accesses from {THE($card)}.
+}
+
 agent-id-card-current-name = Name:
 agent-id-card-current-job = Job:
 agent-id-card-job-icon-label = Job icon: