Skip to content

Commit

Permalink
Ensure consistent naming conventions for "changelog" (CFM-476)
Browse files Browse the repository at this point in the history
  • Loading branch information
arlen committed Nov 11, 2025
1 parent 7aaf38f commit 1280a79
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
9 changes: 9 additions & 0 deletions app/resources/locales/en_US/field.po
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ msgstr "Country Code"
msgid "created"
msgstr "Created"

msgid "created.value"
msgstr "Created: {0}"

msgid "cri"
msgstr "Change Request Identifier"

Expand Down Expand Up @@ -155,6 +158,9 @@ msgstr "Frozen"
msgid "id"
msgstr "ID"

msgid "id.value"
msgstr "ID: {0}"

msgid "item"
msgstr "Item"

Expand Down Expand Up @@ -221,6 +227,9 @@ msgstr "Modifiable"
msgid "modified"
msgstr "Modified"

msgid "modified.value"
msgstr "Modified: {0}"

msgid "name"
msgstr "Name"

Expand Down
18 changes: 3 additions & 15 deletions app/resources/locales/en_US/information.po
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand All @@ -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"

Expand Down
5 changes: 4 additions & 1 deletion app/resources/locales/en_US/operation.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions app/templates/element/changelog.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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">
Expand Down Expand Up @@ -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; ?>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/element/entityMetadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/element/form/infoDiv/groupMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -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; ?>

0 comments on commit 1280a79

Please sign in to comment.