From a33feb2b41706cd4522f218f9169ccf58f5482e7 Mon Sep 17 00:00:00 2001 From: Michael Klein Date: Wed, 12 Oct 2022 13:34:23 +0200 Subject: [PATCH] Use translations for empty states peers.show --- .../app/templates/dc/peers/show/addresses.hbs | 6 ++-- .../app/templates/dc/peers/show/exported.hbs | 29 ++++++--------- .../app/templates/dc/peers/show/imported.hbs | 26 ++++++-------- .../consul-ui/translations/routes/en-us.yaml | 36 ++++++++++++++++--- 4 files changed, 53 insertions(+), 44 deletions(-) diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/show/addresses.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/show/addresses.hbs index e7892b3589..f3934cda50 100644 --- a/ui/packages/consul-peerings/app/templates/dc/peers/show/addresses.hbs +++ b/ui/packages/consul-peerings/app/templates/dc/peers/show/addresses.hbs @@ -5,13 +5,11 @@

- No server addresses. + {{t "routes.dc.peers.show.addresses.empty.header"}}

-
- There don't seem to be any server addresses for this peer. -
+ {{t "routes.dc.peers.show.addresses.empty.body" htmlSafe=true}}
  • diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/show/exported.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/show/exported.hbs index dffbb14684..6119c00c04 100644 --- a/ui/packages/consul-peerings/app/templates/dc/peers/show/exported.hbs +++ b/ui/packages/consul-peerings/app/templates/dc/peers/show/exported.hbs @@ -79,28 +79,19 @@

    - No visible exported services to - {{route.model.peer.Name}} + {{t + "routes.dc.peers.show.exported.empty.header" + name=route.model.peer.Name + }}

    - {{#if items.length}} -
    - No services where found matching that search, or you - may not have access to view the services you are - searching for. -
    - {{else}} -
    - Services must be exported from one peer to another to - enable service communication across two peers. There - don't seem to be any services exported to - {{route.model.peer.Name}} - yet, or you may not have - services:read - permissions to access to this view. -
    - {{/if}} + {{t + "routes.dc.peers.show.exported.empty.body" + items=items.length + name=route.model.peer.Name + htmlSafe=true + }}
  • diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/show/imported.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/show/imported.hbs index d8b0e93e02..ecf1e756b5 100644 --- a/ui/packages/consul-peerings/app/templates/dc/peers/show/imported.hbs +++ b/ui/packages/consul-peerings/app/templates/dc/peers/show/imported.hbs @@ -85,25 +85,19 @@

    - No visible imported services from - {{route.model.peer.Name}} + {{t + "routes.dc.peers.show.imported.empty.header" + name=route.model.peer.Name + }}

    - {{#if items.length}} -
    - No services where found matching that search, or you may not - have access to view the services you are searching for. -
    - {{else}} -
    Services must be exported from one peer to another to - enable service communication across two peers. There don't - seem to be any services imported from - {{route.model.peer.Name}} - yet, or you may not have - service:read - permissions to access to this view.
    - {{/if}} + {{t + "routes.dc.peers.show.imported.empty.body" + items=items.length + name=route.model.peer.Name + htmlSafe=true + }}
  • diff --git a/ui/packages/consul-ui/translations/routes/en-us.yaml b/ui/packages/consul-ui/translations/routes/en-us.yaml index f8f14fedf0..4e157d9dff 100644 --- a/ui/packages/consul-ui/translations/routes/en-us.yaml +++ b/ui/packages/consul-ui/translations/routes/en-us.yaml @@ -117,10 +117,10 @@ dc: index: empty: header: | - {items, select, - 0 {Welcome to Peers} - other {No peers found} - } + {items, select, + 0 {Welcome to Peers} + other {No peers found} + } body: | {items, select, 0 {Cluster peering is the recommended way to connect services across or within Consul datacenters. Peering is a one-to-one relationship in which each peer is either a open-source Consul datacenter or a Consul enterprise admin partition. There don't seem to be any peers for this {canUsePartitions, select, @@ -145,6 +145,32 @@ dc: tab-tooltip: Services exported from {name} addresses: tooltip: The number of services exported from {name} + show: + imported: + empty: + header: No visible imported services from {name} + body: | +
    + {items, select, + 0 {Services must be exported from one peer to another to enable service communication across two peers. There don't seem to be any services imported from {name} yet, or you may not have services:read permissions to access to this view.} + other {No services where found matching that search, or you may not have access to view the services you are searching for.} + } +
    + exported: + empty: + header: No visible exported services to {name} + body: | +
    + {items, select, + 0 {Services must be exported from one peer to another to enable service communication across two peers. There don't seem to be any services exported to {name} yet, or you may not have services:read permissions to access to this view.} + other {No services where found matching that search, or you may not have access to view the services you are searching for.} + } +
    + + addresses: + empty: + header: No server adddresses. + body:
    There don't seem to be any server addresses for this peer.
    partitions: index: empty: @@ -152,7 +178,7 @@ dc: {items, select, 0 {Welcome to Partitions} other {No partitions found} - } + } body: | {items, select, 0 {There don't seem to be any partitions{canUseACLs, select,