i18n cleanup (affects foodcoops#137)

This commit is contained in:
wvengen 2013-12-12 00:13:19 +01:00
parent b53cb36714
commit d448707b1a
16 changed files with 64 additions and 124 deletions

View file

@ -1,14 +1,14 @@
%table.ordered-articles.table.table-striped
%thead
%tr
%th= sort_link_helper t('.article'), "name"
%th= sort_link_helper t('.number'), "order_number"
%th= sort_link_helper Article.model_name.human, "name"
%th= sort_link_helper Article.human_attribute_name(:order_number_short), "order_number"
%th= t('.amount')
%th= t('.amount_per_unit')
%th= heading_helper Article, :units
%th= t('.net')
%th= t('.gross')
%th= t('.tax')
%th= t('.refund')
%th= heading_helper Article, :tax
%th= heading_helper Article, :deposit
%th{:colspan => "2"}
= link_to t('.add_article'), new_finance_order_order_article_path(@order), remote: true,
class: 'btn btn-small'

View file

@ -3,7 +3,7 @@
%thead
%tr
%td
%td{:style => "width:8em"}= t('.group')
%td{:style => "width:8em"}= Ordergroup.model_name.human
%td= t('.units')
%td= t('.total')
%td{:colspan => "3",:style => "width:14em"}

View file

@ -5,7 +5,7 @@
= order_article.units_to_order
- unless order_article.ordered_quantities_equal_to_group_orders?
%span{:style => "color:red;font-weight: bold"} !
%td= order_article.price.unit_quantity.to_s + ' * ' + order_article.article.unit.to_s
%td #{order_article.price.unit_quantity} × #{order_article.article.unit}
%td
= number_to_currency(order_article.price.price, :unit => "")
:plain
@ -16,7 +16,7 @@
:plain
/
= number_to_currency(order_article.total_gross_price, :unit => "")
%td= order_article.price.tax
%td #{order_article.price.tax}%
%td= order_article.price.deposit
%td
= link_to t('ui.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true,