spree_core 2.4.0.rc2 → 2.4.0.rc3

data/lib/spree/core/controller_helpers/order.rb

@@ -56,11 +56,9 @@ module Spree
         end
 
         def set_current_order
-          if user = try_spree_current_user
-            if cookies.signed[:guest_token].nil? && last_incomplete_order
-              cookies.permanent.signed[:guest_token] = last_incomplete_order.guest_token
-            elsif current_order && last_incomplete_order && current_order != last_incomplete_order
-              current_order.merge!(last_incomplete_order, user)
+          if try_spree_current_user && current_order
+            try_spree_current_user.orders.incomplete.where('id != ?', current_order.id).each do |order|
+              current_order.merge!(order, try_spree_current_user)
             end
           end
         end
@@ -74,6 +72,7 @@ module Spree
         end
 
         private
+
         def last_incomplete_order
           @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order
         end
@@ -93,7 +92,7 @@ module Spree
 
           # Find any incomplete orders for the current user
           if order.nil? && try_spree_current_user
-            order = Spree::Order.incomplete.order('id DESC').where({ currency: current_currency, user_id: try_spree_current_user.try(:id)}).first
+            order = last_incomplete_order
           end
 
           order

data/lib/spree/core/importer/order.rb

@@ -14,6 +14,9 @@ module Spree
             order = Spree::Order.create! create_params
             order.associate_user!(user)
 
+            shipments_attrs = params.delete(:shipments_attributes)
+
+            create_shipments_from_params(shipments_attrs, order)
             create_line_items_from_params(params.delete(:line_items_attributes),order)
             create_shipments_from_params(params.delete(:shipments_attributes), order)
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
@@ -28,8 +31,15 @@ module Spree
 
             order.update_attributes!(params)
 
+            order.create_proposed_shipments unless shipments_attrs.present?
+
             # Really ensure that the order totals & states are correct
             order.updater.update
+            if shipments_attrs.present?
+              order.shipments.each_with_index do |shipment, index|
+                shipment.update_columns(cost: shipments_attrs[index][:cost].to_f) if shipments_attrs[index][:cost].present?
+              end
+            end
             order.reload
           rescue Exception => e
             order.destroy if order && order.persisted?
@@ -45,7 +55,7 @@ module Spree
             begin
               shipment = order.shipments.build
               shipment.tracking       = s[:tracking]
-              shipment.stock_location = Spree::StockLocation.find_by_name!(s[:stock_location])
+              shipment.stock_location = Spree::StockLocation.find_by_admin_name(s[:stock_location]) || Spree::StockLocation.find_by_name!(s[:stock_location])
 
               inventory_units = s[:inventory_units] || []
               inventory_units.each do |iu|
@@ -110,8 +120,11 @@ module Spree
           return [] unless adjustments
           adjustments.each do |a|
             begin
-              adjustment = order.adjustments.build(:amount => a[:amount].to_f,
-                                                  :label => a[:label])
+              adjustment = order.adjustments.build(
+                order:  order,
+                amount: a[:amount].to_f,
+                label:  a[:label]
+              )
               adjustment.save!
               adjustment.close!
             rescue Exception => e

data/lib/spree/core/search/base.rb

@@ -42,7 +42,7 @@ module Spree
 
           def add_eagerload_scopes scope
             if include_images
-              scope.eager_load({master: [:prices, :images]})
+              scope.includes({master: [:prices, :images]})
             else
               scope.includes(master: :prices)
             end

data/lib/spree/core/validators/email.rb

@@ -1,6 +1,6 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record,attribute,value)
-    unless value =~ /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+    unless value =~ /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
       record.errors.add(attribute, :invalid, {:value => value}.merge!(options))
     end
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.0.rc2"
+    "2.4.0.rc3"
   end
 end

data/lib/spree/migrations.rb

@@ -28,9 +28,13 @@ module Spree
           name
         end.compact! || []
 
-        unless (engine_migrations.sort - engine_in_app.sort).empty?
-          puts "[#{engine_name.capitalize} WARNING] Missing migrations." \
-               " Run `bundle exec rake railties:install:migrations` to get them.\n\n"
+        missing_migrations = engine_migrations.sort - engine_in_app.sort
+        unless missing_migrations.empty?
+          puts "[#{engine_name.capitalize} WARNING] Missing migrations."
+          missing_migrations.each do |migration|
+            puts "[#{engine_name.capitalize} WARNING] #{migration} from #{engine_name} is missing."
+          end
+          puts "[#{engine_name.capitalize} WARNING] Run `bundle exec rake railties:install:migrations` to get them.\n\n"
           true
         end
       end

data/lib/spree/permitted_attributes.rb

@@ -36,7 +36,9 @@ module Spree
       state: [:name, :abbr]
     ]
 
-    @@checkout_attributes = [:email, :use_billing, :shipping_method_id, :coupon_code, :special_instructions]
+    @@checkout_attributes = [
+      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing
+    ]
 
     @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id]]
 

data/lib/spree/testing_support/ability_helpers.rb

@@ -1,105 +1,105 @@
 shared_examples_for 'access granted' do
   it 'should allow read' do
-    ability.should be_able_to(:read, resource, token) if token
-    ability.should be_able_to(:read, resource) unless token
+    expect(ability).to be_able_to(:read, resource, token) if token
+    expect(ability).to be_able_to(:read, resource) unless token
   end
 
   it 'should allow create' do
-    ability.should be_able_to(:create, resource, token) if token
-    ability.should be_able_to(:create, resource) unless token
+    expect(ability).to be_able_to(:create, resource, token) if token
+    expect(ability).to be_able_to(:create, resource) unless token
   end
 
   it 'should allow update' do
-    ability.should be_able_to(:update, resource, token) if token
-    ability.should be_able_to(:update, resource) unless token
+    expect(ability).to be_able_to(:update, resource, token) if token
+    expect(ability).to be_able_to(:update, resource) unless token
   end
 end
 
 shared_examples_for 'access denied' do
   it 'should not allow read' do
-    ability.should_not be_able_to(:read, resource)
+    expect(ability).to_not be_able_to(:read, resource)
   end
 
   it 'should not allow create' do
-    ability.should_not be_able_to(:create, resource)
+    expect(ability).to_not be_able_to(:create, resource)
   end
 
   it 'should not allow update' do
-    ability.should_not be_able_to(:update, resource)
+    expect(ability).to_not be_able_to(:update, resource)
   end
 end
 
 shared_examples_for 'admin granted' do
   it 'should allow admin' do
-    ability.should be_able_to(:admin, resource, token) if token
-    ability.should be_able_to(:admin, resource) unless token
+    expect(ability).to be_able_to(:admin, resource, token) if token
+    expect(ability).to be_able_to(:admin, resource) unless token
   end
 end
 
 shared_examples_for 'admin denied' do
   it 'should not allow admin' do
-    ability.should_not be_able_to(:admin, resource)
+    expect(ability).to_not be_able_to(:admin, resource)
   end
 end
 
 shared_examples_for 'index allowed' do
   it 'should allow index' do
-    ability.should be_able_to(:index, resource)
+    expect(ability).to be_able_to(:index, resource)
   end
 end
 
 shared_examples_for 'no index allowed' do
   it 'should not allow index' do
-    ability.should_not be_able_to(:index, resource)
+    expect(ability).to_not be_able_to(:index, resource)
   end
 end
 
 shared_examples_for 'create only' do
   it 'should allow create' do
-    ability.should be_able_to(:create, resource)
+    expect(ability).to be_able_to(:create, resource)
   end
 
   it 'should not allow read' do
-    ability.should_not be_able_to(:read, resource)
+    expect(ability).to_not be_able_to(:read, resource)
   end
 
   it 'should not allow update' do
-    ability.should_not be_able_to(:update, resource)
+    expect(ability).to_not be_able_to(:update, resource)
   end
 
   it 'should not allow index' do
-    ability.should_not be_able_to(:index, resource)
+    expect(ability).to_not be_able_to(:index, resource)
   end
 end
 
 shared_examples_for 'read only' do
   it 'should not allow create' do
-    ability.should_not be_able_to(:create, resource)
+    expect(ability).to_not be_able_to(:create, resource)
   end
 
   it 'should not allow update' do
-    ability.should_not be_able_to(:update, resource)
+    expect(ability).to_not be_able_to(:update, resource)
   end
 
   it 'should allow index' do
-    ability.should be_able_to(:index, resource)
+    expect(ability).to be_able_to(:index, resource)
   end
 end
 
 shared_examples_for 'update only' do
   it 'should not allow create' do
-    ability.should_not be_able_to(:create, resource)
+    expect(ability).to_not be_able_to(:create, resource)
   end
 
   it 'should not allow read' do
-    ability.should_not be_able_to(:read, resource)
+    expect(ability).to_not be_able_to(:read, resource)
   end
 
   it 'should allow update' do
-    ability.should be_able_to(:update, resource)
+    expect(ability).to be_able_to(:update, resource)
   end
 
   it 'should not allow index' do
-    ability.should_not be_able_to(:index, resource)
+    expect(ability).to_not be_able_to(:index, resource)
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -8,7 +8,7 @@ module CapybaraExt
   end
 
   def eventually_fill_in(field, options={})
-    page.should have_css('#' + field)
+    expect(page).to have_css('#' + field)
     fill_in field, options
   end
 
@@ -145,7 +145,7 @@ end
 
 RSpec::Matchers.define :have_title do |expected|
   match do |actual|
-    has_css?("title", :text => expected, visible: false)
+    has_css?("title", text: expected, visible: false)
   end
 
   failure_message do |actual|

data/lib/spree/testing_support/factories/customer_return_factory.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
   factory :customer_return, class: Spree::CustomerReturn do
     association(:stock_location, factory: :stock_location)
 
-    ignore do
+    transient do
       line_items_count 1
       return_items_count { line_items_count }
     end

data/lib/spree/testing_support/factories/line_item_factory.rb

@@ -4,7 +4,7 @@ FactoryGirl.define do
     price { BigDecimal.new('10.00') }
     pre_tax_amount { price }
     order
-    ignore do
+    transient do
       association :product
     end
     variant{ product.master }

data/lib/spree/testing_support/factories/order_factory.rb

@@ -5,7 +5,7 @@ FactoryGirl.define do
     completed_at nil
     email { user.email }
 
-    ignore do
+    transient do
       line_items_price BigDecimal.new(10)
     end
 
@@ -20,7 +20,7 @@ FactoryGirl.define do
       bill_address
       ship_address
 
-      ignore do
+      transient do
         line_items_count 1
         shipment_cost 100
       end

data/lib/spree/testing_support/factories/product_factory.rb

@@ -22,6 +22,12 @@ FactoryGirl.define do
     factory :product do
       tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }
 
+      factory :product_in_stock do
+        after :create do |product|
+          product.master.stock_items.first.adjust_count_on_hand(10)
+        end
+      end
+
       factory :product_with_option_types do
         after(:create) { |product| create(:product_option_type, product: product) }
       end

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     name 'Promo'
 
     trait :with_line_item_adjustment do
-      ignore do
+      transient do
         adjustment_rate 10
       end
 
@@ -16,7 +16,7 @@ FactoryGirl.define do
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
 
     trait :with_order_adjustment do
-      ignore do
+      transient do
         weighted_order_adjustment_amount 10
       end
 
@@ -30,7 +30,7 @@ FactoryGirl.define do
     end
 
     trait :with_item_total_rule do
-      ignore do
+      transient do
         item_total_threshold_amount 10
       end
 

data/lib/spree/testing_support/factories/reimbursement_factory.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :reimbursement, class: Spree::Reimbursement do
-    ignore do
+    transient do
       return_items_count 1
     end
 

data/lib/spree/testing_support/factories/stock_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   # must use build()
   factory :stock_packer, class: Spree::Stock::Packer do
-    ignore do
+    transient do
       stock_location { build(:stock_location) }
       contents []
     end
@@ -10,7 +10,7 @@ FactoryGirl.define do
   end
 
   factory :stock_package, class: Spree::Stock::Package do
-    ignore do
+    transient do
       stock_location { build(:stock_location) }
       contents       { [] }
       variants_contents { {} }
@@ -25,7 +25,7 @@ FactoryGirl.define do
     end
 
     factory :stock_package_fulfilled do
-      ignore { variants_contents { { build(:variant) => 2 } } }
+      transient { variants_contents { { build(:variant) => 2 } } }
     end
   end
 end

data/lib/spree/testing_support/flash.rb

@@ -5,12 +5,12 @@ module Spree
         flash = convert_flash(flash)
 
         within("[class='flash success']") do
-          page.should have_content(flash)
+          expect(page).to have_content(flash)
         end
       end
 
       def assert_successful_update_message(resource)
-        flash = Spree.t(:successfully_updated, :resource => Spree.t(resource))
+        flash = Spree.t(:successfully_updated, resource: Spree.t(resource))
         assert_flash_success(flash)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc2
+  version: 2.4.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.rc.3
+- !ruby/object:Gem::Dependency
+  name: carmen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
@@ -540,6 +560,7 @@ files:
 - db/default/spree/states.rb
 - db/default/spree/stores.rb
 - db/default/spree/zones.rb
+- db/development.sqlite
 - db/migrate/20120831092320_spree_one_two.rb
 - db/migrate/20120831092359_spree_promo_one_two.rb
 - db/migrate/20120905145253_add_tax_rate_label.rb
@@ -724,6 +745,11 @@ files:
 - db/migrate/20141002191113_add_code_to_spree_shipping_methods.rb
 - db/migrate/20141007230328_add_cancel_audit_fields_to_spree_orders.rb
 - db/migrate/20141009204607_add_store_id_to_orders.rb
+- db/migrate/20141012083513_create_spree_taxons_prototypes.rb
+- db/migrate/20141021194502_add_state_lock_version_to_order.rb
+- db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb
+- db/migrate/20141101231208_fix_adjustment_order_presence.rb
+- db/migrate/20141105213646_update_classifications_positions.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -840,19 +866,6 @@ files:
 - lib/tasks/exchanges.rake
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_et.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_eu.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_hr.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ka.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ko.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_my.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_pt_BR.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_pt_PT.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sl.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sv.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_uk.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_zh.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_zh_TW.js
 - vendor/assets/javascripts/jsuri.js
 - vendor/assets/stylesheets/normalize.css
 - vendor/assets/stylesheets/skeleton.css

data/vendor/assets/javascripts/jquery.validate/localization/messages_et.js

@@ -1,23 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: ET (Estonian; eesti, eesti keel)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "See väli peab olema täidetud.",
-		maxlength: $.validator.format("Palun sisestage vähem kui {0} tähemärki."),
-		minlength: $.validator.format("Palun sisestage vähemalt {0} tähemärki."),
-		rangelength: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1} tähemärki."),
-		email: "Palun sisestage korrektne e-maili aadress.",
-		url: "Palun sisestage korrektne URL.",
-		date: "Palun sisestage korrektne kuupäev.",
-		dateISO: "Palun sisestage korrektne kuupäev (YYYY-MM-DD).",
-		number: "Palun sisestage korrektne number.",
-		digits: "Palun sisestage ainult numbreid.",
-		equalTo: "Palun sisestage sama väärtus uuesti.",
-		range: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1}."),
-		max: $.validator.format("Palun sisestage väärtus, mis on väiksem või võrdne arvuga {0}."),
-		min: $.validator.format("Palun sisestage väärtus, mis on suurem või võrdne arvuga {0}."),
-		creditcard: "Palun sisestage korrektne krediitkaardi number."
-	});
-}(jQuery));

data/vendor/assets/javascripts/jquery.validate/localization/messages_eu.js

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: EU (Basque; euskara, euskera)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "Eremu hau beharrezkoa da.",
-		remote: "Mesedez, bete eremu hau.",
-		email: "Mesedez, idatzi baliozko posta helbide bat.",
-		url: "Mesedez, idatzi baliozko URL bat.",
-		date: "Mesedez, idatzi baliozko data bat.",
-		dateISO: "Mesedez, idatzi baliozko (ISO) data bat.",
-		number: "Mesedez, idatzi baliozko zenbaki oso bat.",
-		digits: "Mesedez, idatzi digituak soilik.",
-		creditcard: "Mesedez, idatzi baliozko txartel zenbaki bat.",
-		equalTo: "Mesedez, idatzi berdina berriro ere.",
-		accept: "Mesedez, idatzi onartutako luzapena duen balio bat.",
-		maxlength: $.validator.format("Mesedez, ez idatzi {0} karaktere baino gehiago."),
-		minlength: $.validator.format("Mesedez, ez idatzi {0} karaktere baino gutxiago."),
-		rangelength: $.validator.format("Mesedez, idatzi {0} eta {1} karaktere arteko balio bat."),
-		range: $.validator.format("Mesedez, idatzi {0} eta {1} arteko balio bat."),
-		max: $.validator.format("Mesedez, idatzi {0} edo txikiagoa den balio bat."),
-		min: $.validator.format("Mesedez, idatzi {0} edo handiagoa den balio bat.")
-	});
-}(jQuery));

data/vendor/assets/javascripts/jquery.validate/localization/messages_hr.js

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: HR (Croatia; hrvatski jezik)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "Ovo polje je obavezno.",
-		remote: "Ovo polje treba popraviti.",
-		email: "Unesite ispravnu e-mail adresu.",
-		url: "Unesite ispravan URL.",
-		date: "Unesite ispravan datum.",
-		dateISO: "Unesite ispravan datum (ISO).",
-		number: "Unesite ispravan broj.",
-		digits: "Unesite samo brojeve.",
-		creditcard: "Unesite ispravan broj kreditne kartice.",
-		equalTo: "Unesite ponovo istu vrijednost.",
-		accept: "Unesite vrijednost sa ispravnom ekstenzijom.",
-		maxlength: $.validator.format("Maksimalni broj znakova je {0} ."),
-		minlength: $.validator.format("Minimalni broj znakova je {0} ."),
-		rangelength: $.validator.format("Unesite vrijednost između {0} i {1} znakova."),
-		range: $.validator.format("Unesite vrijednost između {0} i {1}."),
-		max: $.validator.format("Unesite vrijednost manju ili jednaku {0}."),
-		min: $.validator.format("Unesite vrijednost veću ili jednaku {0}.")
-	});
-}(jQuery));

data/vendor/assets/javascripts/jquery.validate/localization/messages_ka.js

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: KA (Georgian; ქართული)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "ამ ველის შევსება აუცილებელია.",
-		remote: "გთხოვთ მიუთითოთ სწორი მნიშვნელობა.",
-		email: "გთხოვთ მიუთითოთ ელ-ფოსტის კორექტული მისამართი.",
-		url: "გთხოვთ მიუთითოთ კორექტული URL.",
-		date: "გთხოვთ მიუთითოთ კორექტული თარიღი.",
-		dateISO: "გთხოვთ მიუთითოთ კორექტული თარიღი ISO ფორმატში.",
-		number: "გთხოვთ მიუთითოთ ციფრი.",
-		digits: "გთხოვთ მიუთითოთ მხოლოდ ციფრები.",
-		creditcard: "გთხოვთ მიუთითოთ საკრედიტო ბარათის კორექტული ნომერი.",
-		equalTo: "გთხოვთ მიუთითოთ ასეთივე მნიშვნელობა კიდევ ერთხელ.",
-		accept: "გთხოვთ აირჩიოთ ფაილი კორექტული გაფართოებით.",
-		maxlength: $.validator.format("დასაშვებია არაუმეტეს {0} სიმბოლო."),
-		minlength: $.validator.format("აუცილებელია შეიყვანოთ მინიმუმ {0} სიმბოლო."),
-		rangelength: $.validator.format("ტექსტში სიმბოლოების რაოდენობა უნდა იყოს {0}-დან {1}-მდე."),
-		range: $.validator.format("გთხოვთ შეიყვანოთ ციფრი {0}-დან {1}-მდე."),
-		max: $.validator.format("გთხოვთ შეიყვანოთ ციფრი რომელიც ნაკლებია ან უდრის {0}-ს."),
-		min: $.validator.format("გთხოვთ შეიყვანოთ ციფრი რომელიც მეტია ან უდრის {0}-ს.")
-	});
-}(jQuery));

data/vendor/assets/javascripts/jquery.validate/localization/messages_ko.js

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: KO (Korean; 한국어)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "필수 항목입니다.",
-		remote: "항목을 수정하세요.",
-		email: "유효하지 않은 E-Mail주소입니다.",
-		url: "유효하지 않은 주소입니다.",
-		date: "옳바른 날짜를 입력하세요.",
-		dateISO: "옳바른 날짜(ISO)를 입력하세요.",
-		number: "유효한 숫자가 아닙니다.",
-		digits: "숫자만 입력 가능합니다.",
-		creditcard: "신용카드번호가 바르지 않습니다.",
-		equalTo: "같은값을 다시 입력하세요.",
-		accept: "옳바른 확장자가 아닙니다.",
-		maxlength: $.format("{0}자를 넘을 수 없습니다. "),
-		minlength: $.format("{0}자 이하로 입력하세요."),
-		rangelength: $.format("문자 길이를 {0} 에서 {1} 사이의로 입력하세요."),
-		range: $.format("{0} 에서 {1} 값을 입력하세요."),
-		max: $.format("{0} 이하의 값을 입력하세요."),
-		min: $.format("{0} 이상의 값을 입력하세요.")
-	});
-}(jQuery));