diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-21 12:43:04 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-21 12:44:16 +0200 |
| commit | 53c5b6717ccfb4c9bc1f4faf008d084dd4f0cd96 (patch) | |
| tree | 5703dbdb3c152f2597ad8caebbfdac21ad1fb5f7 | |
| parent | 1733090a9efd3ee6c3c7e0eb0001602db89a04d7 (diff) | |
| download | gitlab-ce-35391-fix-star-i18n-in-js.tar.gz | |
Fix translations for Star/Unstar in JS file35391-fix-star-i18n-in-js
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/assets/javascripts/star.js | 6 | ||||
| -rw-r--r-- | app/views/projects/buttons/_star.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/35391-fix-star-i18n-in-js.yml | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js index 6d38124f1c1..3a06b477d7c 100644 --- a/app/assets/javascripts/star.js +++ b/app/assets/javascripts/star.js @@ -1,6 +1,8 @@ /* eslint-disable func-names, space-before-function-paren, wrap-iife, no-unused-vars, one-var, no-var, one-var-declaration-per-line, prefer-arrow-callback, no-new, max-len */ /* global Flash */ +import { __, s__ } from './locale'; + export default class Star { constructor() { $('.project-home-panel .toggle-star').on('ajax:success', function(e, data, status, xhr) { @@ -11,10 +13,10 @@ export default class Star { toggleStar = function(isStarred) { $this.parent().find('.star-count').text(data.star_count); if (isStarred) { - $starSpan.removeClass('starred').text('Star'); + $starSpan.removeClass('starred').text(s__('StarProject|Star')); $starIcon.removeClass('fa-star').addClass('fa-star-o'); } else { - $starSpan.addClass('starred').text('Unstar'); + $starSpan.addClass('starred').text(__('Unstar')); $starIcon.removeClass('fa-star-o').addClass('fa-star'); } }; diff --git a/app/views/projects/buttons/_star.html.haml b/app/views/projects/buttons/_star.html.haml index e248676be0d..c82ae35a685 100644 --- a/app/views/projects/buttons/_star.html.haml +++ b/app/views/projects/buttons/_star.html.haml @@ -2,7 +2,7 @@ = link_to toggle_star_project_path(@project), { class: 'btn star-btn toggle-star', method: :post, remote: true } do - if current_user.starred?(@project) = icon('star') - %span.starred= _('Unstar') + %span.starred= _('Unstar') - else = icon('star-o') %span= s_('StarProject|Star') diff --git a/changelogs/unreleased/35391-fix-star-i18n-in-js.yml b/changelogs/unreleased/35391-fix-star-i18n-in-js.yml new file mode 100644 index 00000000000..a6fd4dc89fd --- /dev/null +++ b/changelogs/unreleased/35391-fix-star-i18n-in-js.yml @@ -0,0 +1,4 @@ +--- +title: Fix translations for Star/Unstar in JS file +merge_request: +author: |