Resolve merge conflicts

app/views/articles/_edit_all_table.html.haml

@@ -19,7 +19,9 @@
     - @articles.each_with_index do |article, index|
       = fields_for "articles[#{article.id || index}]", article do |form|
         %tr
-          %td= form.check_box 'availability'
+          %td
+            = yield form # allow to add hidden fields to form
+            = form.check_box 'availability'
           %td= form.text_field 'name', class: 'input-medium'
           %td= form.text_field 'unit', class: 'input-mini'
           %td= form.text_field 'price', class: 'input-mini'

app/views/articles/parse_upload.html.haml

@@ -2,7 +2,9 @@
 %p= t('.body').html_safe
 
 = form_tag(create_from_upload_supplier_articles_path(@supplier)) do
-  = render 'edit_all_table'
+  = render layout: 'edit_all_table' do |form|
+    = form.hidden_field :manufacturer
+    = form.hidden_field :origin
   .form-actions
     = submit_tag t('.submit', supplier: @supplier.name), class: 'btn btn-primary'
     = link_to t('ui.or_cancel'), upload_supplier_articles_path(@supplier)

app/views/layouts/_header.html.haml

@@ -22,5 +22,7 @@
       Javascripts
       \==================================================
     / Placed at the end of the document so the pages load faster
+    :javascript
+      I18n = {locale: '#{j(I18n.locale.to_s)}'}
     = javascript_include_tag "application"
     = yield(:javascript)

app/views/mailer/order_result.text.haml

@@ -1,5 +1,5 @@
-= t '.text0', ordergroup: @group_order.ordergroup.name, order: @order.name, when: I18n.l(@order.ends), user: @order.updated_by.nick
+= raw t '.text0', ordergroup: @group_order.ordergroup.name, order: @order.name, when: I18n.l(@order.ends), user: @order.updated_by.nick
 - for group_order_article in @group_order.group_order_articles.ordered.all(:include => :order_article)
-- article = group_order_article.order_article.article
-  #{article.name}:	#{group_order_article.result} x #{article.unit} = #{group_order_article.result * article.fc_price}
-= t '.text1', sum: @group_order.price, order_url: group_order_url(@group_order), foodcoop: FoodsoftConfig[:name]
+  - article = group_order_article.order_article.article
+  \- #{article.name}:  #{group_order_article.result} x #{article.unit} = #{group_order_article.result * article.fc_price}
+= raw t '.text1', sum: @group_order.price, order_url: group_order_url(@group_order), foodcoop: FoodsoftConfig[:name]