diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 35909cfcc..d404aa6d0 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -6,9 +6,9 @@
.image
=image_tag(avatar_url(@issue.assignee, :micro), :alt => 'avatar')
%span.name= link_to(@issue.assign_uname, user_path(@issue.assignee))
- %span= 'is assigned'
+ %span= t('layout.issues.is_assigned')
- else
- %span= "No one is assigned"
+ %span= t('layout.issues.no_one_is_assigned')
%span.icon-share
.both
.leftlist= t('layout.issues.labels') + ':'
diff --git a/app/views/projects/issues/_header.html.haml b/app/views/projects/issues/_header.html.haml
index cd832b59f..44ed7a70f 100644
--- a/app/views/projects/issues/_header.html.haml
+++ b/app/views/projects/issues/_header.html.haml
@@ -16,9 +16,9 @@
.image
=image_tag(avatar_url(@issue.assignee, :micro), :alt => 'avatar')
%span.name= link_to(@issue.assign_uname, user_path(@issue.assignee))
- %span= 'is assigned'
+ %span= t('layout.issues.is_assigned')
- else
- %span= "No one is assigned"
+ %span= t('layout.issues.no_one_is_assigned')
-if can?(:update, @issue) || @issue.new_record?
%span.icon-share
=render 'projects/issues/assigned_popup'
diff --git a/app/views/projects/issues/_search_collaborators.html.haml b/app/views/projects/issues/_search_collaborators.html.haml
index f2de9f4c9..cc58a6076 100644
--- a/app/views/projects/issues/_search_collaborators.html.haml
+++ b/app/views/projects/issues/_search_collaborators.html.haml
@@ -1,8 +1,8 @@
.people.clear.selected
%span.icon-remove-circle
- = 'Clear assignee'
+ = t('layout.issues.clear_assignee')
.container
- %span= "No one is assigned"
+ %span= t('layout.issues.no_one_is_assigned')
= hidden_field_tag "user-nil", nil, :name => "issue[assignee_id]"
- users = (@users || [])
@@ -14,8 +14,8 @@
.image
=image_tag(avatar_url(user, :micro), :alt => 'avatar')
%span.name= link_to(user.uname, user_path(user))
- %span= 'is assigned'
+ %span= t('layout.issues.is_assigned')
= hidden_field_tag "user-#{index}", user.id, :name => "issue[assignee_id]"
.both
- if users.empty?
- .nothing= 'Nothing to show'
\ No newline at end of file
+ .nothing= t('layout.issues.nothing_to_show')
\ No newline at end of file
diff --git a/app/views/projects/pull_requests/new.html.haml b/app/views/projects/pull_requests/new.html.haml
index 9e29f4510..b7392c882 100644
--- a/app/views/projects/pull_requests/new.html.haml
+++ b/app/views/projects/pull_requests/new.html.haml
@@ -40,9 +40,9 @@
.image
=image_tag(avatar_url(@issue.assignee, :micro), :alt => 'avatar')
%span.name= link_to(@issue.assign_uname, user_path(@issue.assignee))
- %span= 'is assigned'
+ %span= t('layout.issues.is_assigned')
- else
- %span= "No one is assigned"
+ %span= t('layout.issues.no_one_is_assigned')
%span.icon-share
.both
.leftlist.big-list
diff --git a/config/locales/models/issue.en.yml b/config/locales/models/issue.en.yml
index 2887f0f9f..21e42e102 100644
--- a/config/locales/models/issue.en.yml
+++ b/config/locales/models/issue.en.yml
@@ -11,6 +11,10 @@ en:
layout:
issues:
+ is_assigned: is assigned
+ clear_assignee: Clear assignee
+ nothing_to_show: Nothing to show
+ no_one_is_assigned: No one is assigned
list: List
all: All issues
to_me: Assigned to me
diff --git a/config/locales/models/issue.ru.yml b/config/locales/models/issue.ru.yml
index 2660ba6b1..f636e67da 100644
--- a/config/locales/models/issue.ru.yml
+++ b/config/locales/models/issue.ru.yml
@@ -11,6 +11,10 @@ ru:
layout:
issues:
+ is_assigned: назначен
+ clear_assignee: Убрать назначение
+ nothing_to_show: Никто не найден
+ no_one_is_assigned: Никто не назначен
list: Список
all: Все задачи
to_me: Назначенные мне