diff --git a/.travis.yml b/.travis.yml index 246742e7..c1a23f1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ before_script: - sh -e /etc/init.d/xvfb start - export DISPLAY=:99.0 - bundle exec rake test_app + - echo 'Rails.application.config.assets.precompile += %w( spinner.gif )' >> spec/dummy/config/initializers/assets.rb script: - bundle exec rspec spec rvm: - - 2.1 - - 2.2 + - 2.2.2 diff --git a/app/views/spree/admin/parts/index.html.erb b/app/views/spree/admin/parts/index.html.erb index 707f6653..727cee4c 100644 --- a/app/views/spree/admin/parts/index.html.erb +++ b/app/views/spree/admin/parts/index.html.erb @@ -14,8 +14,8 @@
-
diff --git a/app/views/spree/admin/products/_product_assembly_fields.html.erb b/app/views/spree/admin/products/_product_assembly_fields.html.erb index dcd70f98..dcfdc1a1 100644 --- a/app/views/spree/admin/products/_product_assembly_fields.html.erb +++ b/app/views/spree/admin/products/_product_assembly_fields.html.erb @@ -1,16 +1,16 @@
<%= f.field_container :can_be_part, class: ['form-group'] do %> - <%= f.label :can_be_part %> + <%= f.label Spree.t('.can_be_part') %> <%= f.error_message_on :can_be_part %> - <%= f.check_box :can_be_part, class: 'form-control' %> + <%= f.check_box :can_be_part %> <% end %>
<%= f.field_container :individual_sale, class: ['form-group'] do %> - <%= f.label :individual_sale %> + <%= f.label Spree.t('.individual_sale') %> <%= f.error_message_on :individual_sale %> - <%= f.check_box :individual_sale, class: 'form-control' %> + <%= f.check_box :individual_sale %> <% end %>
@@ -23,4 +23,4 @@ }); <% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f3065587..d896b009 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1,6 +1,14 @@ --- ru: spree: + admin: + parts: + index: + search: Поиск + products: + form: + can_be_part: Может быть частью набора + individual_sale: Может продаваться отдельно available_parts: Доступные составные части can_be_part: Может входить в состав других продуктов individual_sale: Может продаваться отдельно @@ -9,6 +17,6 @@ ru: assembly_cannot_be_part: сборка не может быть частью product_bundles: Продукт cвязки parts_included: 'Детали, входящие' - part_of_bundle: 'Часть пучка %{sku}' + part_of_bundle: 'Часть набора %{sku}' selected_quantity_not_available: - user_selectable: + user_selectable: Выбирается пользователем diff --git a/spree_product_assembly.gemspec b/spree_product_assembly.gemspec index c2aa6969..79871282 100644 --- a/spree_product_assembly.gemspec +++ b/spree_product_assembly.gemspec @@ -25,8 +25,8 @@ Gem::Specification.new do |s| s.add_development_dependency 'ffaker' s.add_development_dependency 'launchy' s.add_development_dependency 'pg' - s.add_development_dependency 'poltergeist', '~> 1.6' - s.add_development_dependency 'rspec-rails', '~> 3.3.0' + s.add_development_dependency 'poltergeist', '~> 1.12.0' + s.add_development_dependency 'rspec-rails', '~> 3.5.2' s.add_development_dependency 'sass-rails', '~> 5.0.0' s.add_development_dependency 'simplecov' s.add_development_dependency 'sqlite3'