Resolve merge conflicts with i18n

2013-06-10 20:05:47 +02:00 · 2013-06-10 20:05:47 +02:00 · 9753e6db00
commit 9753e6db00
parent ad29a238f2 b7416b2210
6 changed files with 22 additions and 8 deletions
--- a/app/views/articles/_form.html.haml
+++ b/app/views/articles/_form.html.haml
@ -16,7 +16,9 @@
    = f.input :price
    = f.input :unit_quantity
    = f.input :order_number
-    = f.input :tax
+    = f.input :tax, :wrapper => :append do
+      = f.input_field :tax
+      %span.add-on %
    = f.input :deposit
  .modal-footer
    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}