diff options
| -rw-r--r-- | app/assets/javascripts/lib/utils/text_utility.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/monitoring/components/graph/axis.vue | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js index b54ecd2d543..6b5a4acf1ff 100644 --- a/app/assets/javascripts/lib/utils/text_utility.js +++ b/app/assets/javascripts/lib/utils/text_utility.js @@ -90,7 +90,7 @@ export const convertToCamelCase = string => string.replace(/(_\w)/g, s => s[1].t * @param {*} string */ export const convertToSentenceCase = string => { - const splitWord = string.split(' ').map((word, index) => (index > 0 ? word.toLowerCase() : word)); + const splitWord = string.split(' ').map((word, index) => (index > 0 ? slugify(word) : word)); return splitWord.join(' '); }; diff --git a/app/assets/javascripts/monitoring/components/graph/axis.vue b/app/assets/javascripts/monitoring/components/graph/axis.vue index fc4b3689dfd..c52640d22a3 100644 --- a/app/assets/javascripts/monitoring/components/graph/axis.vue +++ b/app/assets/javascripts/monitoring/components/graph/axis.vue @@ -1,6 +1,9 @@ <script> +import Vue from 'vue'; import { convertToSentenceCase } from '~/lib/utils/text_utility'; -import { s__ } from '~/locale'; +import Translate from '~/vue_shared/translate'; + +Vue.use(Translate); export default { props: { @@ -75,10 +78,6 @@ export default { yAxisLabelSentenceCase() { return `${convertToSentenceCase(this.yAxisLabel)} (${this.unitOfDisplay})`; }, - - timeString() { - return s__('PrometheusDashboard|Time'); - }, }, mounted() { this.$nextTick(() => { @@ -136,7 +135,7 @@ export default { :y="yPosition" dy=".35em" > - {{ timeString }} + {{ s__('PrometheusDashboard|Time') }} </text> </g> </template> |