Localization of Deploy, EnvVariables and Upload (#777)

taimir · Sebastian Florek · commit 139f8e57a40c · 2016-06-01T10:22:31.000+02:00
Localization of the base deploy page, the environment variables section
and the deployment file upload section.
diff --git a/i18n/messages-en.xtb b/i18n/messages-en.xtb
@@ -67,4 +67,18 @@
 	<translation id="4426583640675024823" key="MSG_DEPLOY_SETTINGS_RUN_PRIVILEGED_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;Run as privileged&quot; checkbox input on the deploy from settings page.">Processes in privileged containers are equivalent to processes running as root on the host.</translation>
 	<translation id="7560440547757208994" key="MSG_DEPLOY_SETTINGS_ENV_VARIABLES_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;Environment variables&quot; section on the deploy from settings page.">Environment variables available for use in the container. Values can reference other variables using $(VAR_NAME) syntax.</translation>
 	<translation id="7026295428726247109" key="MSG_DEPLOY_SETTINGS_NUMBER_OF_PODS_INT_WARNING" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Appears to tell the user that the number of pods on the deploy from settings page must be non-negative or integer.">Number of pods must be a positive integer</translation>
-</translationbundle>
+	<translation id="750172492346654392" key="MSG_DEPLOY_PAGE_TITLE" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Title text which appears on top of the deploy page.">Deploy a Containerized App</translation>
+	<translation id="4849906879961443302" key="MSG_DEPLOY_SPECIFY_APP_DETAILS_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Text for a selection option, which the user must click to manually enter the app details on the deploy page.">Specify app details below</translation>
+	<translation id="6920937028819232874" key="MSG_DEPLOY_FILE_UPLOAD_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Text for a selection option, which the user must click to upload a YAML/JSON file to deploy from on the deploy page.">Upload a YAML or JSON file</translation>
+	<translation id="4656327168203960058" key="MSG_DEPLOY_DEPLOY_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="The text is put on the 'Deploy' button at the end of the deploy page.">Deploy</translation>
+	<translation id="7617135492835700793" key="MSG_DEPLOY_CANCEL_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="The text is put on the 'Cancel' button at the end of the deploy page.">Cancel</translation>
+	<translation id="7456160778295272283" key="MSG_DEPLOY_ENV_VARS_TITLE" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Title of the Environment Variables section on the deploy page.">Environment variables</translation>
+	<translation id="6867325046626733190" key="MSG_DEPLOY_ENV_VARS_NAME_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Name&quot; which appears as a placeholder for the input of a environment variable name on the deploy page.">Name</translation>
+	<translation id="2359882648739163069" key="MSG_DEPLOY_ENV_VARS_VALUE_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Value&quot; which appears as a placeholder for the input of a environment variable value on the deploy page.">Value</translation>
+	<translation id="4723073728245526722" key="MSG_DEPLOY_ENV_VARS_NAME_PATTERN_WARNING" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Appears when the name of an environment variable on the deploy page does not match the expected pattern.">Variable name must be a valid C identifier.</translation>
+	<translation id="7464694778149218104" key="MSG_DEPLOY_UPLOAD_FILE_YAML_OR_JSON_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="A 'YAML or JSON file' label, serving as placeholder for an empty file input field on the deploy page.">YAML or JSON file</translation>
+	<translation id="8189630039232550375" key="MSG_DEPLOY_UPLOAD_FILE_REQUIRED_WARNING" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Appears to tell the user that he/she must upload a YAML or a JSON file on the deploy page.">File is required</translation>
+	<translation id="3539277368227313625" key="MSG_DEPLOY_UPLOAD_FILE_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the YAML/JSON file upload form on the deploy page.">Select a YAML or JSON file, specifying the resources to deploy.</translation>
+	<translation id="4100105138388508081" key="MSG_DEPLOY_UPLOAD_FILE_LEARN_MORE_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="The text is used as a 'Learn more' link text besides the file upload on the deploy page.">Learn more</translation>
+	<translation id="5372554302338765680" key="MSG_DEPLOY_DASHBOARD_TOUR_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help with a link redirecting to the &quot;Dashboard tour&quot; on the deploy page.">To learn more, <ph name="OPEN_LINK" /> take the Dashboard Tour <ph name="LINK_ICON" /> <ph name="CLOSE_LINK" /></translation>
+</translationbundle>
diff --git a/i18n/messages-ja.xtb b/i18n/messages-ja.xtb
@@ -67,4 +67,18 @@
 	<translation id="4426583640675024823" key="MSG_DEPLOY_SETTINGS_RUN_PRIVILEGED_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;Run as privileged&quot; checkbox input on the deploy from settings page.">Processes in privileged containers are equivalent to processes running as root on the host.</translation>
 	<translation id="7560440547757208994" key="MSG_DEPLOY_SETTINGS_ENV_VARIABLES_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;Environment variables&quot; section on the deploy from settings page.">Environment variables available for use in the container. Values can reference other variables using $(VAR_NAME) syntax.</translation>
 	<translation id="7026295428726247109" key="MSG_DEPLOY_SETTINGS_NUMBER_OF_PODS_INT_WARNING" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Appears to tell the user that the number of pods on the deploy from settings page must be non-negative or integer.">Number of pods must be a positive integer</translation>
-</translationbundle>
+	<translation id="750172492346654392" key="MSG_DEPLOY_PAGE_TITLE" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Title text which appears on top of the deploy page.">Deploy a Containerized App</translation>
+	<translation id="4849906879961443302" key="MSG_DEPLOY_SPECIFY_APP_DETAILS_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Text for a selection option, which the user must click to manually enter the app details on the deploy page.">Specify app details below</translation>
+	<translation id="6920937028819232874" key="MSG_DEPLOY_FILE_UPLOAD_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Text for a selection option, which the user must click to upload a YAML/JSON file to deploy from on the deploy page.">Upload a YAML or JSON file</translation>
+	<translation id="4656327168203960058" key="MSG_DEPLOY_DEPLOY_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="The text is put on the 'Deploy' button at the end of the deploy page.">Deploy</translation>
+	<translation id="7617135492835700793" key="MSG_DEPLOY_CANCEL_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="The text is put on the 'Cancel' button at the end of the deploy page.">Cancel</translation>
+	<translation id="7456160778295272283" key="MSG_DEPLOY_ENV_VARS_TITLE" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Title of the Environment Variables section on the deploy page.">Environment variables</translation>
+	<translation id="6867325046626733190" key="MSG_DEPLOY_ENV_VARS_NAME_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Name&quot; which appears as a placeholder for the input of a environment variable name on the deploy page.">Name</translation>
+	<translation id="2359882648739163069" key="MSG_DEPLOY_ENV_VARS_VALUE_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Value&quot; which appears as a placeholder for the input of a environment variable value on the deploy page.">Value</translation>
+	<translation id="4723073728245526722" key="MSG_DEPLOY_ENV_VARS_NAME_PATTERN_WARNING" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Appears when the name of an environment variable on the deploy page does not match the expected pattern.">Variable name must be a valid C identifier.</translation>
+	<translation id="7464694778149218104" key="MSG_DEPLOY_UPLOAD_FILE_YAML_OR_JSON_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="A 'YAML or JSON file' label, serving as placeholder for an empty file input field on the deploy page.">YAML or JSON file</translation>
+	<translation id="8189630039232550375" key="MSG_DEPLOY_UPLOAD_FILE_REQUIRED_WARNING" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Appears to tell the user that he/she must upload a YAML or a JSON file on the deploy page.">File is required</translation>
+	<translation id="3539277368227313625" key="MSG_DEPLOY_UPLOAD_FILE_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the YAML/JSON file upload form on the deploy page.">Select a YAML or JSON file, specifying the resources to deploy.</translation>
+	<translation id="4100105138388508081" key="MSG_DEPLOY_UPLOAD_FILE_LEARN_MORE_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="The text is used as a 'Learn more' link text besides the file upload on the deploy page.">Learn more</translation>
+	<translation id="5372554302338765680" key="MSG_DEPLOY_DASHBOARD_TOUR_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help with a link redirecting to the &quot;Dashboard tour&quot; on the deploy page.">To learn more, <ph name="OPEN_LINK" /> take the Dashboard Tour <ph name="LINK_ICON" /> <ph name="CLOSE_LINK" /></translation>
+</translationbundle>
diff --git a/src/app/frontend/deploy/deploy.html b/src/app/frontend/deploy/deploy.html
@@ -16,23 +16,20 @@
 
 <div layout="column" layout-padding-gt-md layout-align="center center" flex="auto">
   <md-whiteframe class="kd-deploy-whiteframe md-whiteframe-5dp" flex="auto">
-    <h3 class="md-headline kd-deploy-form-title">Deploy a Containerized App</h3>
+    <h3 class="md-headline kd-deploy-form-title">{{::ctrl.i18n.MSG_DEPLOY_PAGE_TITLE}}</h3>
 
     <form name="ctrl.deployForm" ng-submit="ctrl.deployBySelection()" novalidate>
       <kd-help-section>
         <md-radio-group ng-model="ctrl.selection">
           <md-radio-button value="Settings" class="md-primary">
-            Specify app details below
+            {{::ctrl.i18n.MSG_DEPLOY_SPECIFY_APP_DETAILS_ACTION}}
           </md-radio-button>
           <md-radio-button value="File" class="md-primary">
-            Upload a YAML or JSON file
+            {{::ctrl.i18n.MSG_DEPLOY_FILE_UPLOAD_ACTION}}
           </md-radio-button>
         </md-radio-group>
         <kd-user-help>
-          To learn more,
-          <a href="http://kubernetes.io/docs/user-guide/ui/" target="_blank" tabindex="-1">
-            take the Dashboard Tour <i class="material-icons">open_in_new</i>
-          </a>
+          <span ng-bind-html="::ctrl.i18n.MSG_DEPLOY_DASHBOARD_TOUR_USER_HELP"></span>
         </kd-user-help>
       </kd-help-section>
 
@@ -47,9 +44,9 @@ <h3 class="md-headline kd-deploy-form-title">Deploy a Containerized App</h3>
 
       <md-button class="md-raised md-primary kd-deploy-submit-button" type="submit"
                  ng-disabled="ctrl.isDeployDisabled()">
-        Deploy
+        {{::ctrl.i18n.MSG_DEPLOY_DEPLOY_ACTION}}
       </md-button>
-      <md-button class="md-raised kd-deploy-cancel-button" ng-click="ctrl.cancel()">Cancel</md-button>
+      <md-button class="md-raised kd-deploy-cancel-button" ng-click="ctrl.cancel()">{{::ctrl.i18n.MSG_DEPLOY_CANCEL_ACTION}}</md-button>
     </form>
   </md-whiteframe>
 </div>
diff --git a/src/app/frontend/deploy/deploy_controller.js b/src/app/frontend/deploy/deploy_controller.js
@@ -61,6 +61,12 @@ export default class DeployController {
 
     /** @private {boolean} */
     this.isDeployInProgress_ = false;
+
+    /**
+     * @export
+     * {!Object}
+     */
+    this.i18n = i18n;
   }
 
   /**
@@ -87,3 +93,29 @@ export default class DeployController {
    */
   cancel() { this.state_.go(replicationcontrollers); }
 }
+
+const i18n = {
+  /** @export {string} @desc Title text which appears on top of the deploy page. */
+  MSG_DEPLOY_PAGE_TITLE: goog.getMsg('Deploy a Containerized App'),
+
+  /** @export {string} @desc Text for a selection option, which the user must click to manually enter the app details on the deploy page. */
+  MSG_DEPLOY_SPECIFY_APP_DETAILS_ACTION: goog.getMsg('Specify app details below'),
+
+  /** @export {string} @desc Text for a selection option, which the user must click to upload a YAML/JSON file to deploy from on the deploy page. */
+  MSG_DEPLOY_FILE_UPLOAD_ACTION: goog.getMsg('Upload a YAML or JSON file'),
+
+  /** @export {string} @desc The text is put on the 'Deploy' button at the end of the deploy page. */
+  MSG_DEPLOY_DEPLOY_ACTION: goog.getMsg('Deploy'),
+
+  /** @export {string} @desc The text is put on the 'Cancel' button at the end of the deploy page. */
+  MSG_DEPLOY_CANCEL_ACTION: goog.getMsg('Cancel'),
+
+  /** @export {string} @desc User help with a link redirecting to the "Dashboard tour" on the deploy page. */
+  MSG_DEPLOY_DASHBOARD_TOUR_USER_HELP:
+      goog.getMsg(`To learn more, {$openLink} take the Dashboard Tour {$linkIcon} {$closeLink}`, {
+        openLink:
+            `<a href="http://kubernetes.io/docs/user-guide/ui/" target="_blank" tabindex="-1">`,
+        closeLink: `</a>`,
+        linkIcon: `<i class="material-icons">open_in_new</i>`,
+      }),
+};
diff --git a/src/app/frontend/deploy/environmentvariables.html b/src/app/frontend/deploy/environmentvariables.html
@@ -14,20 +14,20 @@
 limitations under the License.
 -->
 
-<div class="kd-environment-variables-title md-body-2">Environment variables</div>
+<div class="kd-environment-variables-title md-body-2">{{::ctrl.i18n.MSG_DEPLOY_ENV_VARS_TITLE}}</div>
 <div ng-repeat="variable in ctrl.variables">
   <ng-form name="variablesForm" layout="row">
     <md-input-container flex="auto" class="kd-deploy-input-row">
-      <label>Name</label>
+      <label>{{::ctrl.i18n.MSG_DEPLOY_ENV_VARS_NAME_LABEL}}</label>
       <input ng-model="variable.name" name="name" ng-change="ctrl.addVariableIfNeeed()"
           ng-pattern="ctrl.namePattern">
       <ng-messages for="variablesForm.name.$error" role="alert" multiple>
-        <ng-message when="pattern">Variable name must be a valid C identifier.</ng-message>
+        <ng-message when="pattern">{{::ctrl.i18n.MSG_DEPLOY_ENV_VARS_NAME_PATTERN_WARNING}}</ng-message>
       </ng-messages>
     </md-input-container>
     <div flex="5"></div>
     <md-input-container flex="auto" class="kd-deploy-input-row">
-      <label>Value</label>
+      <label>{{::ctrl.i18n.MSG_DEPLOY_ENV_VARS_VALUE_LABEL}}</label>
       <input ng-model="variable.value" name="value">
     </md-input-container>
     <div flex="10">
diff --git a/src/app/frontend/deploy/environmentvariables_controller.js b/src/app/frontend/deploy/environmentvariables_controller.js
@@ -32,6 +32,11 @@ export class EnvironmentVariablesController {
      * @export {!RegExp}
      */
     this.namePattern = new RegExp('^[A-Za-z_][A-Za-z0-9_]*$');
+
+    /**
+     * @export
+     */
+    this.i18n = i18n;
   }
 
   /**
@@ -70,3 +75,18 @@ export class EnvironmentVariablesController {
    */
   isVariableFilled_(variable) { return !!variable.name; }
 }
+
+const i18n = {
+  /** @export {string} @desc Title of the Environment Variables section on the deploy page. */
+  MSG_DEPLOY_ENV_VARS_TITLE: goog.getMsg(`Environment variables`),
+
+  /** @export {string} @desc Label "Name" which appears as a placeholder for the input of a environment variable name on the deploy page. */
+  MSG_DEPLOY_ENV_VARS_NAME_LABEL: goog.getMsg(`Name`),
+
+  /** @export {string} @desc Label "Value" which appears as a placeholder for the input of a environment variable value on the deploy page. */
+  MSG_DEPLOY_ENV_VARS_VALUE_LABEL: goog.getMsg(`Value`),
+
+  /** @export {string} @desc Appears when the name of an environment variable on the deploy page does not match the expected pattern. */
+  MSG_DEPLOY_ENV_VARS_NAME_PATTERN_WARNING:
+      goog.getMsg(`Variable name must be a valid C identifier.`),
+};
diff --git a/src/app/frontend/deploy/upload.html b/src/app/frontend/deploy/upload.html
@@ -18,11 +18,11 @@
   <div layout="row" layout-align="space-between start">
     <div flex="auto" >
       <md-input-container class="md-block" md-is-error="ctrl.isFileNameError()">
-        <label>YAML or JSON file</label>
+        <label>{{::ctrl.i18n.MSG_DEPLOY_UPLOAD_FILE_YAML_OR_JSON_LABEL}}</label>
         <!--TODO: Browse file on focus doesn't work in Firefox. It is to be investigated.-->
         <input ng-model="ctrl.file.name" ng-focus="ctrl.browseFile()" ng-readonly="true" name="fileName" required/>
           <ng-messages for="ctrl.form.fileName.$error" role="alert" multiple>
-            <ng-message when="required">File is required.</ng-message>
+            <ng-message when="required">{{::ctrl.i18n.MSG_DEPLOY_UPLOAD_FILE_REQUIRED_WARNING}}</ng-message>
             </ng-message>
           </ng-messages>
       </md-input-container>
@@ -37,9 +37,9 @@
     <input type="file" class="kd-upload-file-picker" kd-file-reader ng-model="ctrl.file">
   </div>
   <kd-user-help>
-    Select a YAML or JSON file, specifying the resources to deploy.
+    {{::ctrl.i18n.MSG_DEPLOY_UPLOAD_FILE_USER_HELP}}
     <a href="http://kubernetes.io/docs/user-guide/deploying-applications/" target="_blank">
-      Learn more <i class="material-icons">open_in_new</i>
+      {{::ctrl.i18n.MSG_DEPLOY_UPLOAD_FILE_LEARN_MORE_ACTION}} <i class="material-icons">open_in_new</i>
     </a>
   </kd-user-help>
 </kd-help-section>
diff --git a/src/app/frontend/deploy/upload_controller.js b/src/app/frontend/deploy/upload_controller.js
@@ -35,6 +35,11 @@ export class UploadController {
      * @export {!angular.FormController}
      */
     this.form;
+
+    /**
+     * @export
+     */
+    this.i18n = i18n;
   }
 
   /**
@@ -72,3 +77,18 @@ export class UploadController {
     return this.form.$submitted && fileName.$invalid;
   }
 }
+
+const i18n = {
+  /** @export {string} @desc A 'YAML or JSON file' label, serving as placeholder for an empty file input field on the deploy page. */
+  MSG_DEPLOY_UPLOAD_FILE_YAML_OR_JSON_LABEL: goog.getMsg(`YAML or JSON file`),
+
+  /** @export {string} @desc Appears to tell the user that he/she must upload a YAML or a JSON file on the deploy page. */
+  MSG_DEPLOY_UPLOAD_FILE_REQUIRED_WARNING: goog.getMsg(`File is required`),
+
+  /** @export {string} @desc User help for the YAML/JSON file upload form on the deploy page. */
+  MSG_DEPLOY_UPLOAD_FILE_USER_HELP:
+      goog.getMsg(`Select a YAML or JSON file, specifying the resources to deploy.`),
+
+  /** @export {string} @desc The text is used as a 'Learn more' link text besides the file upload on the deploy page. */
+  MSG_DEPLOY_UPLOAD_FILE_LEARN_MORE_ACTION: goog.getMsg(`Learn more`),
+};
