From 9e7a3332855b976b7913271d30a8cfe212ddd969 Mon Sep 17 00:00:00 2001
From: yhua
Date: Thu, 7 Jul 2016 16:08:16 +0800
Subject: [PATCH] squash 3 commit
---
.../replication/list-replication.directive.html | 10 +++++++---
.../js/services/i18n/locale_messages_en-US.js | 1 +
.../js/services/i18n/locale_messages_zh-CN.js | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/static/resources/js/components/replication/list-replication.directive.html b/static/resources/js/components/replication/list-replication.directive.html
index 5e93ef686..57c5c9f6c 100644
--- a/static/resources/js/components/replication/list-replication.directive.html
+++ b/static/resources/js/components/replication/list-replication.directive.html
@@ -20,7 +20,8 @@
// 'destination' | tr // |
// 'last_start_time' | tr // |
// 'activation' | tr// |
- // 'actions' | tr // |
+ // 'actions' | tr // |
+ |
@@ -39,7 +40,7 @@
// 'enabled' | tr //
// 'disabled' | tr //
-
+ |
|
+
+
+ |
@@ -131,4 +135,4 @@
-
\ No newline at end of file
+
diff --git a/static/resources/js/services/i18n/locale_messages_en-US.js b/static/resources/js/services/i18n/locale_messages_en-US.js
index 6d48c4620..b85b75ceb 100644
--- a/static/resources/js/services/i18n/locale_messages_en-US.js
+++ b/static/resources/js/services/i18n/locale_messages_en-US.js
@@ -247,6 +247,7 @@ var locale_messages = {
'inline_help_publicity_title': 'Publicity of Project',
'inline_help_publicity': 'Setting the project as public.',
'alert_job_contains_error': 'Found errors in the current replication jobs, please check.',
+ 'found_error_in_replication_job': 'Found $0 error(s).',
'caution': 'Caution',
'confirm_to_toggle_policy_title': 'Policy Toggle',
'confirm_to_toggle_policy': 'Are you sure to toggle policy $0 to $1 status?'
diff --git a/static/resources/js/services/i18n/locale_messages_zh-CN.js b/static/resources/js/services/i18n/locale_messages_zh-CN.js
index e79f78538..a9ff6f5be 100644
--- a/static/resources/js/services/i18n/locale_messages_zh-CN.js
+++ b/static/resources/js/services/i18n/locale_messages_zh-CN.js
@@ -247,6 +247,7 @@ var locale_messages = {
'inline_help_publicity_title': '公开项目',
'inline_help_publicity': '设置该项目为公开。',
'alert_job_contains_error': '当前复制任务中包含错误,请检查。',
+ 'found_error_in_replication_job': '发现 $0 个错误。',
'caution': '注意',
'confirm_to_toggle_policy_title': '切换复制策略状态',
'confirm_to_toggle_policy': '确认将复制策略 $0 切换为 $1 状态吗?'