diff --git a/app/assets/javascripts/supplier/application.js b/app/assets/javascripts/supplier/application.js index 9604f5f4..d39323ad 100644 --- a/app/assets/javascripts/supplier/application.js +++ b/app/assets/javascripts/supplier/application.js @@ -44,7 +44,7 @@ function currency(num) { return Qwaiter.currency(num); } $(function(){ - $locale = Qstorage.getItem('locale') || 'en'; + //$locale = Qstorage.getItem('locale') || 'en'; if(Qstorage.getItem('message')){ var container = $('.alert-success'); var msg_finder = Qstorage.getItem('message'); diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 56c0b645..a1070ef8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -22,7 +22,7 @@ module ApplicationHelper super(*args) end - def are_you_sure?(record) + def are_you_sure?(record = nil) t('helpers.links.are_you_sure') end diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim index cc60f64f..f9404c7d 100644 --- a/app/views/layouts/tablet.html.slim +++ b/app/views/layouts/tablet.html.slim @@ -18,6 +18,7 @@ html lang="en" link href="/favicon.ico" rel="shortcut icon" javascript: + var $locale = '#{I18n.locale}'; var supplier_id = '#{current_supplier.id}'; var data_host = ''; var event_host = '#{event_host}'; diff --git a/app/views/suppliers/product_categories/_form.html.slim b/app/views/suppliers/product_categories/_form.html.slim index 3285d58f..ab079db1 100644 --- a/app/views/suppliers/product_categories/_form.html.slim +++ b/app/views/suppliers/product_categories/_form.html.slim @@ -10,6 +10,7 @@ = label_tag "product-checker-#{product.id}", product.display br .control-group + = label_tag nil, ProductCategory.human_attribute_name(:week_days), class: 'control-label' .controls #week_days-group.btn-group data-toggle="buttons-checkbox" span#full_day-controller.icon.icon-time diff --git a/app/views/suppliers/product_categories/index.html.slim b/app/views/suppliers/product_categories/index.html.slim index 8a0b0144..8dd16ecb 100644 --- a/app/views/suppliers/product_categories/index.html.slim +++ b/app/views/suppliers/product_categories/index.html.slim @@ -5,7 +5,7 @@ ul#product-category-list data-update-url=sort_suppliers_product_categories_path - for product_category in @product_categories = content_tag_for :li, product_category do - span.handle [drag] + span.handle.icon-move.icon-white span.name= link_to product_category.name, [:suppliers, product_category] .pull-right.actions = link_to t('helpers.links.edit'), [:edit, :suppliers, product_category], class: 'btn btn-mini' diff --git a/config/locales/models.en.yml b/config/locales/models.en.yml index 49d46d3b..956b63b0 100644 --- a/config/locales/models.en.yml +++ b/config/locales/models.en.yml @@ -19,6 +19,13 @@ en: product_category: Product categories section: Sections attributes: + product_category: + name: Name + position: Position + week_days: Availability + full_day: Whole day + start_from: From + end_on: Till product: name: Name code: Code diff --git a/config/locales/models.nl.yml b/config/locales/models.nl.yml index a2dc912e..9b67e815 100644 --- a/config/locales/models.nl.yml +++ b/config/locales/models.nl.yml @@ -19,6 +19,13 @@ nl: product_category: Product categorieen section: Afdelingen attributes: + product_category: + name: Naam + position: Positie + week_days: Beschikbaarheid + full_day: De hele dag + start_from: Van + end_on: Tot product: name: Naam code: Code diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 0bb36011..cb627cd6 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -74,3 +74,10 @@ nl: selected_products: clear: Leegmaken order: Bestellen + views: + pagination: + first: "« Eerste" + last: "Laatste »" + previous: "‹ Vorige" + next: "Volgende ›" + truncate: "…"