summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzekiel Kigbo <ekigbo@gitlab.com>2019-07-24 14:46:03 +1000
committerEzekiel Kigbo <ekigbo@gitlab.com>2019-07-24 21:12:02 +1000
commit6e77f11646352fbf64ba149a67d8183981f0e07e (patch)
tree074887c99b4fe7637079bcde21cf9017e9f66a74
parent6bd76377e52c25cae6f008a026b0d2a26e01867a (diff)
downloadgitlab-ce-63560-vue-i18n-add-eslint-rules-to-detect-vue-i18n-offences.tar.gz
-rw-r--r--app/assets/javascripts/vue_shared/components/markdown/toolbar.vue2
-rw-r--r--locale/gitlab.pot3
-rw-r--r--spec/frontend/mr_popover/__snapshots__/mr_popover_spec.js.snap4
-rw-r--r--yarn.lock2
4 files changed, 4 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index 184de224824..84508170364 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -54,7 +54,7 @@ export default {
<span class="uploading-progress-container hide">
<i class="fa fa-file-image-o toolbar-button-icon" aria-hidden="true"></i>
<span class="attaching-file-message"></span>
- <span class="uploading-progress">{{ __('0%') }}</span>
+ <span class="uploading-progress">0%</span>
<span class="uploading-spinner">
<i class="fa fa-spinner fa-spin toolbar-button-icon" aria-hidden="true"></i>
</span>
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f99e75aec7b..62af2291cd0 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -311,9 +311,6 @@ msgstr ""
msgid "0 for unlimited"
msgstr ""
-msgid "0%"
-msgstr ""
-
msgid "1 %{type} addition"
msgid_plural "%{count} %{type} additions"
msgstr[0] ""
diff --git a/spec/frontend/mr_popover/__snapshots__/mr_popover_spec.js.snap b/spec/frontend/mr_popover/__snapshots__/mr_popover_spec.js.snap
index a2a7d0ee91e..bb8fdc39b52 100644
--- a/spec/frontend/mr_popover/__snapshots__/mr_popover_spec.js.snap
+++ b/spec/frontend/mr_popover/__snapshots__/mr_popover_spec.js.snap
@@ -53,7 +53,7 @@ exports[`MR Popover loaded state matches the snapshot 1`] = `
>
foo/bar!1
-
+
</div>
</div>
</glpopover-stub>
@@ -88,7 +88,7 @@ exports[`MR Popover shows skeleton-loader while apollo is loading 1`] = `
>
foo/bar!1
-
+
</div>
</div>
</glpopover-stub>
diff --git a/yarn.lock b/yarn.lock
index 01a0ecd8916..72e4f02c715 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1591,7 +1591,7 @@ acorn@^5.2.1, acorn@^5.5.3:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
-acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.5, acorn@^6.0.7:
+acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.5:
version "6.2.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51"
integrity sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==