diff --git a/manager/src/main/resources/define/app/A-example.yml b/manager/src/main/resources/define/app/A-example.yml
index f3642ed..4574e90 100644
--- a/manager/src/main/resources/define/app/A-example.yml
+++ b/manager/src/main/resources/define/app/A-example.yml
@@ -4,7 +4,7 @@ category: custom
app: example
name:
zh-CN: 模拟应用类型
- en-US: EXAMPLE APP
+ en-US: EXAMPLE
# 参数映射map. type是参数类型: 0-number数字, 1-string明文字符串, 2-secret加密字符串, 3-map映射的json串
# 强制固定必须参数 - host
configmap:
diff --git a/manager/src/main/resources/define/app/fullsite.yml b/manager/src/main/resources/define/app/fullsite.yml
index 31746b0..68d0fdd 100644
--- a/manager/src/main/resources/define/app/fullsite.yml
+++ b/manager/src/main/resources/define/app/fullsite.yml
@@ -2,7 +2,7 @@ category: service
app: fullsite
name:
zh-CN: 全站监控
- en-US: FULL WEBSITE MONITOR
+ en-US: SITE MAP
configmap:
- key: host
type: 1
diff --git a/manager/src/main/resources/define/app/website.yml b/manager/src/main/resources/define/app/website.yml
index f115187..2c45bad 100644
--- a/manager/src/main/resources/define/app/website.yml
+++ b/manager/src/main/resources/define/app/website.yml
@@ -2,7 +2,7 @@ category: service
app: website
name:
zh-CN: 网站监测
- en-US: WEBSITE MONITOR
+ en-US: WEBSITE
configmap:
- key: host
type: 1
diff --git a/web-app/src/app/layout/passport/passport.component.html b/web-app/src/app/layout/passport/passport.component.html
index c416f4e..28297dc 100644
--- a/web-app/src/app/layout/passport/passport.component.html
+++ b/web-app/src/app/layout/passport/passport.component.html
@@ -6,15 +6,15 @@
HertzBeat
-
TanCloud-易用友好的高性能监控云服务
+ {{ 'app.passport.desc' | i18n }}
Copyright
2022
- 探云 tancloud.cn |
- 赫兹跳动 hertzbeat.com
+ TanCloud tancloud.cn |
+ HertzBeat hertzbeat.com
diff --git a/web-app/src/app/layout/passport/passport.component.ts b/web-app/src/app/layout/passport/passport.component.ts
index f388b24..7814e13 100644
--- a/web-app/src/app/layout/passport/passport.component.ts
+++ b/web-app/src/app/layout/passport/passport.component.ts
@@ -1,5 +1,7 @@
import { Component, Inject, OnInit } from '@angular/core';
+import { I18NService } from '@core';
import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
+import { ALAIN_I18N_TOKEN } from '@delon/theme';
@Component({
selector: 'layout-passport',
@@ -9,12 +11,12 @@ import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
export class LayoutPassportComponent implements OnInit {
links = [
{
- title: '欢迎使用TanCloud探云-监控云服务-tancloud.cn',
+ title: this.i18nSvc.fanyi('app.passport.welcome'),
href: 'https://tancloud.cn'
}
];
- constructor(@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService) {}
+ constructor(@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, @Inject(ALAIN_I18N_TOKEN) private i18nSvc: I18NService) {}
ngOnInit(): void {
this.tokenService.clear();
diff --git a/web-app/src/app/routes/dashboard/dashboard.component.html b/web-app/src/app/routes/dashboard/dashboard.component.html
index d5ce557..5f9f41b 100644
--- a/web-app/src/app/routes/dashboard/dashboard.component.html
+++ b/web-app/src/app/routes/dashboard/dashboard.component.html
@@ -10,16 +10,19 @@
- 正常 {{ appCountService.availableSize }}
+ {{ 'dashboard.status.available' | i18n }} {{ appCountService.availableSize }}
- 不可用 {{ appCountService.unAvailableSize }}
+ {{ 'dashboard.status.unavailable' | i18n }} {{ appCountService.unAvailableSize }}
- 不可达 {{ appCountService.unReachableSize }}
+ {{ 'dashboard.status.unreachable' | i18n }} {{ appCountService.unReachableSize }}
- 未监控 {{ appCountService.unManageSize }}
+ {{ 'dashboard.status.un-manage' | i18n }} {{ appCountService.unManageSize }}
diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json
index ba7af46..bf1c53d 100644
--- a/web-app/src/assets/i18n/en-US.json
+++ b/web-app/src/assets/i18n/en-US.json
@@ -1,122 +1,97 @@
{
- "menu.search.placeholder": "Search for people, file, photos...",
- "menu.fullscreen": "Fullscreen",
- "menu.fullscreen.exit": "Exit Fullscreen",
- "menu.clear.local.storage": "Clear Local Storage",
- "menu.lang": "Language",
- "menu.main": "Main Navigation",
- "menu.dashboard": "Dashboard",
- "menu.dashboard.v1": "Default",
- "menu.dashboard.analysis": "Analysis",
- "menu.dashboard.monitor": "Monitor",
- "menu.dashboard.workplace": "Workplace",
- "menu.shortcut": "Shortcut",
- "menu.widgets": "Widgets",
- "menu.alain": "Alain",
- "menu.style": "Style",
- "menu.style.typography": "Typography",
- "menu.style.gridmasonry": "Grid Masonry",
- "menu.style.colors": "Colors",
- "menu.delon": "Delon Lib",
- "menu.delon.form": "Dynamic Form",
- "menu.delon.table": "Simple table",
- "menu.delon.util": "Util",
- "menu.delon.print": "Print",
- "menu.delon.guard": "Route Guard",
- "menu.delon.cache": "Cache",
- "menu.delon.qr": "QR",
- "menu.delon.acl": "ACL",
- "menu.delon.downfile": "Download File",
- "menu.delon.xlsx": "Excel",
- "menu.delon.zip": "Zip",
- "menu.pro": "Antd Pro",
- "menu.form": "Form",
- "menu.form.basicform": "Basic Form",
- "menu.form.stepform": "Step Form",
- "menu.form.stepform.info": "Step Form(write transfer information)",
- "menu.form.stepform.confirm": "Step Form(confirm transfer information)",
- "menu.form.stepform.result": "Step Form(finished)",
- "menu.form.advancedform": "Advanced Form",
- "menu.list": "List",
- "menu.list.searchtable": "Search Table",
- "menu.list.basiclist": "Basic List",
- "menu.list.cardlist": "Card List",
- "menu.list.searchlist": "Search List",
- "menu.list.searchlist.articles": "Search List(articles)",
- "menu.list.searchlist.projects": "Search List(projects)",
- "menu.list.searchlist.applications": "Search List(applications)",
- "menu.profile": "Profile",
- "menu.profile.basic": "Basic Profile",
- "menu.profile.advanced": "Advanced Profile",
- "menu.result": "Result",
- "menu.result.success": "Success",
- "menu.result.fail": "Fail",
- "menu.exception": "Exception",
- "menu.exception.not-permission": "403",
- "menu.exception.not-find": "404",
- "menu.exception.server-error": "500",
- "menu.account": "Account",
- "menu.account.center": "Account Center",
- "menu.account.settings": "Account Settings",
- "menu.account.trigger": "Trigger Error",
- "menu.account.logout": "Logout",
- "menu.more": "More",
- "menu.report": "Report",
- "menu.report.relation": "Relation Map",
- "menu.extras": "Extra",
- "menu.extras.helpcenter": "Help Center",
- "menu.extras.settings": "Settings",
- "menu.extras.poi": "Poi",
- "app.analysis.test": "Gongzhuan No.{{no}} shop",
- "app.analysis.introduce": "Introduce",
- "app.analysis.total-sales": "Total Sales",
- "app.analysis.day-sales": "Day Sales",
- "app.analysis.visits": "Visits",
- "app.analysis.visits-trend": "Visits Trend",
- "app.analysis.visits-ranking": "Visits Ranking",
- "app.analysis.day-visits": "Day Visits",
- "app.analysis.week": "Week Ratio",
- "app.analysis.day": "Day Ratio",
- "app.analysis.payments": "Payments",
- "app.analysis.conversion-rate": "Conversion Rate",
- "app.analysis.operational-effect": "Operational Effect",
- "app.analysis.sales-trend": "Stores Sales Trend",
- "app.analysis.sales-ranking": "Sales Ranking",
- "app.analysis.all-year": "All Year",
- "app.analysis.all-month": "All Month",
- "app.analysis.all-week": "All Week",
- "app.analysis.all-today": "All day",
- "app.analysis.search-users": "Search Users",
- "app.analysis.per-capita-search": "Per Capita Search",
- "app.analysis.online-top-search": "Online Top Search",
- "app.analysis.the-proportion-of-sales": "The Proportion Of Sales",
- "app.analysis.channel.all": "ALL",
- "app.analysis.channel.online": "Online",
- "app.analysis.channel.stores": "Stores",
- "app.analysis.sales": "Sales",
- "app.analysis.traffic": "Traffic",
- "app.analysis.table.rank": "Rank",
- "app.analysis.table.search-keyword": "Keyword",
- "app.analysis.table.users": "Users",
- "app.analysis.table.weekly-range": "Weekly Range",
- "app.monitor.trading-activity": "Real-Time Trading Activity",
- "app.monitor.total-transactions": "Total transactions today",
- "app.monitor.sales-target": "Sales target completion rate",
- "app.monitor.remaining-time": "Remaining time of activity",
- "app.monitor.total-transactions-per-second": "Total transactions per second",
- "app.monitor.activity-forecast": "Activity forecast",
- "app.monitor.efficiency": "Efficiency",
- "app.monitor.ratio": "Ratio",
- "app.monitor.proportion-per-category": "Proportion Per Category",
- "app.monitor.fast-food": "Fast food",
- "app.monitor.western-food": "Western food",
- "app.monitor.hot-pot": "Hot pot",
- "app.monitor.waiting-for-implementation": "Waiting for implementation",
- "app.monitor.popular-searches": "Popular Searches",
- "app.monitor.resource-surplus": "Resource Surplus",
- "app.monitor.fund-surplus": "Fund Surplus",
+ "menu": {
+ "main": "Main",
+ "lang": "Language",
+ "dashboard": "Dashboard",
+ "search.placeholder": "Search:Monitor Name、IP",
+ "fullscreen": "Full Screen",
+ "fullscreen.exit": "Exit",
+ "clear.local.storage": "Clear Local Storage",
+ "monitor": {
+ "": "Monitor",
+ "service": "Service Monitor",
+ "db": "DB Monitor",
+ "os": "OS Monitor",
+ "mid": "Mid Monitor",
+ "custom": "Custom Monitor"
+ },
+ "account": {
+ "": "Personal",
+ "center": "Personal Center",
+ "settings": "Account Setting",
+ "security": "Security Setting",
+ "binding": "Account Binding",
+ "trigger": "Trigger Error",
+ "logout": "Logout"
+ },
+ "alert": {
+ "": "Alert",
+ "center": "Alert Center",
+ "setting": "Alert Setting",
+ "dispatch": "Alert Notify"
+ },
+ "extras": {
+ "": "More",
+ "help": "Help Center",
+ "setting": "Setting"
+ },
+ "more": "More"
+ },
+ "monitor": {
+ "": "Monitor",
+ "category": {
+ "": "Category",
+ "service": "Service",
+ "db": "Database",
+ "os": "OS",
+ "mid": "Middleware",
+ "custom": "Custom"
+ },
+ "app": {
+ "": "Monitor Type",
+ "website": "Website Monitor",
+ "api": "HTTP API",
+ "http": "HTTP API",
+ "ping": "PING Connect",
+ "port": "Port Available",
+ "mysql": "Mysql",
+ "oracle": "Oracle",
+ "redis": "Redis",
+ "fullsite": "SiteMap Monitor"
+ }
+ },
+ "alert": {
+ "": "Alert",
+ "status": {
+ "": "Alert Status",
+ "0": "Pending",
+ "2": "Restored",
+ "3": "Processed"
+ },
+ "priority": {
+ "": "Alarm Level",
+ "0": "Emergency Alert",
+ "1": "Serious Alert",
+ "2": "Warning Alert"
+ }
+ },
+ "dashboard.status.available": "Available",
+ "dashboard.status.unavailable": "Unavailable",
+ "dashboard.status.unreachable": "Unreachable",
+ "dashboard.status.un-manage": "UnManaged",
+ "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",
+ "app.password.reset": "Reset password",
+ "app.register-result.login": "Login",
+ "validation.email.invalid": "Invalid email!",
+ "validation.phone.invalid": "Invalid phone number!",
+ "validation.verification-code.invalid": "Invalid verification code, should be 6 digits!",
+ "validation.required": "Please fill in the required fields! ",
"app.lock": "Lock",
- "app.login.message-invalid-credentials": "Invalid username or password(admin/ant.design)",
+ "app.passport.desc": "TanCloud-Friendly High Performance Monitoring Cloud Service",
+ "app.passport.welcome": "Welcome To Use TanCloud-Monitoring Cloud Service-tancloud.cn",
+ "app.login.message-invalid-credentials": "Invalid username or password",
"app.login.message-invalid-verification-code": "Invalid verification code",
"app.login.tab-login-credentials": "Credentials",
"app.login.tab-login-mobile": "Mobile number",
diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json
index ede0685..37603f6 100644
--- a/web-app/src/assets/i18n/zh-CN.json
+++ b/web-app/src/assets/i18n/zh-CN.json
@@ -75,7 +75,13 @@
"2": "警告告警"
}
},
+ "dashboard.status.available": "正常",
+ "dashboard.status.unavailable": "不可用",
+ "dashboard.status.unreachable": "不可达",
+ "dashboard.status.un-manage": "未管理",
"app.lock": "锁屏",
+ "app.passport.desc": "TanCloud-易用友好的高性能监控云服务",
+ "app.passport.welcome": "欢迎使用TanCloud探云-监控云服务-tancloud.cn",
"app.login.message-need-identifier": "请输入邮箱或手机号",
"app.login.message-need-credential": "请输入密码",
"app.login.message-invalid-credentials": "账户或密码错误",