diff options
author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-07-03 22:36:49 +1000 |
---|---|---|
committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-07-06 09:23:38 +1000 |
commit | 8273416ae476ad3adecc158512c9833fe040ee7f (patch) | |
tree | 49d62a68c1f6d9fff5b038fc672c4a4b5dcfc2d2 | |
parent | 252d1d38353512988974c698f569efae63f140ef (diff) | |
download | gitlab-ce-8273416ae476ad3adecc158512c9833fe040ee7f.tar.gz |
Fix missing `__` imports
Some `__` imports were not automatically
added during the i18n autofix of these files.
Removed potential false positives
Potential false postives that we do not
want to lint have been removed and logged
in a separate issue
12 files changed, 16 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue index 0bc5e2b4951..01b7e2d2fa1 100644 --- a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue +++ b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue @@ -46,7 +46,7 @@ export default { computed: { changedIcon() { const suffix = - !this.file.changed && this.file.staged && !this.showStagedIcon ? __('-solid') : ''; + !this.file.changed && this.file.staged && !this.showStagedIcon ? '-solid' : ''; if (this.forceModifiedIcon) return `file-modified${suffix}`; diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue index b73123ce422..b9e0d447e8d 100644 --- a/app/assets/javascripts/vue_shared/components/commit.vue +++ b/app/assets/javascripts/vue_shared/components/commit.vue @@ -1,6 +1,7 @@ <script> import _ from 'underscore'; import { GlTooltipDirective, GlLink } from '@gitlab/ui'; +import { __ } from "~/locale" import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import UserAvatarLink from './user_avatar/user_avatar_link.vue'; import Icon from '../../vue_shared/components/icon.vue'; diff --git a/app/assets/javascripts/vue_shared/components/deprecated_modal.vue b/app/assets/javascripts/vue_shared/components/deprecated_modal.vue index 41df918be5c..a26b7cffad6 100644 --- a/app/assets/javascripts/vue_shared/components/deprecated_modal.vue +++ b/app/assets/javascripts/vue_shared/components/deprecated_modal.vue @@ -1,5 +1,7 @@ <script> /* eslint-disable vue/require-default-prop */ +import { __ } from "~/locale" + export default { name: 'DeprecatedModal', // use GlModal instead diff --git a/app/assets/javascripts/vue_shared/components/header_ci_component.vue b/app/assets/javascripts/vue_shared/components/header_ci_component.vue index 163cb99ff20..858ae1387e5 100644 --- a/app/assets/javascripts/vue_shared/components/header_ci_component.vue +++ b/app/assets/javascripts/vue_shared/components/header_ci_component.vue @@ -1,5 +1,6 @@ <script> import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui'; +import { __ } from "~/locale" import CiIconBadge from './ci_badge_link.vue'; import TimeagoTooltip from './time_ago_tooltip.vue'; import UserAvatarImage from './user_avatar/user_avatar_image.vue'; diff --git a/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue b/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue index 4c2d9a49351..551762440c2 100644 --- a/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue +++ b/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue @@ -1,7 +1,7 @@ <script> import { GlLink } from '@gitlab/ui'; import _ from 'underscore'; -import { sprintf } from '~/locale'; +import { __, sprintf } from '~/locale'; import icon from '../../../vue_shared/components/icon.vue'; function buildDocsLinkStart(path) { diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index c1f233bf60c..6ebe57d5152 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -1,6 +1,7 @@ <script> import $ from 'jquery'; import { GlPopover, GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { __ } from "~/locale" import ToolbarButton from './toolbar_button.vue'; import Icon from '../icon.vue'; @@ -38,10 +39,10 @@ export default { computed: { mdTable() { return [ - __('| header | header |'), + '| header | header |', '| ------ | ------ |', - __('| cell | cell |'), - __('| cell | cell |'), + '| cell | cell |', + '| cell | cell |', ].join('\n'); }, mdSuggestion() { diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue index 1fd5e54050f..db0943f1d1a 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue @@ -1,5 +1,6 @@ <script> import Vue from 'vue'; +import { __ } from "~/locale" import SuggestionDiff from './suggestion_diff.vue'; import Flash from '~/flash'; diff --git a/app/assets/javascripts/vue_shared/components/memory_graph.vue b/app/assets/javascripts/vue_shared/components/memory_graph.vue index 60fc273887c..d72e60250ca 100644 --- a/app/assets/javascripts/vue_shared/components/memory_graph.vue +++ b/app/assets/javascripts/vue_shared/components/memory_graph.vue @@ -1,4 +1,5 @@ <script> +import { __ } from "~/locale" import { getTimeago } from '../../lib/utils/datetime_utility'; export default { diff --git a/app/assets/javascripts/vue_shared/components/project_avatar/image.vue b/app/assets/javascripts/vue_shared/components/project_avatar/image.vue index e3dd8c83f04..d77d0f825d2 100644 --- a/app/assets/javascripts/vue_shared/components/project_avatar/image.vue +++ b/app/assets/javascripts/vue_shared/components/project_avatar/image.vue @@ -14,7 +14,7 @@ /> */ - +import { __ } from "~/locale" import defaultAvatarUrl from 'images/no_avatar.png'; import { placeholderImage } from '../../../lazy_loader'; diff --git a/app/assets/javascripts/vue_shared/components/select2_select.vue b/app/assets/javascripts/vue_shared/components/select2_select.vue index 33acdbb95e0..6d2612556ff 100644 --- a/app/assets/javascripts/vue_shared/components/select2_select.vue +++ b/app/assets/javascripts/vue_shared/components/select2_select.vue @@ -3,7 +3,7 @@ import $ from 'jquery'; import 'select2'; export default { - name: __('Select2Select'), + name: 'Select2Select', props: { options: { type: Object, diff --git a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue index 4cc9663f1b2..e3abd0e48c9 100644 --- a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue +++ b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue @@ -1,4 +1,5 @@ <script> +import { __ } from "~/locale" import { roundOffFloat } from '~/lib/utils/common_utils'; import tooltip from '~/vue_shared/directives/tooltip'; diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue index 56af7dc124b..c7f54ff3e5a 100644 --- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue +++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue @@ -17,6 +17,7 @@ import { GlTooltip } from '@gitlab/ui'; import defaultAvatarUrl from 'images/no_avatar.png'; +import { __ } from "~/locale" import { placeholderImage } from '../../../lazy_loader'; export default { |