dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8450 from vvlladd28/bug/edge/fix-translate

Browse Source 
Improve Edge translation
This commit is contained in:
Igor Kulikov 2023-05-01 16:44:06 +03:00 committed by GitHub
commit 42df62340b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
View File

@ -260,7 +260,7 @@ const routes: Routes = [
path: ':edgeId/ruleChains',
data: {
breadcrumb: {
label: 'edge.edge-rulechains',
label: 'edge.rulechains',
icon: 'settings_ethernet'
}
},

2
ui-ngx/src/app/modules/home/pages/edge/edge.component.html
View File

@ -117,7 +117,7 @@
<button mat-raised-button color="primary"
[disabled]="(isLoading$ | async)"
(click)="onEntityAction($event, 'openInstructions')"
[fxShow]="!isEdit">
[fxShow]="!isEdit && edgeScope !== 'customer_user'">
<mat-icon>info_outline</mat-icon>
<span>{{ 'edge.install-connect-instructions' | translate }}</span>
</button>

18
ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
View File

@ -211,31 +211,31 @@ export class EdgesTableConfigResolver implements Resolve<EntityTableConfig<EdgeI
onAction: ($event, entity) => this.unassignFromCustomer($event, entity)
},
{
name: this.translate.instant('edge.edge-assets'),
name: this.translate.instant('edge.manage-assets'),
icon: 'domain',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.ASSET)
},
{
name: this.translate.instant('edge.edge-devices'),
name: this.translate.instant('edge.manage-devices'),
icon: 'devices_other',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.DEVICE)
},
{
name: this.translate.instant('edge.edge-entity-views'),
name: this.translate.instant('edge.manage-entity-views'),
icon: 'view_quilt',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.ENTITY_VIEW)
},
{
name: this.translate.instant('edge.edge-dashboards'),
name: this.translate.instant('edge.manage-dashboards'),
icon: 'dashboard',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.DASHBOARD)
},
{
name: this.translate.instant('edge.edge-rulechains'),
name: this.translate.instant('edge.manage-rulechains'),
icon: 'settings_ethernet',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.RULE_CHAIN)
@ -261,25 +261,25 @@ export class EdgesTableConfigResolver implements Resolve<EntityTableConfig<EdgeI
if (edgeScope === 'customer_user') {
actions.push(
{
name: this.translate.instant('edge.edge-assets'),
name: this.translate.instant('edge.manage-assets'),
icon: 'domain',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.ASSET)
},
{
name: this.translate.instant('edge.edge-devices'),
name: this.translate.instant('edge.manage-devices'),
icon: 'devices_other',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.DEVICE)
},
{
name: this.translate.instant('edge.edge-entity-views'),
name: this.translate.instant('edge.manage-entity-views'),
icon: 'view_quilt',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.ENTITY_VIEW)
},
{
name: this.translate.instant('edge.edge-dashboards'),
name: this.translate.instant('edge.manage-dashboards'),
icon: 'dashboard',
isEnabled: (entity) => true,
onAction: ($event, entity) => this.openEdgeEntitiesByType($event, entity, EntityType.DASHBOARD)

2
ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
View File

@ -198,7 +198,7 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
} else if (ruleChainScope === 'edges') {
return this.translate.instant('edge.rulechain-templates');
} else if (ruleChainScope === 'edge') {
return this.config.tableTitle = edge.name + ': ' + this.translate.instant('edge.rulechains');
return this.config.tableTitle = edge.name + ': ' + this.translate.instant('rulechain.rulechains');
}
}

2
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -1861,7 +1861,7 @@
"dashboards": "Edge Dashboards",
"rulechain-templates": "Rule chain templates",
"edge-rulechain-templates": "Edge rule chain templates",
"rulechains": "Rule chains",
"rulechains": "Edge rule chains",
"search": "Search edges",
"selected-edges": "{ count, plural, =1 {1 edge} other {# edges} } selected",
"any-edge": "Any edge",