From 7fbf112240c946ab6bb6035f00cc9b23555a9a21 Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Mon, 11 Apr 2022 10:13:31 +0800 Subject: [PATCH] [web-app]i18n for add edit monitor --- .../monitor-edit/monitor-edit.component.html | 44 +++++++++++-------- .../monitor-edit/monitor-edit.component.ts | 24 +++++----- .../monitor-new/monitor-new.component.html | 44 +++++++++++-------- .../monitor-new/monitor-new.component.ts | 18 ++++---- web-app/src/assets/i18n/en-US.json | 19 ++++++++ web-app/src/assets/i18n/zh-CN.json | 19 ++++++++ 6 files changed, 112 insertions(+), 56 deletions(-) diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html index e4f1402..b91dae2 100644 --- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html +++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html @@ -3,20 +3,20 @@ - 仪表盘 + {{ 'menu.dashboard' | i18n }} - 监控列表 + {{ 'monitors.list' | i18n }} - 修改 {{ 'monitor.app.' + monitor.app | i18n }} 监控 + {{ 'monitors.edit' | i18n }} {{ 'monitor.app.' + monitor.app | i18n }} {{ 'monitor' | i18n }} - 帮助  + {{ 'common.button.help' | i18n }}  @@ -27,17 +27,19 @@
- 监控Host + + {{ 'monitor.host' | i18n }} + - + - - 监控名称 + + {{ 'monitor.name' | i18n }} - + @@ -163,7 +165,7 @@ - + - @@ -305,7 +307,9 @@ - 采集间隔 + + {{ 'monitor.intervals' | i18n }} + @@ -313,14 +317,18 @@ - 测试连接 + + {{ 'monitors.detect' | i18n }} + - 描述备注 + + {{ 'monitor.description' | i18n }} + @@ -330,9 +338,9 @@
- - - + + +
diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts index be5f8c8..82293a2 100644 --- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts +++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts @@ -1,7 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { TitleService } from '@delon/theme'; +import { I18NService } from '@core'; +import { ALAIN_I18N_TOKEN, TitleService } from '@delon/theme'; import { NzNotificationService } from 'ng-zorro-antd/notification'; import { throwError } from 'rxjs'; import { switchMap } from 'rxjs/operators'; @@ -25,7 +26,8 @@ export class MonitorEditComponent implements OnInit { private route: ActivatedRoute, private router: Router, private titleSvc: TitleService, - private notifySvc: NzNotificationService + private notifySvc: NzNotificationService, + @Inject(ALAIN_I18N_TOKEN) private i18nSvc: I18NService ) {} paramDefines!: ParamDefine[]; @@ -64,8 +66,8 @@ export class MonitorEditComponent implements OnInit { this.detected = message.data.detected ? message.data.detected : true; } else { console.warn(message.msg); - this.notifySvc.error('查询异常，此监控不存在', message.msg); - return throwError('查询此监控异常'); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.not-found'), message.msg); + return throwError(this.i18nSvc.fanyi('monitors.not-found')); } return this.appDefineSvc.getAppParamsDefine(this.monitor.app); }) @@ -168,15 +170,15 @@ export class MonitorEditComponent implements OnInit { message => { this.isSpinning = false; if (message.code === 0) { - this.notifySvc.success('修改监控成功', ''); + this.notifySvc.success(this.i18nSvc.fanyi('monitors.edit.success'), ''); this.router.navigateByUrl(`/monitors?app=${this.monitor.app}`); } else { - this.notifySvc.error('修改监控失败', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.edit.failed'), message.msg); } }, error => { this.isSpinning = false; - this.notifySvc.error('修改监控失败', error.error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.edit.failed'), error.error.msg); } ); } @@ -217,14 +219,14 @@ export class MonitorEditComponent implements OnInit { message => { this.isSpinning = false; if (message.code === 0) { - this.notifySvc.success('探测成功', ''); + this.notifySvc.success(this.i18nSvc.fanyi('monitors.detect.success'), ''); } else { - this.notifySvc.error('探测失败', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.detect.failed'), message.msg); } }, error => { this.isSpinning = false; - this.notifySvc.error('探测异常', error.error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.detect.failed'), error.error.msg); } ); } diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html index a1f4d13..4bb5d97 100644 --- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html +++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html @@ -3,20 +3,20 @@ - 仪表盘 + {{ 'menu.dashboard' | i18n }} - 监控列表 + {{ 'monitors.list' | i18n }} - 新增 {{ 'monitor.app.' + monitor.app | i18n }} 监控 + {{ 'monitors.new' | i18n }} {{ 'monitor.app.' + monitor.app | i18n }} {{ 'monitor' | i18n }} - 帮助  + {{ 'common.button.help' | i18n }}  @@ -27,7 +27,9 @@
- 监控Host + + {{ 'monitor.host' | i18n }} + - - 监控名称 + + {{ 'monitor.name' | i18n }} - + @@ -172,7 +174,7 @@ - + - @@ -314,7 +316,9 @@ - 采集间隔 + + {{ 'monitor.intervals' | i18n }} + @@ -322,14 +326,18 @@ - 测试连接 + + {{ 'monitors.detect' | i18n }} + - 描述备注 + + {{ 'monitor.description' | i18n }} + @@ -339,9 +347,9 @@
- - - + + +
diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts index b1f67cb..6820747 100644 --- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts +++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts @@ -1,8 +1,8 @@ -import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { I18NService } from '@core'; -import { TitleService } from '@delon/theme'; +import { ALAIN_I18N_TOKEN, TitleService } from '@delon/theme'; import { NzNotificationService } from 'ng-zorro-antd/notification'; import { switchMap } from 'rxjs/operators'; @@ -34,7 +34,7 @@ export class MonitorNewComponent implements OnInit { private router: Router, private notifySvc: NzNotificationService, private cdr: ChangeDetectorRef, - private i18n: I18NService, + @Inject(ALAIN_I18N_TOKEN) private i18nSvc: I18NService, private titleSvc: TitleService, private formBuilder: FormBuilder ) { @@ -150,15 +150,15 @@ export class MonitorNewComponent implements OnInit { message => { this.isSpinning = false; if (message.code === 0) { - this.notifySvc.success('新增监控成功', ''); + this.notifySvc.success(this.i18nSvc.fanyi('monitors.new.success'), ''); this.router.navigateByUrl(`/monitors?app=${this.monitor.app}`); } else { - this.notifySvc.error('新增监控失败', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.new.failed'), message.msg); } }, error => { this.isSpinning = false; - this.notifySvc.error('新增监控失败', error.error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.new.failed'), error.error.msg); } ); } @@ -199,14 +199,14 @@ export class MonitorNewComponent implements OnInit { message => { this.isSpinning = false; if (message.code === 0) { - this.notifySvc.success('探测成功', ''); + this.notifySvc.success(this.i18nSvc.fanyi('monitors.detect.success'), ''); } else { - this.notifySvc.error('探测失败', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.detect.failed'), message.msg); } }, error => { this.isSpinning = false; - this.notifySvc.error('探测异常', error.error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('monitors.detect.failed'), error.error.msg); } ); } diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index c89ca52..c49bd81 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -40,7 +40,13 @@ "monitor": { "": "Monitor", "name": "Monitor Name", + "name.tip": "Monitor name, the name needs to be unique", "host": "Monitor Host", + "host.tip": "The monitored peer IP or domain name", + "description": "Description", + "description.tip": "Description and remarks", + "intervals": "Intervals", + "intervals.tip": "Monitor the interval time of periodic collection of data, second", "category": { "": "Category", "service": "Service", @@ -98,7 +104,12 @@ "dashboard.monitors.distribute": "Monitor Distribution", "monitors.list": "Monitor List", "monitors.new": "New", + "monitors.new.success": "New Monitor Success", + "monitors.new.failed": "New Monitor Failed", "monitors.edit": "Edit", + "monitors.edit.success": "Update Monitor Success", + "monitors.edit.failed": "Update Monitor Failed", + "monitors.not-found": "This Monitor Not Found", "monitors.delete": "Delete", "monitors.edit-monitor": "Edit Monitor", "monitors.delete-monitor": "Delete Monitor", @@ -107,6 +118,12 @@ "monitors.search.placeholder": "Search Monitor", "monitors.search.filter": "Filter Monitor Status", "monitors.total": "Total", + "monitors.advanced": "Advanced", + "monitors.advanced.tip": "Setting Advanced Param", + "monitors.detect": "Detect", + "monitors.detect.success": "Detect Success", + "monitors.detect.failed": "Detect Failed", + "monitors.detect.tip": "Detect monitor available before apply", "common.search": "Search", "common.refresh": "Refresh", "common.edit-time": "Last Update Time", @@ -130,6 +147,8 @@ "common.notify.enable-fail": "Enable Failed!", "common.button.ok": "OK", "common.button.cancel": "Cancel", + "common.button.help": "Help", + "common.button.detect": "Detect", "app.login.message-need-identifier": "Please enter your email or mobile number", "app.login.message-need-credential": "Please enter password", "app.password.forgot": "Forgot password", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index 8594b1d..63facf0 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -40,7 +40,13 @@ "monitor": { "": "监控", "name": "监控名称", + "name.tip": "标识监控的名称,名称需要保证唯一性", "host": "监控Host", + "host.tip": "被监控的对端IP或域名", + "description": "描述备注", + "description.tip": "更多标识和描述此监控的备注信息", + "intervals": "采集间隔", + "intervals.tip": "监控周期性采集数据间隔时间,单位秒", "category": { "": "监控类别", "service": "应用服务", @@ -98,7 +104,12 @@ "dashboard.monitors.distribute": "纳管数量分布", "monitors.list": "监控列表", "monitors.new": "新增", + "monitors.new.success": "新增监控成功", + "monitors.new.failed": "新增监控失败", "monitors.edit": "编辑", + "monitors.edit.success": "修改监控成功", + "monitors.edit.failed": "修改监控失败", + "monitors.not-found": "查询异常，此监控不存在", "monitors.delete": "删除", "monitors.edit-monitor": "编辑监控", "monitors.delete-monitor": "删除监控", @@ -107,6 +118,12 @@ "monitors.search.placeholder": "搜索监控", "monitors.search.filter": "监控状态过滤", "monitors.total": "总量", + "monitors.advanced": "高级设置", + "monitors.advanced.tip": "设置高级可选参数", + "monitors.detect": "测试连接", + "monitors.detect.success": "测试连接成功", + "monitors.detect.failed": "测试连接失败", + "monitors.detect.tip": "新增监控前是否先探测检查监控可用性", "common.search": "搜索", "common.refresh": "刷新", "common.edit-time": "最新修改时间", @@ -129,7 +146,9 @@ "common.notify.enable-success": "启用监控成功!", "common.notify.enable-fail": "启用监控失败!", "common.button.ok": "确定", + "common.button.detect": "测试", "common.button.cancel": "取消", + "common.button.help": "帮助", "app.lock": "锁屏", "app.passport.desc": "TanCloud-易用友好的高性能监控云服务", "app.passport.welcome": "欢迎使用TanCloud探云-监控云服务-tancloud.cn",