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

move commonly used verbs to common i18n identifier

Browse source
This commit is contained in:
wvengen 2013-04-04 02:49:52 +02:00
parent 4aa40b387a
commit f1d6df9ecc
60 changed files with 50 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/ordergroups/_form.html.haml
View file

@ -8,4 +8,4 @@
= f.input :ignore_apple_restriction
.form-actions
= f.button :submit
= link_to t('admin.or_cancel'), :back
= link_to t('ui.or_cancel'), :back

6
app/views/admin/ordergroups/_ordergroups.html.haml
View file

@ -17,6 +17,6 @@
%td= link_to_gmaps ordergroup.contact_address
%td= ordergroup.users.size
%td
= link_to t('admin.edit'), edit_admin_ordergroup_path(ordergroup), class: 'btn btn-mini'
= link_to t('admin.delete'), [:admin, ordergroup], :confirm => t('admin.confirm', name: ordergroup.name),
:method => :delete, class: 'btn btn-mini btn-danger'
= link_to t('ui.edit'), edit_admin_ordergroup_path(ordergroup), class: 'btn btn-mini'
= link_to t('ui.delete'), [:admin, ordergroup], :confirm => t('admin.confirm', name: ordergroup.name),
:method => :delete, class: 'btn btn-mini btn-danger'

4
app/views/admin/ordergroups/show.html.haml
View file

@ -1,6 +1,6 @@
- title t '.title', name: @ordergroup.name
%section= render 'shared/group', group: @ordergroup
= link_to t('.edit'), edit_admin_ordergroup_path(@ordergroup), class: 'btn'
= link_to t('.delete'), [:admin, @ordergroup], :confirm => t('.confirm'), :method => :delete, class: 'btn btn-danger'
= link_to t('ui.edit'), edit_admin_ordergroup_path(@ordergroup), class: 'btn'
= link_to t('ui.delete'), [:admin, @ordergroup], :confirm => t('.confirm'), :method => :delete, class: 'btn btn-danger'
= link_to t('.send_message'), new_message_path(:message => {:group_id => @ordergroup.id}), class: 'btn'

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

@ -2,4 +2,4 @@
= render 'shared/user_form_fields', f: f
.form-actions
= f.submit
= link_to t('admin.or_cancel'), :back
= link_to t('ui.or_cancel'), :back

4
app/views/admin/users/_users.html.haml
View file

@ -18,6 +18,6 @@
%td= user.email
%td= format_roles(user)
%td= format_time(user.last_login)
%td= link_to t('admin.edit'), edit_admin_user_path(user), class: 'btn btn-mini'
%td= link_to t('admin.delete'), [:admin, user], :confirm => t('admin.confirm', name: user.name),
%td= link_to t('ui.edit'), edit_admin_user_path(user), class: 'btn btn-mini'
%td= link_to t('ui.delete'), [:admin, user], :confirm => t('admin.confirm', name: user.name),
:method => :delete, class: 'btn btn-danger btn-mini'

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

@ -33,7 +33,7 @@
%hr/
%p
= link_to t('admin.edit'), edit_admin_user_path(@user), class: 'btn'
= link_to t('admin.delete'), [:admin, @user], :confirm => t('.confirm', user: @user.first_name),
= link_to t('ui.edit'), edit_admin_user_path(@user), class: 'btn'
= link_to t('ui.delete'), [:admin, @user], :confirm => t('.confirm', user: @user.first_name),
:method => :delete, class: 'btn btn-danger'
= link_to t('.send_message'), new_message_path(:message => {:mail_to => @user.id}), class: 'btn'

2
app/views/admin/workgroups/_form.html.haml
View file

@ -9,4 +9,4 @@
= f.input :role_orders
.form-actions
= f.button :submit
= link_to t('admin.or_cancel'), :back
= link_to t('ui.or_cancel'), :back

4
app/views/admin/workgroups/_workgroups.html.haml
View file

@ -15,6 +15,6 @@
%td= workgroup.users.size
%td= format_roles(workgroup)
%td
= link_to t('admin.edit'), edit_admin_workgroup_path(workgroup), class: 'btn btn-mini'
= link_to t('admin.delete'), [:admin, workgroup], :confirm => t('admin.confirm', name: workgroup.name),
= link_to t('ui.edit'), edit_admin_workgroup_path(workgroup), class: 'btn btn-mini'
= link_to t('ui.delete'), [:admin, workgroup], :confirm => t('admin.confirm', name: workgroup.name),
:method => :delete, class: 'btn btn-mini btn-danger'

6
app/views/admin/workgroups/show.html.haml
View file

@ -1,6 +1,6 @@
- title t '.title', name: @workgroup.name
%section= render 'shared/group', group: @workgroup
= link_to t('.edit'), edit_admin_workgroup_path(@workgroup), class: 'btn'
= link_to t('.delete'), [:admin, @workgroup], :confirm => t('.confirm'), :method => :delete, class: 'btn btn-danger'
= link_to_new_message(message_params: {group_id: @workgroup.id})
= link_to t('ui.edit'), edit_admin_workgroup_path(@workgroup), class: 'btn'
= link_to t('ui.delete'), [:admin, @workgroup], :confirm => t('.confirm'), :method => :delete, class: 'btn btn-danger'
= link_to_new_message(message_params: {group_id: @workgroup.id})

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

@ -3,4 +3,4 @@
= f.input :description
.form-actions
= f.submit class: 'btn'
= link_to t('.or_cancel'), article_categories_path
= link_to t('ui.or_cancel'), article_categories_path

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

@ -7,4 +7,4 @@
%i= t '.warning'
.form-actions
= submit_tag t('.submit'), class: 'btn btn-primary'
= link_to t('.or_cancel'), supplier_articles_path(@supplier)
= link_to t('ui.or_cancel'), supplier_articles_path(@supplier)

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

@ -5,5 +5,5 @@
= render 'edit_all_table'
.form-actions
= submit_tag t('.submit', supplier: @supplier.name), class: 'btn btn-primary'
= link_to t('.or_cancel'), upload_supplier_articles_path(@supplier)
= link_to t('ui.or_cancel'), upload_supplier_articles_path(@supplier)

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

@ -64,4 +64,4 @@
%hr/
= hidden_field 'supplier', 'id'
= submit_tag t('.submit'), class: 'btn btn-primary'
= link_to t('.or_cancel'), supplier_articles_path(@supplier)
= link_to t('ui.or_cancel'), supplier_articles_path(@supplier)

6
app/views/finance/balancing/_edit_note.html.haml
View file

@ -1,9 +1,9 @@
= simple_form_for @order, url: update_note_finance_order_path(@order), remote: true, method: :put do |f|
.modal-header
= button_tag "x", class: 'close', data: {dismiss: 'modal'}
= button_tag t('ui.marks.close'), class: 'close', data: {dismiss: 'modal'}
%h3 Notiz bearbeiten
.modal-body
= f.input :note, input_html: {class: 'input-xlarge'}
.modal-footer
= button_tag t('.close'), class: 'btn', data: {dismiss: 'modal'}
= f.submit , class: 'btn btn-primary'
= button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
= f.submit , class: 'btn btn-primary'

6
app/views/finance/balancing/_order_article.html.haml
View file

@ -19,8 +19,8 @@
%td= order_article.price.tax
%td= order_article.price.deposit
%td
= link_to t('.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true,
= link_to t('ui.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true,
class: 'btn btn-mini'
%td
= link_to t('.delete'), finance_order_order_article_path(order_article.order, order_article), method: :delete,
remote: true, confirm: t('.confirm'), class: 'btn btn-danger btn-mini'
= link_to t('ui.delete'), finance_order_order_article_path(order_article.order, order_article), method: :delete,
remote: true, confirm: t('.confirm'), class: 'btn btn-danger btn-mini'

2
app/views/finance/financial_transactions/new.html.haml
View file

@ -9,4 +9,4 @@
= f.input :note, :as => :text
.form-actions
= f.submit class: 'btn btn-primary'
= link_to t('.or_cancel'), finance_ordergroup_transactions_path(@ordergroup)
= link_to t('ui.or_cancel'), finance_ordergroup_transactions_path(@ordergroup)

2
app/views/finance/financial_transactions/new_collection.html.haml
View file

@ -33,4 +33,4 @@
= link_to t('.new_ordergroup'), '#', 'data-add-transaction' => true, class: 'btn'
.form-actions
= submit_tag t('.save'), class: 'btn btn-primary'
= link_to t('.or_cancel'), finance_ordergroups_path
= link_to t('ui.or_cancel'), finance_ordergroups_path

4
app/views/finance/group_order_articles/_form.html.haml
View file

@ -7,5 +7,5 @@
= form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
= form.input :result, hint: "Einheit: #{@order_article.article.unit}"
.modal-footer
= button_tag t('.close'), class: 'btn', data: {dismiss: 'modal'}
= form.submit t('.save'), class: 'btn btn-primary'
= button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
= form.submit t('ui.save'), class: 'btn btn-primary'

4
app/views/finance/index.html.haml
View file

@ -18,7 +18,7 @@
%td= format_date(invoice.date)
%td.numeric= number_to_currency(invoice.amount)
%td= invoice.supplier.name
%td= link_to t('.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'
%td= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'
%h2
= t('.last_transactions')
@ -57,4 +57,4 @@
%td.numeric= number_to_currency(order.sum(:fc))
%td= link_to t('.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini'
- else
= t('.everything_cleared')
= t('.everything_cleared')

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

@ -17,4 +17,4 @@
= f.input :note
.form-actions
= f.submit class: 'btn'
= link_to t('.or_cancel'), :back
= link_to t('ui.or_cancel'), :back

2
app/views/foodcoop/workgroups/edit.html.haml
View file

@ -5,4 +5,4 @@
= render :partial => 'shared/group_form_fields', :locals => {:f => f}
.form-actions
= f.submit
= link_to t('.or_cancel'), foodcoop_workgroups_path
= link_to t('ui.or_cancel'), foodcoop_workgroups_path

2
app/views/group_orders/_form.html.haml
View file

@ -138,6 +138,6 @@
€
#order-button
= submit_tag( t('.action_save'), id: 'submit_button', class: 'btn btn-primary' )
#{link_to t('.cancel'), group_orders_path}
#{link_to t('ui.or_cancel'), group_orders_path}
%input#total_balance{name: "total_balance", type: "hidden", value: @ordergroup.account_balance - @group_order.price}/
%input{name: "version", type: "hidden", value: @version}/

2
app/views/home/profile.html.haml
View file

@ -8,7 +8,7 @@
= simple_form_for(@current_user, :url => { :action => 'update_profile'}) do |f|
= render :partial => 'shared/user_form_fields', :locals => {:f => f}
.form-actions
= submit_tag t('.user.save'), class: 'btn'
= submit_tag t('ui.save'), class: 'btn'
.span5
%h2= t '.groups.title'
%table.table.table-striped

2
app/views/login/forgot_password.html.haml
View file

@ -4,4 +4,4 @@
= form.input :email
.form-actions
= form.submit t('.submit'), class: 'btn'
= link_to t('.cancel'), :back
= link_to t('ui.or_cancel'), :back

2
app/views/messages/new.haml
View file

@ -43,4 +43,4 @@
= f.input :body, input_html: {class: 'input-xxlarge'}
.form-actions
= f.submit class: 'btn btn-primary'
= link_to t('.cancel'), :back
= link_to t('ui.or_cancel'), :back

2
app/views/ordergroups/edit.html.haml
View file

@ -81,4 +81,4 @@
= f.label :contact_address
%br/
= f.text_field :contact_address
%p= f.submit t('.submit')
%p= f.submit t('ui.edit')

2
app/views/orders/_form.html.haml
View file

@ -51,4 +51,4 @@
.form-actions
= f.submit class: 'btn'
= link_to t('.cancel'), orders_path
= link_to t('ui.or_cancel'), orders_path

2
app/views/stock_takings/edit.html.haml
View file

@ -4,4 +4,4 @@
= f.input :date
= f.input :note
= f.submit
= link_to t('.cancel'), stock_takings_path
= link_to t('ui.cancel'), stock_takings_path

2
app/views/stock_takings/new.html.haml
View file

@ -14,4 +14,4 @@
= render :partial => 'stock_change', :collection => @stock_taking.stock_changes
.form-actions
= f.submit class: 'btn'
= link_to t('.cancel'), stock_takings_path
= link_to t('ui.cancel'), stock_takings_path

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

@ -13,4 +13,4 @@
= f.association :article_category
.form-actions
= f.submit class: 'btn'
= link_to t('.cancel'), stock_articles_path
= link_to t('ui.or_cancel'), stock_articles_path

2
app/views/suppliers/_form.haml
View file

@ -18,4 +18,4 @@
= f.input :min_order_quantity
.form-actions
= f.submit class: 'btn'
= link_to t('.cancel'), suppliers_path
= link_to t('ui.or_cancel'), suppliers_path