From 6804ac4166bd565e34bf5588c1dec9a0427ee8b7 Mon Sep 17 00:00:00 2001
From: Ezekiel Kigbo <ekigbo@gitlab.com>
Date: Tue, 2 Jul 2019 09:18:02 +1000
Subject: Fix broken translations

Replace `__` with `s__` in comparison pane
and re-add missing `+` in assigne.vue

Added additional translation

Minor review fixes
---
 .../sidebar/components/assignees/assignees.vue        |  2 +-
 .../components/time_tracking/comparison_pane.vue      | 10 +++++-----
 .../components/time_tracking/spent_only_pane.vue      | 19 ++++++++++++++++---
 locale/gitlab.pot                                     | 12 ++++++------
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.vue b/app/assets/javascripts/sidebar/components/assignees/assignees.vue
index 6f3011869b2..805c21d0965 100644
--- a/app/assets/javascripts/sidebar/components/assignees/assignees.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/assignees.vue
@@ -63,7 +63,7 @@ export default {
     },
     hiddenAssigneesLabel() {
       const { numberOfHiddenAssignees } = this;
-      return sprintf(__('%{numberOfHiddenAssignees} more'), { numberOfHiddenAssignees });
+      return sprintf(__('+ %{numberOfHiddenAssignees} more'), { numberOfHiddenAssignees });
     },
     collapsedTooltipTitle() {
       const maxRender = Math.min(this.defaultRenderCount, this.users.length);
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
index 4f60ca5124c..06aca547183 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
@@ -2,7 +2,7 @@
 import { parseSeconds, stringifyTime } from '~/lib/utils/datetime_utility';
 import tooltip from '../../../vue_shared/directives/tooltip';
 import { GlProgressBar } from '@gitlab/ui';
-import { __, sprintf } from '~/locale';
+import { s__, sprintf } from '~/locale';
 
 export default {
   name: 'TimeTrackingComparisonPane',
@@ -44,12 +44,12 @@ export default {
       return stringifyTime(this.parsedTimeRemaining);
     },
     timeRemainingTooltip() {
-      const { timeRemainingHumanReadable } = this;
-      return this.timeRemainingMinutes < 0
-        ? sprintf(__('TimeTracking|Over by %{timeRemainingHumanReadable}'), {
+      const { timeRemainingHumanReadable, timeRemainingMinutes } = this;
+      return timeRemainingMinutes < 0
+        ? sprintf(s__('TimeTracking|Over by %{timeRemainingHumanReadable}'), {
             timeRemainingHumanReadable,
           })
-        : sprintf(__('TimeTracking|Time remaining: %{timeRemainingHumanReadable}'), {
+        : sprintf(s__('TimeTracking|Time remaining: %{timeRemainingHumanReadable}'), {
             timeRemainingHumanReadable,
           });
     },
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue
index aca4cd18023..c2f30310e2e 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue
@@ -1,4 +1,6 @@
 <script>
+import { sprintf, s__ } from '~/locale';
+
 export default {
   name: 'TimeTrackingSpentOnlyPane',
   props: {
@@ -7,11 +9,22 @@ export default {
       required: true,
     },
   },
+  computed: {
+    timeSpent() {
+      return sprintf(
+        s__('TimeTracking|%{startTag}Spent: %{endTag}%{timeSpentHumanReadable}'),
+        {
+          startTag: '<span class="bold">',
+          endTag: '</span>',
+          timeSpentHumanReadable: this.timeSpentHumanReadable,
+        },
+        false,
+      );
+    },
+  },
 };
 </script>
 
 <template>
-  <div class="time-tracking-spend-only-pane">
-    <span class="bold">{{ __('Spent:') }}</span> {{ timeSpentHumanReadable }}
-  </div>
+  <div class="time-tracking-spend-only-pane" v-html="timeSpent"></div>
 </template>
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 917661f0fae..ee567f5ff87 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -186,9 +186,6 @@ msgstr ""
 msgid "%{name} found %{resultsString}"
 msgstr ""
 
-msgid "%{numberOfHiddenAssignees} more"
-msgstr ""
-
 msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
 msgstr ""
 
@@ -284,6 +281,9 @@ msgstr ""
 msgid "+ %{moreCount} more"
 msgstr ""
 
+msgid "+ %{numberOfHiddenAssignees} more"
+msgstr ""
+
 msgid ", or "
 msgstr ""
 
@@ -9811,9 +9811,6 @@ msgstr ""
 msgid "Specify the following URL during the Runner setup:"
 msgstr ""
 
-msgid "Spent:"
-msgstr ""
-
 msgid "Squash commit message"
 msgstr ""
 
@@ -10890,6 +10887,9 @@ msgstr ""
 msgid "TimeTrackingEstimated|Est"
 msgstr ""
 
+msgid "TimeTracking|%{startTag}Spent: %{endTag}%{timeSpentHumanReadable}"
+msgstr ""
+
 msgid "TimeTracking|Estimated:"
 msgstr ""
 
-- 
cgit v1.2.1