diff options
| author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-06-25 02:15:36 +0000 |
|---|---|---|
| committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-06-25 12:52:49 +1000 |
| commit | 8e680320f6006b7eedef91a9e4fea546b8f8cf80 (patch) | |
| tree | 8742bd65e36284634d1d890291733bd7f6f54d5c | |
| parent | 8291994f30cb7f917d1e614517a0a7061b1059e2 (diff) | |
| download | gitlab-ce-vue-i18n-js-issue-show-directory.tar.gz | |
Replace backticks with single quotesvue-i18n-js-issue-show-directory
Correctly interpolate string with url
4 files changed, 11 insertions, 14 deletions
diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue index 4b29ac8782a..447d7bf21a5 100644 --- a/app/assets/javascripts/issue_show/components/fields/description.vue +++ b/app/assets/javascripts/issue_show/components/fields/description.vue @@ -55,8 +55,8 @@ export default { qa-description-textarea" dir="auto" data-supports-quick-actions="false" - :aria-label="__(`Description`)" - :placeholder="__(`Write a comment or drag your files here…`)" + :aria-label="__('Description')" + :placeholder="__('Write a comment or drag your files here…')" @keydown.meta.enter="updateIssuable" @keydown.ctrl.enter="updateIssuable" > diff --git a/app/assets/javascripts/issue_show/components/fields/description_template.vue b/app/assets/javascripts/issue_show/components/fields/description_template.vue index 4107a3f3b7a..6f955928d8e 100644 --- a/app/assets/javascripts/issue_show/components/fields/description_template.vue +++ b/app/assets/javascripts/issue_show/components/fields/description_template.vue @@ -64,7 +64,7 @@ export default { Choose a template <button class="dropdown-title-button dropdown-menu-close" - :aria-label="__(`Close`)" + :aria-label="__('Close')" type="button" > <i aria-hidden="true" class="fa fa-times dropdown-menu-close-icon"> </i> @@ -74,13 +74,13 @@ export default { <input type="search" class="dropdown-input-field" - :placeholder="__(`Filter`)" + :placeholder="__('Filter')" autocomplete="off" /> <i aria-hidden="true" class="fa fa-search dropdown-input-search"> </i> <i role="button" - :aria-label="__(`Clear templates search input`)" + :aria-label="__('Clear templates search input')" class="fa fa-times dropdown-input-clear js-dropdown-input-clear" > </i> diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue index d0d2075829d..34eb0451d53 100644 --- a/app/assets/javascripts/issue_show/components/fields/title.vue +++ b/app/assets/javascripts/issue_show/components/fields/title.vue @@ -22,8 +22,8 @@ export default { class="form-control qa-title-input" dir="auto" type="text" - :placeholder="__(`Title`)" - :aria-label="__(`Title`)" + :placeholder="__('Title')" + :aria-label="__('Title')" @keydown.meta.enter="updateIssuable" @keydown.ctrl.enter="updateIssuable" /> diff --git a/app/assets/javascripts/issue_show/components/locked_warning.vue b/app/assets/javascripts/issue_show/components/locked_warning.vue index 923b860b214..2f3e611e089 100644 --- a/app/assets/javascripts/issue_show/components/locked_warning.vue +++ b/app/assets/javascripts/issue_show/components/locked_warning.vue @@ -10,12 +10,9 @@ export default { <template> <div class="alert alert-danger"> - {{ sprintf(__("Someone edited the issue at the same time you did. Please check out %{issueLink} - and make sure your changes will not unintentionally remove theirs."), { issueLink: '<a - :href="currentPath" - target="_blank" - rel="nofollow" - >the issue</a - >'}) }} + {{ sprintf(__("Someone edited the issue at the same time you did. Please check out + %{linkStart}%the issue%{linkEnd} and make sure your changes will not unintentionally remove + theirs."), { linkStart: `<a href="${currentPath}" target="_blank" rel="nofollow">` linkEnd: '</a + >', }) }} </div> </template> |