From 0d7419f5c4fa1fadc9712969f1af0861b566fef3 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 27 Jul 2017 15:19:54 -0700 Subject: [PATCH] marking job results and survey maker for translation --- .../job-results-stdout.partial.html | 10 +- .../src/job-results/job-results.controller.js | 6 +- .../src/job-results/job-results.partial.html | 102 ++++++------ .../src/job-results/parse-stdout.service.js | 4 +- .../src/partials/survey-maker-modal.html | 2 +- .../src/templates/survey-maker/shared/main.js | 2 +- .../shared/question-definition.form.js | 147 +++++++++--------- 7 files changed, 134 insertions(+), 139 deletions(-) diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html index 7b193b0032..63ae96d90c 100644 --- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html +++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html @@ -40,11 +40,11 @@
The standard output is too large to display. Please specify additional filters to narrow the standard out.
+ ng-show="tooManyEvents" translate>The standard output is too large to display. Please specify additional filters to narrow the standard out.
Too much previous output to display. Showing running standard output.
+ ng-show="tooManyPastEvents" translate>Too much previous output to display. Showing running standard output.
Job details are not available for this job. Please download to view standard out.
+ ng-show="showLegacyJobErrorMessage" translate>Job details are not available for this job. Please download to view standard out. @@ -58,8 +58,8 @@ ng-show="stdoutOverflowed">
- ^ TOP + ^ TOP
- \ No newline at end of file + diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 52bd109ad2..128238fbe2 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -264,9 +264,9 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy // button will jump to the bottom of the standard out pane, // not follow lines as they come in if ($scope.jobFinished) { - $scope.followTooltip = "Jump to last line of standard out."; + $scope.followTooltip = i18n._("Jump to last line of standard out."); } else { - $scope.followTooltip = "Currently following standard out as it comes in. Click to unfollow."; + $scope.followTooltip = i18n._("Currently following standard out as it comes in. Click to unfollow."); } $scope.events = {}; @@ -316,7 +316,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy if (change === 'finishedTime' && !$scope.job.finished) { $scope.job.finished = mungedEvent.finishedTime; $scope.jobFinished = true; - $scope.followTooltip = "Jump to last line of standard out."; + $scope.followTooltip = i18n._("Jump to last line of standard out."); if ($scope.followEngaged) { if (!$scope.followScroll) { $scope.followScroll = function() { diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html index 7df67da3bd..8e8cd9b00d 100644 --- a/awx/ui/client/src/job-results/job-results.partial.html +++ b/awx/ui/client/src/job-results/job-results.partial.html @@ -14,7 +14,7 @@
+ class="JobResults-panelHeaderText" translate> DETAILS
@@ -26,7 +26,7 @@ data-placement="top" mode="all" ng-click="relaunchJob()" - aw-tool-tip="Relaunch using the same parameters" + aw-tool-tip="{{'Relaunch using the same parameters' | translate}}" data-original-title="" title=""> @@ -39,7 +39,7 @@ ng-click="cancelJob()" ng-show="job_status == 'running' || job_status=='pending' " - aw-tool-tip="Cancel" + aw-tool-tip="{{'Cancel' | translate}}" data-original-title="" title=""> @@ -51,7 +51,7 @@ ng-click="deleteJob()" ng-hide="job_status == 'running' || job_status == 'pending' || !job.summary_fields.user_capabilities.delete" - aw-tool-tip="Delete" + aw-tool-tip="{{'Delete' | translate}}" data-original-title="" title=""> @@ -64,21 +64,21 @@
-
-