kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'vue-i18n-js-performance-bar-directory' into 'master'

Browse source 
Vue-i18n: autofix for app/assets/javascripts/performance_bar directory

See merge request gitlab-org/gitlab-ce!30014
This commit is contained in:
Kushal Pandya 2019-06-28 08:04:40 +00:00
commit b0845b6293
3 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/performance_bar/components/detailed_metric.vue
View file

@ -92,7 +92,9 @@ export default {
</template> </template>
<template v-else> <template v-else>
<tr> <tr>
<td>No {{ header.toLowerCase() }} for this request.</td> <td>
{{ sprintf(__('No %{header} for this request.'), { header: header.toLowerCase() }) }}
</td>
</tr> </tr>
</template> </template>
</table> </table>

14
app/assets/javascripts/performance_bar/components/performance_bar_app.vue
View file

@ -5,6 +5,7 @@ import { glEmojiTag } from '~/emoji';
import detailedMetric from './detailed_metric.vue'; import detailedMetric from './detailed_metric.vue';
import requestSelector from './request_selector.vue'; import requestSelector from './request_selector.vue';
import simpleMetric from './simple_metric.vue'; import simpleMetric from './simple_metric.vue';
import { s__ } from '~/locale';
export default { export default {
components: { components: {
@ -35,10 +36,10 @@ export default {
}, },
}, },
detailedMetrics: [ detailedMetrics: [
{ metric: 'pg', header: 'SQL queries', details: 'queries', keys: ['sql'] }, { metric: 'pg', header: s__('PerformanceBar|SQL queries'), details: 'queries', keys: ['sql'] },
{ {
metric: 'gitaly', metric: 'gitaly',
header: 'Gitaly calls', header: s__('PerformanceBar|Gitaly calls'),
details: 'details', details: 'details',
keys: ['feature', 'request'], keys: ['feature', 'request'],
}, },
@ -99,7 +100,8 @@ export default {
class="current-host" class="current-host"
:class="{ canary: currentRequest.details.host.canary }" :class="{ canary: currentRequest.details.host.canary }"
> >
<span v-html="birdEmoji"></span> {{ currentRequest.details.host.hostname }} <span v-html="birdEmoji"></span>
{{ currentRequest.details.host.hostname }}
</span> </span>
</div> </div>
<detailed-metric <detailed-metric
@ -118,9 +120,9 @@ export default {
data-toggle="modal" data-toggle="modal"
data-target="#modal-peek-line-profile" data-target="#modal-peek-line-profile"
> >
profile {{ s__('PerformanceBar|profile') }}
</button> </button>
<a v-else :href="profileUrl"> profile </a> <a v-else :href="profileUrl">{{ s__('PerformanceBar|profile') }}</a>
</div> </div>
<simple-metric <simple-metric
v-for="metric in $options.simpleMetrics" v-for="metric in $options.simpleMetrics"
@ -139,7 +141,7 @@ export default {
id="peek-view-trace" id="peek-view-trace"
class="view" class="view"
> >
<a :href="currentRequest.details.tracing.tracing_url"> trace </a> <a :href="currentRequest.details.tracing.tracing_url">{{ s__('PerformanceBar|trace') }}</a>
</div> </div>
<request-selector <request-selector
v-if="currentRequest" v-if="currentRequest"

15
locale/gitlab.pot
View file

@ -6652,6 +6652,9 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
msgid "No %{header} for this request."
msgstr ""
msgid "No %{providerTitle} repositories available to import" msgid "No %{providerTitle} repositories available to import"
msgstr "" msgstr ""
@ -7137,6 +7140,18 @@ msgstr ""
msgid "Performance optimization" msgid "Performance optimization"
msgstr "" msgstr ""
msgid "PerformanceBar|Gitaly calls"
msgstr ""
msgid "PerformanceBar|SQL queries"
msgstr ""
msgid "PerformanceBar|profile"
msgstr ""
msgid "PerformanceBar|trace"
msgstr ""
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""