diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index 345e9105a7..289e4fdf80 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -4,7 +4,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout $scope.StatusMessage = StatusMessage $scope.columns = Columns.setColumns - producer: {name: t("label_producers"), visible: true} + producer: {name: t("products_producer"), visible: true} sku: {name: t("products_sku"), visible: false} name: {name: t("products_name"), visible: true} unit: {name: t("products_unit"), visible: true} diff --git a/app/views/spree/admin/products/bulk_edit/_filters.html.haml b/app/views/spree/admin/products/bulk_edit/_filters.html.haml index 99c1067663..cf9d01a4ae 100644 --- a/app/views/spree/admin/products/bulk_edit/_filters.html.haml +++ b/app/views/spree/admin/products/bulk_edit/_filters.html.haml @@ -4,11 +4,13 @@ %br %input.search{ :class => "four columns alpha", 'ng-model' => 'query', :name => "quick_filter", :type => 'text', 'placeholder' => 'Quick Search' } .filter_select{ :class => "four columns" } - %label{ :for => 'producer_filter' }Producer + %label{ :for => 'producer_filter' } + = t 'producer' %br %select{ :class => "four columns alpha", :id => 'producer_filter', 'ofn-select2-min-search' => 5, 'ng-model' => 'producerFilter', 'ng-options' => 'producer.id as producer.name for producer in filterProducers' } .filter_select{ :class => "four columns" } - %label{ :for => 'category_filter' }Category + %label{ :for => 'category_filter' } + = t 'category' %br %select{ :class => "four columns alpha", :id => 'category_filter', 'ofn-select2-min-search' => 5, 'ng-model' => 'categoryFilter', 'ng-options' => 'taxon.id as taxon.name for taxon in filterTaxons'} %div{ :class => "one column" }   diff --git a/config/locales/en.yml b/config/locales/en.yml index b9c32d72f5..ef8da66414 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -17,8 +17,8 @@ en: title: Open Food Network welcome_to: 'Welcome to ' search_by_name: Search by name or suburb... - producers: Aussie Producers - producers_join: Australian producers are now welcome to join the Open Food Network. + producers: Aussie Producers #FIXME + producers_join: Australian producers are now welcome to join the Open Food Network. #FIXME charges_sales_tax: Charges GST? print_invoice: "Print Invoice" send_invoice: "Send Invoice" @@ -48,12 +48,12 @@ en: invoice_column_tax: "GST" invoice_column_price: "Price" - logo: "Logo (640x130)" - logo_mobile: "Mobile logo (75x26)" - logo_mobile_svg: "Mobile logo (SVG)" + logo: "Logo (640x130)" #FIXME + logo_mobile: "Mobile logo (75x26)" #FIXME + logo_mobile_svg: "Mobile logo (SVG)" #FIXME home_hero: "Hero image" home_show_stats: "Show statistics" - footer_logo: "Logo (220x76)" + footer_logo: "Logo (220x76)" #FIXME footer_facebook_url: "Facebook URL" footer_twitter_url: "Twitter URL" footer_instagram_url: "Instagram URL" @@ -338,7 +338,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using products_cart_empty: "Cart empty" products_edit_cart: "Edit your cart" products_from: from - products_change: "No changes to save" + products_change: "No changes to save." products_update_error: "Saving failed with the following error(s):" products_update_error_msg: "Saving failed." products_update_error_data: "Save failed due to invalid data:" @@ -451,16 +451,17 @@ See the %{link} to find out more about %{sitename}'s features and to start using products_variant: Variant products_quantity: Quantity products_availabel: Available? + products_producer: "Producer" products_price: "Price" products_sku: "SKU" products_name: "name" products_unit: "unit" products_on_hand: "on hand" products_on_demand: "on demand" - products_category: "category" + products_category: "Category" products_tax_category: "tax category" - products_available_on: "available on" - products_inherits_properties: "Inherits Properties ?" + products_available_on: "Available On" + products_inherits_properties: "Inherits Properties?" register_title: Register