diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-03 12:02:26 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-03 12:02:26 +0100 |
commit | 93f27958d02389b3550d25470ccd29b304005e96 (patch) | |
tree | 83deff34c5347dfdb38c6298c5ba677cbe330be9 /app/assets/javascripts/cycle_analytics | |
parent | 6d5364cfb0e39f49afac9b465f37bd19185c3755 (diff) | |
download | gitlab-ce-93f27958d02389b3550d25470ccd29b304005e96.tar.gz |
Updated some JS translate methods to correctly take in context
Diffstat (limited to 'app/assets/javascripts/cycle_analytics')
-rw-r--r-- | app/assets/javascripts/cycle_analytics/components/limit_warning_component.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/cycle_analytics/components/total_time_component.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js b/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js index c43a4506755..8d3d34f836f 100644 --- a/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js +++ b/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js @@ -9,7 +9,7 @@ export default { <span v-if="count === 50" class="events-info pull-right"> <i class="fa fa-warning has-tooltip" aria-hidden="true" - :title="__('Limited to showing 50 events at most')" + :title="n__('Limited to showing %d event at most', 'Limited to showing %d events at most', 50)" data-placement="top"></i> {{ n__('Showing %d event', 'Showing %d events', 50) }} </span> 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 1eef7d9a873..d5e6167b2a8 100644 --- a/app/assets/javascripts/cycle_analytics/components/total_time_component.js +++ b/app/assets/javascripts/cycle_analytics/components/total_time_component.js @@ -15,7 +15,7 @@ global.cycleAnalytics.TotalTimeComponent = Vue.extend({ <template v-if="time.days">{{ time.days }} <span>{{ n__('day', 'days', time.days) }}</span></template> <template v-if="time.hours">{{ time.hours }} <span>{{ n__('Time|hr', 'Time|hrs', time.hours) }}</span></template> <template v-if="time.mins && !time.days">{{ time.mins }} <span>{{ n__('Time|min', 'Time|mins', time.mins) }}</span></template> - <template v-if="time.seconds && Object.keys(time).length === 1 || time.seconds === 0">{{ time.seconds }} <span>{{ __('Time|s') }}</span></template> + <template v-if="time.seconds && Object.keys(time).length === 1 || time.seconds === 0">{{ time.seconds }} <span>{{ s__('Time|s') }}</span></template> </template> <template v-else> -- |