diff options
author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-06-25 16:41:40 +1000 |
---|---|---|
committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-07-01 17:03:18 +1000 |
commit | a9c33b4198b24499afff1c3b5591bd4323eb98e3 (patch) | |
tree | 4abf55c6ece2b4f4b45b821d64863351ed23374f | |
parent | 58f3a5615490aa30a5adda83ebb8ab66de891859 (diff) | |
download | gitlab-ce-a9c33b4198b24499afff1c3b5591bd4323eb98e3.tar.gz |
Vue-i18n: app/assets/javascripts/serverless directory
i18n linting for .vue files under the
app/assets/javascripts/serverless directory
-rw-r--r-- | app/assets/javascripts/serverless/components/area.vue | 15 | ||||
-rw-r--r-- | app/assets/javascripts/serverless/components/function_details.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/serverless/components/functions.vue | 24 | ||||
-rw-r--r-- | locale/gitlab.pot | 9 |
4 files changed, 38 insertions, 14 deletions
diff --git a/app/assets/javascripts/serverless/components/area.vue b/app/assets/javascripts/serverless/components/area.vue index 32c9d6eccb8..a1a8cd3acbd 100644 --- a/app/assets/javascripts/serverless/components/area.vue +++ b/app/assets/javascripts/serverless/components/area.vue @@ -4,6 +4,7 @@ import { debounceByAnimationFrame } from '~/lib/utils/common_utils'; import dateFormat from 'dateformat'; import { X_INTERVAL } from '../constants'; import { validateGraphData } from '../utils'; +import { __ } from '~/locale'; let debouncedResize; @@ -42,7 +43,7 @@ export default { }, generateSeries() { return { - name: 'Invocations', + name: __('Invocations'), type: 'line', data: this.chartData.requests.map(data => [data.time, data.value]), symbolSize: 0, @@ -124,7 +125,9 @@ export default { <div class="prometheus-graph"> <div class="prometheus-graph-header"> <h5 ref="graphTitle" class="prometheus-graph-title">{{ graphData.title }}</h5> - <div ref="graphWidgets" class="prometheus-graph-widgets"><slot></slot></div> + <div ref="graphWidgets" class="prometheus-graph-widgets"> + <slot></slot> + </div> </div> <gl-area-chart ref="areaChart" @@ -135,12 +138,8 @@ export default { :width="width" :include-legend-avg-max="false" > - <template slot="tooltipTitle"> - {{ tooltipPopoverTitle }} - </template> - <template slot="tooltipContent"> - {{ tooltipPopoverContent }} - </template> + <template slot="tooltipTitle">{{ tooltipPopoverTitle }}</template> + <template slot="tooltipContent">{{ tooltipPopoverContent }}</template> </gl-area-chart> </div> </template> diff --git a/app/assets/javascripts/serverless/components/function_details.vue b/app/assets/javascripts/serverless/components/function_details.vue index b8906cfca4e..426acb96cfd 100644 --- a/app/assets/javascripts/serverless/components/function_details.vue +++ b/app/assets/javascripts/serverless/components/function_details.vue @@ -89,7 +89,9 @@ export default { }} </p> </div> - <div v-else><p>No pods loaded at this time.</p></div> + <div v-else> + <p>{{ __('No pods loaded at this time.') }}</p> + </div> <area-chart v-if="hasPrometheusData" :graph-data="graphData" :container-width="elWidth" /> <missing-prometheus diff --git a/app/assets/javascripts/serverless/components/functions.vue b/app/assets/javascripts/serverless/components/functions.vue index 94341050b86..4b00ff65eaf 100644 --- a/app/assets/javascripts/serverless/components/functions.vue +++ b/app/assets/javascripts/serverless/components/functions.vue @@ -87,13 +87,27 @@ export default { }} </p> <ul> - <li>Your repository does not have a corresponding <code>serverless.yml</code> file.</li> - <li>Your <code>.gitlab-ci.yml</code> file is not properly configured.</li> + <!-- + TODO: will need to add eslint-disable vue-i18n/no-bare-strings + After https://gitlab.com/ekigbo/eslint-plugin-vue-i18n is merged in + Don't want to translate `serverless.yml` and `.gitlab-ci.yml` + --> <li> - The functions listed in the <code>serverless.yml</code> file don't match the namespace - of your cluster. + Your repository does not have a corresponding + <code>{{ 'serverless.yml' }}</code> file. </li> - <li>The deploy job has not finished.</li> + <li> + Your <code>{{ '.gitlab-ci.yml' }}</code> file is not properly configured. + </li> + <li> + The functions listed in the <code>{{ 'serverless.yml' }}</code> file don't match the + namespace of your cluster. + </li> + <li>{{ __('The deploy job has not finished.') }}</li> + <!-- + TODO: will need to add eslint-enable vue-i18n/no-bare-strings + After https://gitlab.com/ekigbo/eslint-plugin-vue-i18n is merged in + --> </ul> <p> diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a04a0acd98e..9f2aa415dc3 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5553,6 +5553,9 @@ msgstr "" msgid "Invite member" msgstr "" +msgid "Invocations" +msgstr "" + msgid "Invoke Count" msgstr "" @@ -6780,6 +6783,9 @@ msgstr "" msgid "No parent group" msgstr "" +msgid "No pods loaded at this time." +msgstr "" + msgid "No preview for this file type" msgstr "" @@ -10195,6 +10201,9 @@ msgstr "" msgid "The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository." msgstr "" +msgid "The deploy job has not finished." +msgstr "" + msgid "The deployment of this job to %{environmentLink} did not succeed." msgstr "" |