From 1280a7972062632a8896a61b78c15510817e92f2 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 11 Nov 2025 10:57:16 -0500
Subject: [PATCH] Ensure consistent naming conventions for "changelog"
 (CFM-476)

---
 app/resources/locales/en_US/field.po           |  9 +++++++++
 app/resources/locales/en_US/information.po     | 18 +++---------------
 app/resources/locales/en_US/operation.po       |  5 ++++-
 app/templates/element/changelog.php            | 10 +++++-----
 app/templates/element/entityMetadata.php       |  6 +++---
 .../element/form/infoDiv/groupMember.php       |  2 +-
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/resources/locales/en_US/field.po b/app/resources/locales/en_US/field.po
index e67622d8f..6c8e2178c 100644
--- a/app/resources/locales/en_US/field.po
+++ b/app/resources/locales/en_US/field.po
@@ -89,6 +89,9 @@ msgstr "Country Code"
 msgid "created"
 msgstr "Created"
 
+msgid "created.value"
+msgstr "Created: {0}"
+
 msgid "cri"
 msgstr "Change Request Identifier"
 
@@ -155,6 +158,9 @@ msgstr "Frozen"
 msgid "id"
 msgstr "ID"
 
+msgid "id.value"
+msgstr "ID: {0}"
+
 msgid "item"
 msgstr "Item"
 
@@ -221,6 +227,9 @@ msgstr "Modifiable"
 msgid "modified"
 msgstr "Modified"
 
+msgid "modified.value"
+msgstr "Modified: {0}"
+
 msgid "name"
 msgstr "Name"
 
diff --git a/app/resources/locales/en_US/information.po b/app/resources/locales/en_US/information.po
index ea07bfbe4..9d2120a65 100644
--- a/app/resources/locales/en_US/information.po
+++ b/app/resources/locales/en_US/information.po
@@ -31,23 +31,20 @@ msgid "api.key"
 msgstr "This newly generated API Key cannot be recovered. If it is lost a new key must be generated."
 
 msgid "changelog"
-msgstr "Change Log"
+msgstr "Changelog"
 
 msgid "changelog.archived"
 msgstr "This is an archive record"
 
 msgid "changelog.aria.collapsed"
-msgstr "Change Log, collapsed, button, click to expand"
+msgstr "Changelog, collapsed, button, click to expand"
 
 msgid "changelog.aria.expanded"
-msgstr "Change Log, expanded, button, click to collapse"
+msgstr "Changelog, expanded, button, click to collapse"
 
 msgid "changelog.deleted"
 msgstr "This record has been deleted"
 
-msgid "changelog.return"
-msgstr "Return to parent record"
-
 msgid "cos.none"
 msgstr "You are not an active member in any collaboration. If your request for enrollment is still being processed, you will not be able to login until it is approved. Please contact an administrator for assistance."
 
@@ -60,15 +57,6 @@ msgstr "<a href="{0}">Platform-wide configurations</a> are available in the <a h
 msgid "cmp.co.notice"
 msgstr "This is the COmanage CO, which is used for platform wide <a href="{0}">configurations</a>."
 
-msgid "entity.created"
-msgstr "Created: {0}"
-
-msgid "entity.id"
-msgstr "ID: {0}"
-
-msgid "entity.modified"
-msgstr "Modified: {0}"
-
 msgid "noattrs"
 msgstr "No attributes"
 
diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po
index bfd24d042..cbcf54286 100644
--- a/app/resources/locales/en_US/operation.po
+++ b/app/resources/locales/en_US/operation.po
@@ -124,7 +124,10 @@ msgid "cancel"
 msgstr "Cancel"
 
 msgid "changelog.view"
-msgstr "View Change Log"
+msgstr "View Changelog"
+
+msgid "changelog.return"
+msgstr "Return to active record"
 
 msgid "clear"
 msgstr "Clear"
diff --git a/app/templates/element/changelog.php b/app/templates/element/changelog.php
index 134ddf094..0adf91c09 100644
--- a/app/templates/element/changelog.php
+++ b/app/templates/element/changelog.php
@@ -31,7 +31,7 @@
     return;
   }
 
-  // If this is an archived record, include a link to the parent (active) record
+  // If this is an archive record, include a link to the parent (active) record
   $clAttr = $vv_obj->changelogAttributeName();
   $parentUrl = null;
 
@@ -41,12 +41,12 @@
     );
   }
 
-  // Get the change log open/closed state
+  // Get the changelog open/closed state
   $changeLogState = $this->ApplicationState->getValue(ApplicationStateEnum::ChangeLogState, '');
   $changeLogStateId = $this->ApplicationState->getId(ApplicationStateEnum::ChangeLogState);
 
-  // We'll render an index of all archived records if we are the current active record,
-  // or just the current metadata if we are an archived record
+  // We'll render an index of all archive records if we are the current active record,
+  // or just the current metadata if we are an archive record
 ?>
 
 <div id="changelog-container" class="accordion">
@@ -126,7 +126,7 @@
                   <a class="changelog-parent-link" href="<?= $parentUrl ?>">
                     <div class="changelog-parent-id"><?= $vv_obj->$clAttr ?></div>
                     <div class="changelog-parent-link-button btn btn-sm btn-primary">
-                      <?= __d('information','changelog.return') ?>
+                      <?= __d('operation','changelog.return') ?>
                     </div>
                   </a>
                 <?php endif; ?>
diff --git a/app/templates/element/entityMetadata.php b/app/templates/element/entityMetadata.php
index e7e87a4f0..41865d84a 100644
--- a/app/templates/element/entityMetadata.php
+++ b/app/templates/element/entityMetadata.php
@@ -31,14 +31,14 @@
 <?php if(isset($vv_obj?->id)): ?>
   <div id="entity-metadata">
     <div id="cm-entity-id">
-      <?= __d('information', 'entity.id', $vv_obj->id) ?>
+      <?= __d('field', 'id.value', $vv_obj->id) ?>
     </div>
     <div id="cm-entity-created">
-      <?= __d('information', 'entity.created', $vv_obj->created) ?>
+      <?= __d('field', 'created.value', $vv_obj->created) ?>
     </div>
     <?php if($vv_obj->created != $vv_obj->modified): ?>
       <div id="cm-entity-modified">
-        <?= __d('information', 'entity.modified', $vv_obj->modified) ?>
+        <?= __d('field', 'modified.value', $vv_obj->modified) ?>
       </div>
     <?php endif; ?>
   </div>
diff --git a/app/templates/element/form/infoDiv/groupMember.php b/app/templates/element/form/infoDiv/groupMember.php
index a645c65ed..2f92b4e99 100644
--- a/app/templates/element/form/infoDiv/groupMember.php
+++ b/app/templates/element/form/infoDiv/groupMember.php
@@ -45,7 +45,7 @@
   );?>
 </span>
 <span class="group-member-id">
-  (<?= __d('information', 'entity.id', [$vv_selected_person['id']]) ?>)
+  (<?= __d('field', 'id.value', [$vv_selected_person['id']]) ?>)
 </span>
 
 <?php endif; ?>