spree_frontend 2.4.0.rc2 → 2.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755592ef010c216060da1010dbd8f09c94fb09d3
-  data.tar.gz: 23953859a27b8e1cf754f6ce868d0365ed71da37
+  metadata.gz: 1089a79535f1706b421cb76a7e518e34b9a67611
+  data.tar.gz: b156f201c7eb42e619e483e8b72232abe6261a1d
 SHA512:
-  metadata.gz: f0d78f6334f3ae347236405ae442326d988d214ca9a26977975c36ae27b8f5cd0f77a95282572a4f6de065e18383d6a5808fa36ba9af0c2c1bb4c5caea096cac
-  data.tar.gz: 201a1ec7a298d40621e3f7bf94a06b8ebc0dec3b86cc7cac281e9eca01ae1e40e263b2522d33ad5d2bdc0aa4b0afb811a65ae131691700dd8b76936bcd1a348e
+  metadata.gz: 29c59434095955aa26eda666002f982260ff083291c1405cf37ffa9b48dcf1c65602121f47aa9984914a6f90dd51e543310f020d496ad2d2a4663ab43d413520
+  data.tar.gz: 03b76fbd5538e992e0aaad98cbdcf3aba874d9292c6c59cf2e2c19173577675a87ce945efb9cdd0392d79a650798b016d9b421c1437df36c5999a3bcdf534460

data/app/controllers/spree/checkout_controller.rb

@@ -7,6 +7,8 @@ module Spree
     ssl_required
 
     before_action :load_order_with_lock
+    before_filter :ensure_valid_state_lock_version, only: [:update]
+    before_filter :set_state_if_present
 
     before_action :ensure_order_not_completed
     before_action :ensure_checkout_allowed
@@ -72,7 +74,21 @@ module Spree
       def load_order_with_lock
         @order = current_order(lock: true)
         redirect_to spree.cart_path and return unless @order
+      end
+
+      def ensure_valid_state_lock_version
+        if params[:order] && params[:order][:state_lock_version]
+          @order.with_lock do
+            unless @order.state_lock_version == params[:order].delete(:state_lock_version).to_i
+              flash[:error] = Spree.t(:order_already_updated)
+              redirect_to checkout_state_path(@order.state) and return
+            end
+            @order.increment!(:state_lock_version)
+          end
+        end
+      end
 
+      def set_state_if_present
         if params[:state]
           redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
           @order.state = params[:state]

data/app/controllers/spree/orders_controller.rb

@@ -35,7 +35,7 @@ module Spree
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order || Order.new
+      @order = current_order || Order.incomplete.find_or_initialize_by(guest_token: cookies.signed[:guest_token])
       associate_user
     end
 

data/app/controllers/spree/products_controller.rb

@@ -22,7 +22,11 @@ module Spree
 
     private
       def accurate_title
-        @product ? @product.meta_title || @product.name : super
+        if @product
+          @product.meta_title.blank? ? @product.name : @product.meta_title
+        else
+          super
+        end
       end
 
       def load_product

data/app/views/spree/checkout/edit.html.erb

@@ -1,11 +1,11 @@
-<div id="checkout" data-hook>  
+<div id="checkout" data-hook>
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
-  
+
   <div class="row" data-hook="checkout_header">
     <h1 class="columns three alpha" data-hook="checkout_title"><%= Spree.t(:checkout) %></h1>
     <div class="columns thirteen omega" data-hook="checkout_progress"><%= checkout_progress %></div>
   </div>
-  
+
   <div class="row" data-hook="checkout_content">
     <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>" data-hook="checkout_form_wrapper">
       <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
@@ -15,9 +15,10 @@
             <%= form.text_field :email %>
           </p>
         <% end %>
+        <%= form.hidden_field :state_lock_version %>
         <%= render @order.state, :form => form %>
       <% end %>
-    </div>    
+    </div>
     <% if @order.state != 'confirm' %>
       <div id="checkout-summary" data-hook="checkout_summary_box" class="columns omega four">
         <%= render :partial => 'summary', :locals => { :order => @order } %>
@@ -32,5 +33,5 @@ Spree.current_order_token = "<%= @order.guest_token %>"
 </script>
 
 <% if I18n.locale != :en %>
-  <script src="<%= assets_prefix %>/jquery.validate/localization/messages_<%= I18n.locale.to_s.downcase.gsub("-", "") %>.js"></script>
+  <%= javascript_include_tag 'jquery.validate/localization/messages_' + I18n.locale.to_s.downcase.gsub('-', '') %>
 <% end %>

data/app/views/spree/products/show.html.erb

@@ -30,7 +30,7 @@
 
         <div id="product-description" data-hook="product_description">
 
-          <h1 class="product-title" itemprop="name"><%= accurate_title %></h1>
+          <h1 class="product-title" itemprop="name"><%= @product.name %></h1>
 
           <div itemprop="description" data-hook="description">
             <%= product_description(@product) rescue Spree.t(:product_has_no_description) %>

data/app/views/spree/shared/_google_analytics.html.erb

@@ -5,7 +5,7 @@
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-    ga('create', '<%= tracker.analytics_id %>','<%= current_store.url.sub(/(^www.)?/,'') %>');
+    ga('create', '<%= tracker.analytics_id %>', 'auto');
     ga('require', 'displayfeatures');
     ga('send', 'pageview');
 
@@ -24,7 +24,7 @@
         ga('ecommerce:addItem', {
           'id': '<%= j @order.number %>',                        // Transaction ID. Required.
           'name': '<%= j line_item.variant.product.name %>',    // Product name. Required.
-          'sku': '<%= j line_item.variant.sku %>',             // SKU/code.
+          'sku': '<%= j (line_item.variant.sku || line_item.variant_id) %>', // SKU/code.
           'category': '',                                     // Category or variation.
           'price': '<%= line_item.price %>',                 // Unit price.
           'quantity': '<%= line_item.quantity %>'           // Quantity.

data/lib/spree/frontend/engine.rb

@@ -7,6 +7,7 @@ module Spree
       initializer "spree.assets.precompile", :group => :all do |app|
         app.config.assets.precompile += %w[
           spree/frontend/all*
+          jquery.validate/localization/messages_*
         ]
       end
 

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

@@ -0,0 +1,23 @@
+/*
+ * 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

@@ -0,0 +1,25 @@
+/*
+ * 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

@@ -0,0 +1,25 @@
+/*
+ * 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

@@ -0,0 +1,25 @@
+/*
+ * 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_ms.js

@@ -0,0 +1,25 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: MS (Malay; Melayu)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "Medan ini diperlukan.",
+		remote: "Sila betulkan medan ini.",
+		email: "Sila masukkan alamat emel yang betul.",
+		url: "Sila masukkan URL yang betul.",
+		date: "Sila masukkan tarikh yang betul.",
+		dateISO: "Sila masukkan tarikh(ISO) yang betul.",
+		number: "Sila masukkan nombor yang betul.",
+		digits: "Sila masukkan nilai digit sahaja.",
+		creditcard: "Sila masukkan nombor kredit kad yang betul.",
+		equalTo: "Sila masukkan nilai yang sama semula.",
+		accept: "Sila masukkan nilai yang telah diterima.",
+		maxlength: $.validator.format("Sila masukkan nilai tidak lebih dari {0} aksara."),
+		minlength: $.validator.format("Sila masukkan nilai sekurang-kurangnya {0} aksara."),
+		rangelength: $.validator.format("Sila masukkan panjang nilai antara {0} dan {1} aksara."),
+		range: $.validator.format("Sila masukkan nilai antara {0} dan {1} aksara."),
+		max: $.validator.format("Sila masukkan nilai yang kurang atau sama dengan {0}."),
+		min: $.validator.format("Sila masukkan nilai yang lebih atau sama dengan {0}.")
+	});
+}(jQuery));

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

@@ -1,30 +1,24 @@
-/**
+/*
  * Translated default messages for the jQuery validation plugin.
- * Language: PT_BR
- * Translator: Francisco Ernesto Teixeira <fco_ernesto@yahoo.com.br>
+ * Locale: PT (Portuguese; português)
+ * Region: BR (Brazil)
  */
-jQuery.extend(jQuery.validator.messages, {
+(function ($) {$.extend($.validator.messages, {
   required: "Este campo &eacute; requerido.",
   remote: "Por favor, corrija este campo.",
   email: "Por favor, forne&ccedil;a um endere&ccedil;o eletr&ocirc;nico v&aacute;lido.",
   url: "Por favor, forne&ccedil;a uma URL v&aacute;lida.",
   date: "Por favor, forne&ccedil;a uma data v&aacute;lida.",
   dateISO: "Por favor, forne&ccedil;a uma data v&aacute;lida (ISO).",
-  dateDE: "Bitte geben Sie ein gültiges Datum ein.",
-  number: "Por favor, forne&ccedil;a um n&uacute;mero v&aacute;lida.",
-  numberDE: "Bitte geben Sie eine Nummer ein.",
+  number: "Por favor, forne&ccedil;a um n&uacute;mero v&aacute;lido.",
   digits: "Por favor, forne&ccedil;a somente d&iacute;gitos.",
   creditcard: "Por favor, forne&ccedil;a um cart&atilde;o de cr&eacute;dito v&aacute;lido.",
   equalTo: "Por favor, forne&ccedil;a o mesmo valor novamente.",
   accept: "Por favor, forne&ccedil;a um valor com uma extens&atilde;o v&aacute;lida.",
-  maxlength: jQuery.validator.format("Por favor, forne&ccedil;a n&atilde;o mais que {0} caracteres."),
-  minlength: jQuery.validator.format("Por favor, forne&ccedil;a ao menos {0} caracteres."),
-  rangelength: jQuery.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1} caracteres de comprimento."),
-  range: jQuery.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1}."),
-  max: jQuery.validator.format("Por favor, forne&ccedil;a um valor menor ou igual a {0}."),
-  min: jQuery.validator.format("Por favor, forne&ccedil;a um valor maior ou igual a {0}.")
-});
-
-jQuery.validator.addMethod("datePTBR", function(value) { 
-  return this.optional(element) || /^\d\d?\/\d\d?\/\d\d\d?\d?$/.test(value); 
-}, "Por favor, forne&ccedil;a uma data v&aacute;lida.");
+  maxlength: $.validator.format("Por favor, forne&ccedil;a n&atilde;o mais que {0} caracteres."),
+  minlength: $.validator.format("Por favor, forne&ccedil;a ao menos {0} caracteres."),
+  rangelength: $.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1} caracteres de comprimento."),
+  range: $.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1}."),
+  max: $.validator.format("Por favor, forne&ccedil;a um valor menor ou igual a {0}."),
+  min: $.validator.format("Por favor, forne&ccedil;a um valor maior ou igual a {0}.")
+});}(jQuery));

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

@@ -1,8 +1,9 @@
-/**
+/*
  * Translated default messages for the jQuery validation plugin.
- * Locale: PT_PT
+ * Locale: PT (Portuguese; português)
+ * Region: PT (Portugal)
  */
-jQuery.extend(jQuery.validator.messages, {
+(function ($) {$.extend($.validator.messages, {
   required: "Campo de preenchimento obrigatório.",
   remote: "Por favor, corrija este campo.",
   email: "Por favor, introduza um endereço eletrónico válido.",
@@ -14,10 +15,10 @@ jQuery.extend(jQuery.validator.messages, {
   creditcard: "Por favor, introduza um número de cartão de crédito válido.",
   equalTo: "Por favor, introduza de novo o mesmo valor.",
   accept: "Por favor, introduza um ficheiro com uma extensão válida.",
-  maxlength: jQuery.validator.format("Por favor, não introduza mais do que {0} caracteres."),
-  minlength: jQuery.validator.format("Por favor, introduza pelo menos {0} caracteres."),
-  rangelength: jQuery.validator.format("Por favor, introduza entre {0} e {1} caracteres."),
-  range: jQuery.validator.format("Por favor, introduza um valor entre {0} e {1}."),
-  max: jQuery.validator.format("Por favor, introduza um valor menor ou igual a {0}."),
-  min: jQuery.validator.format("Por favor, introduza um valor maior ou igual a {0}.")
-});
+  maxlength: $.validator.format("Por favor, não introduza mais do que {0} caracteres."),
+  minlength: $.validator.format("Por favor, introduza pelo menos {0} caracteres."),
+  rangelength: $.validator.format("Por favor, introduza entre {0} e {1} caracteres."),
+  range: $.validator.format("Por favor, introduza um valor entre {0} e {1}."),
+  max: $.validator.format("Por favor, introduza um valor menor ou igual a {0}."),
+  min: $.validator.format("Por favor, introduza um valor maior ou igual a {0}.")
+});}(jQuery));

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

@@ -0,0 +1,25 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Language: SL (Slovenian; slovenski jezik)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "To polje je obvezno.",
+		remote: "Prosimo popravite to polje.",
+		email: "Prosimo vnesite veljaven email naslov.",
+		url: "Prosimo vnesite veljaven URL naslov.",
+		date: "Prosimo vnesite veljaven datum.",
+		dateISO: "Prosimo vnesite veljaven ISO datum.",
+		number: "Prosimo vnesite veljavno število.",
+		digits: "Prosimo vnesite samo števila.",
+		creditcard: "Prosimo vnesite veljavno številko kreditne kartice.",
+		equalTo: "Prosimo ponovno vnesite vrednost.",
+		accept: "Prosimo vnesite vrednost z veljavno končnico.",
+		maxlength: $.validator.format("Prosimo vnesite največ {0} znakov."),
+		minlength: $.validator.format("Prosimo vnesite najmanj {0} znakov."),
+		rangelength: $.validator.format("Prosimo vnesite najmanj {0} in največ {1} znakov."),
+		range: $.validator.format("Prosimo vnesite vrednost med {0} in {1}."),
+		max: $.validator.format("Prosimo vnesite vrednost manjše ali enako {0}."),
+		min: $.validator.format("Prosimo vnesite vrednost večje ali enako {0}.")
+	});
+}(jQuery));

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

@@ -0,0 +1,23 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: SV (Swedish; Svenska)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "Detta fält är obligatoriskt.",
+		maxlength: $.validator.format("Du får ange högst {0} tecken."),
+		minlength: $.validator.format("Du måste ange minst {0} tecken."),
+		rangelength: $.validator.format("Ange minst {0} och max {1} tecken."),
+		email: "Ange en korrekt e-postadress.",
+		url: "Ange en korrekt URL.",
+		date: "Ange ett korrekt datum.",
+		dateISO: "Ange ett korrekt datum (ÅÅÅÅ-MM-DD).",
+		number: "Ange ett korrekt nummer.",
+		digits: "Ange endast siffror.",
+		equalTo: "Ange samma värde igen.",
+		range: $.validator.format("Ange ett värde mellan {0} och {1}."),
+		max: $.validator.format("Ange ett värde som är mindre eller lika med {0}."),
+		min: $.validator.format("Ange ett värde som är större eller lika med {0}."),
+		creditcard: "Ange ett korrekt kreditkortsnummer."
+	});
+}(jQuery));

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

@@ -0,0 +1,25 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: UK (Ukrainian; українська мова)
+ */
+(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_zh.js

@@ -0,0 +1,25 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: ZH (Chinese, 中文 (Zhōngwén), 汉语, 漢語)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "必选字段",
+		remote: "请修正该字段",
+		email: "请输入正确格式的电子邮件",
+		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_zhtw.js

@@ -0,0 +1,26 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: ZH (Chinese; 中文 (Zhōngwén), 汉语, 漢語)
+ * Region: TW (Taiwan)
+ */
+(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));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 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: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc2
+        version: 2.4.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc2
+        version: 2.4.0.rc3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc2
+        version: 2.4.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc2
+        version: 2.4.0.rc3
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -466,24 +466,28 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/messages_ar.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_bg.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ca.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_cn.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_cs.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_da.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_de.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_el.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_es.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_fa.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_fi.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_fr.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ge.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_he.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_hr.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_hu.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_it.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ja.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_ka.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_kk.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ko.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_lt.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_lv.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_ms.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_nl.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_no.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_pl.js
@@ -494,12 +498,16 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/messages_se.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_si.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_sk.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_sl.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_sr.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_sv.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_th.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_tr.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_tw.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ua.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_uk.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_vi.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_zh.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_zhtw.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_de.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_nl.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_pt.js

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

@@ -1,23 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: CN
- */
-jQuery.extend(jQuery.validator.messages, {
-  required: "必选字段",
-  remote: "请修正该字段",
-  email: "请输入正确格式的电子邮件",
-  url: "请输入合法的网址",
-  date: "请输入合法的日期",
-  dateISO: "请输入合法的日期 (ISO).",
-  number: "请输入合法的数字",
-  digits: "只能输入整数",
-  creditcard: "请输入合法的信用卡号",
-  equalTo: "请再次输入相同的值",
-  accept: "请输入拥有合法后缀名的字符串",
-  maxlength: jQuery.validator.format("请输入一个长度最多是 {0} 的字符串"),
-  minlength: jQuery.validator.format("请输入一个长度最少是 {0} 的字符串"),
-  rangelength: jQuery.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"),
-  range: jQuery.validator.format("请输入一个介于 {0} 和 {1} 之间的值"),
-  max: jQuery.validator.format("请输入一个最大为 {0} 的值"),
-  min: jQuery.validator.format("请输入一个最小为 {0} 的值")
-});

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

@@ -1,24 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Language: UA (Ukrainian)
- * Author: maserg <maserg at gmail dot com>
- */
-jQuery.extend(jQuery.validator.messages, {
-  required: "Це поле необхідно заповнити.",
-  remote: "Будь ласка, введіть правильне значення.",
-  email: "Будь ласка, введіть коректну адресу електронної пошти.",
-  url: "Будь ласка, введіть коректний URL.",
-  date: "Будь ласка, введіть коректну дату.",
-  dateISO: "Будь ласка, введіть коректну дату у форматі ISO.",
-  number: "Будь ласка, введіть число.",
-  digits: "Вводите потрібно лише цифри.",
-  creditcard: "Будь ласка, введіть правильний номер кредитної карти.",
-  equalTo: "Будь ласка, введіть таке ж значення ще раз.",
-  accept: "Будь ласка, виберіть файл з правильним розширенням.",
-  maxlength: jQuery.validator.format("Будь ласка, введіть не більше {0} символів."),
-  minlength: jQuery.validator.format("Будь ласка, введіть не менше {0} символів."),
-  rangelength: jQuery.validator.format("Будь ласка, введіть значення довжиною від {0} до {1} символів."),
-  range: jQuery.validator.format("Будь ласка, введіть число від {0} до {1}."),
-  max: jQuery.validator.format("Будь ласка, введіть число, менше або рівно {0}."),
-  min: jQuery.validator.format("Будь ласка, введіть число, більше або рівно {0}.")
-});