From 0f61f17d99f670c4be2d3eec6c63d75d593df064 Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Mon, 17 Sep 2018 10:16:16 +0800
Subject: [PATCH] Update error message for resource quota

https://github.com/rancher/rancher/issues/14854
---
 app/models/container.js | 8 ++++----
 translations/en-us.yaml | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/container.js b/app/models/container.js
index 8765a3049..7890cf3ee 100644
--- a/app/models/container.js
+++ b/app/models/container.js
@@ -54,16 +54,16 @@ var Container = Resource.extend(DisplayImage, {
     } = projectLimit;
 
     if ( limitsCpu && !get(this, `resources.limits.cpu`)) {
-      errors.push(intl.t('validation.required', { key: intl.t('formResourceQuota.resources.limitsCpu') }));
+      errors.push(intl.t('newContainer.errors.quotaRequired', { key: intl.t('formResourceQuota.resources.limitsCpu') }));
     }
     if ( limitsMemory && !get(this, `resources.limits.memory`)) {
-      errors.push(intl.t('validation.required', { key: intl.t('formResourceQuota.resources.limitsMemory') }));
+      errors.push(intl.t('newContainer.errors.quotaRequired', { key: intl.t('formResourceQuota.resources.limitsMemory') }));
     }
     if ( requestsCpu && !get(this, `resources.requests.cpu`)) {
-      errors.push(intl.t('validation.required', { key: intl.t('formResourceQuota.resources.requestsCpu') }));
+      errors.push(intl.t('newContainer.errors.quotaRequired', { key: intl.t('formResourceQuota.resources.requestsCpu') }));
     }
     if ( requestsMemory && !get(this, `resources.requests.memory`)) {
-      errors.push(intl.t('validation.required', { key: intl.t('formResourceQuota.resources.requestsMemory') }));
+      errors.push(intl.t('newContainer.errors.quotaRequired', { key: intl.t('formResourceQuota.resources.requestsMemory') }));
     }
 
     return errors;
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 81da23646..8f261a763 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -4751,6 +4751,7 @@ newContainer:
   errors:
     noSidekick: Choose a workload to add the sidecar to
     duplicateName: 'There is already a sidecar named "{name}" in the workload "{service}"'
+    quotaRequired: '"{key}" is required as resource quota is enforced on the project'
 
 newPassword:
   placeholder: New Password