summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/cycle_analytics/components
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-04-21 09:16:05 +0100
committerPhil Hughes <me@iamphill.com>2017-04-21 09:16:05 +0100
commitdc5136a70d2481f214769a9e28cf82958f3ab124 (patch)
tree3dce4997d3a5181365d75697bdaa7ab6be4299cb /app/assets/javascripts/cycle_analytics/components
parentb7b5bd4a49a212f41f08be98997c25c0ce530f97 (diff)
parent6fbc6befa1768cc68471d17091ef08b2e73fec82 (diff)
downloadgitlab-ce-dc5136a70d2481f214769a9e28cf82958f3ab124.tar.gz
Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-page' into js-translations
Diffstat (limited to 'app/assets/javascripts/cycle_analytics/components')
-rw-r--r--app/assets/javascripts/cycle_analytics/components/total_time_component.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/total_time_component.js b/app/assets/javascripts/cycle_analytics/components/total_time_component.js
index a0d735f159c..47d82bdda90 100644
--- a/app/assets/javascripts/cycle_analytics/components/total_time_component.js
+++ b/app/assets/javascripts/cycle_analytics/components/total_time_component.js
@@ -13,7 +13,7 @@ global.cycleAnalytics.TotalTimeComponent = Vue.extend({
<span class="total-time">
<template v-if="Object.keys(time).length">
<template v-if="time.days">{{ time.days }} <span>{{ 'day' | translate-plural('days', time.days) }}</span></template>
- <template v-if="time.hours">{{ time.hours }} <span v-translate>hr</span></template>
+ <template v-if="time.hours">{{ time.hours }} <span>{{ 'hr' | translate }}</span></template>
<template v-if="time.mins && !time.days">{{ time.mins }} <span>{{ 'min' | translate-plural('mins', time.mins) }}</span></template>
<template v-if="time.seconds && Object.keys(time).length === 1 || time.seconds === 0">{{ time.seconds }} <span>s</span></template>
</template>