Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2018-04-10 00:11:43 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2018-04-10 00:11:43 +0300
commit7c6c63cb04a305912479d410ff22ab25e742affc (patch)
tree43748d126bf568517055f15203a7f2a9b03bb87c
parent91a3a4b526214f4174f4f12de23dfb5baf033211 (diff)
Added improvements to the summary metrics codejivl-summary-metrics-improvements
-rw-r--r--app/assets/javascripts/lib/utils/text_utility.js2
-rw-r--r--app/assets/javascripts/monitoring/components/graph/axis.vue11
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>