diff --git a/app/views/git/shared/_fork.html.haml b/app/views/git/shared/_fork.html.haml index b90add29a..af67be144 100644 --- a/app/views/git/shared/_fork.html.haml +++ b/app/views/git/shared/_fork.html.haml @@ -8,14 +8,18 @@ %h3=t 'layout.projects.fork_modal_header' .modal-footer - if current_user.projects.exists? :name => @project.name - %p.center=raw t 'layout.projects.already_exists', :path => (link_to "#{current_user.uname}/#{@project.name}", project_path(current_user.projects.by_name(@project.name).first.id)) + %p.center + =t 'layout.projects.already_exists' + =link_to "#{current_user.uname}/#{@project.name}", project_path(current_user.projects.by_name(@project.name).first.id) - else = form_for @project, :url => fork_project_path(@project), :html => { :class => :form, :multipart => true, :method => :post } do |f| =f.submit t('layout.projects.fork_to', :to => current_user.uname), :class => 'btn btn-primary' - Group.can_own_project(current_user).each do |group| .modal-footer - if group.projects.exists? :name => @project.name - %p.center=raw t 'layout.projects.already_exists', :path => (link_to "#{group.uname}/#{@project.name} (#{t 'activerecord.models.group'})", project_path(group.projects.by_name(@project.name).first.id)) + %p.center + =t 'layout.projects.already_exists' + =link_to "#{group.uname}/#{@project.name} (#{t 'activerecord.models.group'})", project_path(group.projects.by_name(@project.name).first.id) - else = form_for @project, :url => fork_project_path(@project), :html => { :class => :form, :multipart => true, :method => :post } do |f| = hidden_field_tag :group, group.id diff --git a/config/locales/models/project.en.yml b/config/locales/models/project.en.yml index 0da067e1f..17d7a3192 100644 --- a/config/locales/models/project.en.yml +++ b/config/locales/models/project.en.yml @@ -6,7 +6,7 @@ en: fork_and_edit: Fork fork_to: Fork to %{to} fork_modal_header: Where do you want to fork this project? - already_exists: Already exists project %{path} + already_exists: Already exists project list: List list_header: Projects edit_header: Edit project diff --git a/config/locales/models/project.ru.yml b/config/locales/models/project.ru.yml index 85aa4c6a2..11535fd07 100644 --- a/config/locales/models/project.ru.yml +++ b/config/locales/models/project.ru.yml @@ -6,7 +6,7 @@ ru: fork_and_edit: Клонировать fork_to: Клонировать в %{to} fork_modal_header: Куда Вы хотите клонировать проект? - already_exists: Уже существует проект %{path} + already_exists: Уже существует проект list: Список list_header: Проекты edit_header: Редактировать проект