refactor: 💡 fix merge conflict

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-15813
hashicorp · Dec 16, 2024 · 43eabbc · 43eabbc
1 parent 4948e00
commit 43eabbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ui/admin/app/controllers/scopes/scope/workers/index.js b/ui/admin/app/controllers/scopes/scope/workers/index.js
@@ -42,7 +42,7 @@ export default class ScopesScopeWorkersIndexController extends Controller {
       description = 'descriptions.neither-list-nor-create';
     }
     return this.intl.t(description, {
-      resource: this.intl.t('resources.worker.title_plural'),
+      resource: this.intl.t('titles.workers'),
     });
   }
 

diff --git a/ui/admin/tests/unit/controllers/scopes/scope/workers/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/workers/index-test.js
@@ -130,7 +130,7 @@ module('Unit | Controller | scopes/scope/workers/index', function (hooks) {
     assert.strictEqual(
       controller.messageDescription,
       intl.t('descriptions.create-but-not-list', {
-        resource: intl.t('resources.worker.title_plural'),
+        resource: intl.t('titles.workers'),
       }),
     );
   });
@@ -142,7 +142,7 @@ module('Unit | Controller | scopes/scope/workers/index', function (hooks) {
     assert.strictEqual(
       controller.messageDescription,
       intl.t('descriptions.neither-list-nor-create', {
-        resource: intl.t('resources.worker.title_plural'),
+        resource: intl.t('titles.workers'),
       }),
     );
   });