fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
This commit is contained in:
parent
8b83787252
commit
418a8b5806
9 changed files with 390 additions and 143 deletions
|
|
@ -1,17 +0,0 @@
|
|||
- content_for :javascript do
|
||||
:javascript
|
||||
$(#{FoodsoftConfig[:use_nick] ? 'user_nick' : 'user_first_name'}).focus();
|
||||
|
||||
= (FoodsoftConfig[:invitation_form_message] or t('.body')).html_safe
|
||||
-# empty paragraph in case when invitation_form_text does not have <p></p>
|
||||
%p
|
||||
|
||||
- form_url = local_assigns[:form_url] || accept_invitation_path
|
||||
= simple_form_for @user, url: form_url do |form|
|
||||
- unless @invite and @invite.group
|
||||
- capt = capture do
|
||||
= form.fields_for :ordergroup do |ogf|
|
||||
= ogf.input :contact_address, label: t('activerecord.attributes.ordergroup.contact_address'), required: false
|
||||
= render partial: 'shared/user_form_fields', locals: {f: form, captured: capt}
|
||||
.form-actions
|
||||
= submit_tag t('.submit'), class: 'btn'
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
%p
|
||||
= simple_fields_for "stock_taking[stock_change_attributes][]", stock_change do |form|
|
||||
= form.hidden_field :stock_article_id
|
||||
= t '.amount'
|
||||
= StockArticle.human_attribute_name :amount
|
||||
(#{stock_change.stock_article.quantity_available})
|
||||
= form.text_field :quantity, :size => 5, :autocomplete => 'off'
|
||||
%span{:data => {:toggle => :tooltip, :title => render(:partial => 'shared/article_price_info', :locals => {:article => stock_change.stock_article})}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue