Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge pull request #412 from foodcoop1040/confirm

Browse source 
Get rid of duplicated confirm_delete translations
This commit is contained in:
wvengen 2016-03-07 19:44:06 +01:00
commit b4e2ddf66d
10 changed files with 6 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/users/show.html.haml
View file

@ -40,6 +40,6 @@
%p
= link_to t('ui.edit'), edit_admin_user_path(@user), class: 'btn'
= link_to t('ui.delete'), [:admin, @user], method: :delete, class: 'btn btn-danger',
data: {confirm: t('.confirm_delete', user: @user.first_name)}
data: {confirm: t('ui.confirm_delete', name: @user.first_name)}
= link_to t('.sudo'), sudo_admin_user_path(@user), method: :post, class: 'btn',
data: {confirm: t('.confirm_sudo', user: @user.first_name)}

2
app/views/article_categories/index.html.haml
View file

@ -15,5 +15,5 @@
%td= truncate article_category.description, length: 50
%td
= link_to t('ui.edit'), edit_article_category_path(article_category), class: 'btn btn-mini'
= link_to t('ui.delete'), article_category, :method => :delete, :data => {:confirm => t('.confirm_delete')},
= link_to t('ui.delete'), article_category, :method => :delete, :data => {:confirm => t('ui.confirm_delete', name: article_category.name)},
class: 'btn btn-mini btn-danger'

2
app/views/articles/_article.html.haml
View file

@ -14,4 +14,4 @@
%td= link_to t('ui.edit'), edit_supplier_article_path(@supplier, article),
:remote => true, class: 'btn btn-mini'
%td= link_to t('ui.delete'), [@supplier, article],
:method => :delete, :data => {:confirm => t('.confirm_delete')}, :remote => true, class: 'btn btn-mini btn-danger'
:method => :delete, :data => {:confirm => t('ui.confirm_delete', name: article.name)}, :remote => true, class: 'btn btn-mini btn-danger'

2
app/views/finance/invoices/_invoices.html.haml
View file

@ -37,5 +37,5 @@
= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'
%td
- if invoice.user_can_edit?(current_user)
= link_to t('ui.delete'), finance_invoice_path(invoice), :data => {:confirm => t('.confirm_delete')}, :method => :delete,
= link_to t('ui.delete'), finance_invoice_path(invoice), :data => {:confirm => t('ui.confirm_delete', name: invoice.number)}, :method => :delete,
class: 'btn btn-danger btn-mini'

2
app/views/stockit/_stock_article.html.haml
View file

@ -10,5 +10,5 @@
%td= stock_article.article_category.name
%td
= link_to t('ui.edit'), edit_stock_article_path(stock_article), remote: true, class: 'btn btn-mini'
= link_to t('ui.delete'), stock_article, :method => :delete, :data => {:confirm => t('.confirm_delete', :name => stock_article.name)},
= link_to t('ui.delete'), stock_article, :method => :delete, :data => {:confirm => t('ui.confirm_delete', :name => stock_article.name)},
class: 'btn btn-mini btn-danger', :remote => true

2
app/views/suppliers/show.html.haml
View file

@ -42,7 +42,7 @@
- if @current_user.role_suppliers?
.form-actions
= link_to t('ui.edit'), edit_supplier_path(@supplier), class: 'btn'
= link_to t('ui.delete'), @supplier, :data => {:confirm => t('.confirm_delete')}, :method => :delete, class: 'btn btn-danger'
= link_to t('ui.delete'), @supplier, :data => {:confirm => t('ui.confirm_delete', name: @supplier.name)}, :method => :delete, class: 'btn btn-danger'
- if @deliveries.any?
.span6