spree 0.7.0 → 0.7.1

data/CHANGELOG

@@ -1,3 +1,17 @@
+== 0.7.1
+
+* #298: rake spree:i18n:sync fails on yml files with empty lines
+* #303: "What's This?" CVV link broken
+* #308: Unable to change country for credit card payment (Admin form)
+* #309: Last name of shipping address is wrong field
+* #310: Fixed typo in Tennessee
+* #311: No shipping method can be selected in IE 7
+* #312: Remove assumption that order has shipment (when finalizing the order)
+* #315: state selector failing on IE7 due to "Object not supported" js error
+* #317: gem dependency command does not list all dependencies
+* #314: Refactor checkout steps as partials
+
+
 == 0.7.0
 
 * #	166	- Order numbers should also use permalink

data/app/controllers/admin/creditcard_payments_controller.rb

@@ -34,7 +34,7 @@ class Admin::CreditcardPaymentsController < Admin::BaseController
     creditcard = @creditcard_payment.creditcard
     creditcard.address = @payment_presenter.address
     creditcard.save
-    flash[:notice] = t("Updated Successfully")
+    flash[:notice] = t("updated_successfully")
     redirect_to edit_object_url 
   end
 
@@ -67,7 +67,7 @@ class Admin::CreditcardPaymentsController < Admin::BaseController
   def load_data 
     load_object
     @selected_country_id = params[:payment_presenter][:address_country_id].to_i if params.has_key?('payment_presenter')
-    @selected_country_id ||= @order.creditcards.last.address.country_id unless @order.creditcards.empty?
+    @selected_country_id ||= @order.bill_address.country_id if @order and @order.bill_address
     @selected_country_id ||= Spree::Config[:default_country_id]
  
     @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')  

data/app/controllers/checkout_controller.rb

@@ -1,8 +1,8 @@
 class CheckoutController < Spree::BaseController                 
-  before_filter :stop_monkey_business
+  before_filter :stop_monkey_business, :except => :cvv
   before_filter :require_user_account
-  before_filter :load_data
-  before_filter :build_object, :except => [:new, :create]
+  before_filter :load_data, :except => :cvv
+  before_filter :build_object, :except => [:new, :create, :cvv]
 
   ssl_required :new, :create
 

data/app/models/order.rb

@@ -162,8 +162,12 @@ class Order < ActiveRecord::Base
       OrderMailer.deliver_confirm(self)
     end   
     # finalize order totals 
-    calculator = shipment.shipping_method.shipping_calculator.constantize.new
-    self.ship_amount = calculator.calculate_shipping(shipment) 
+    unless shipment.nil?
+      calculator = shipment.shipping_method.shipping_calculator.constantize.new
+      self.ship_amount = calculator.calculate_shipping(shipment) 
+    else
+      self.ship_amount = 0
+    end
     self.tax_amount = calculate_tax
     save
   end

data/app/views/checkout/_billing.html.erb

@@ -0,0 +1,49 @@
+<h2><%= t("billing_address")%></h2>
+<div class="inner">
+	<p id="bfname">
+		<label for="<%= t("first_name") %>"><%= t("first_name") %></label>
+		<%= f.text_field :bill_address_firstname, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p id="blname">
+		<label for="<%= t("last_name") %>"><%= t("last_name") %></label>
+		<%= f.text_field :bill_address_lastname, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p id="baddress">
+		<label for=""><%= t("street_address") %></label>
+		<%= f.text_field :bill_address_address1, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p id="baddress2">
+		<label for=""><%= t("street_address_2") %></label>
+		<%= f.text_field :bill_address_address2 %>
+	</p>
+	<p id="bcity">
+		<label for=""><%= t("city") %></label>
+		<%= f.text_field :bill_address_city, :class => 'required' -%><span class="req">*</span>
+	</p>                        
+	<p>
+		<label for=""><%= t("state") %></label>
+		<span id="bstate">
+			<%= collection_select("checkout_presenter", 
+			:bill_address_state_id, 
+			@states, 
+			:id, 
+			:name, 
+			{:include_blank => true}, 
+			{:style=> 'width:150px;'}) %>
+		</span>
+		<span class="req">*</span>
+	</p>
+	<p id="bzip">
+		<label for=""><%= t("zip") %></label>
+		<%= f.text_field :bill_address_zipcode, :class => 'required' -%><span class="req">*</span>
+	</p>    
+	<p id="bcountry">
+		<label for=""><%= t("country") %></label>
+		<span id="bcountry"><%= f.collection_select :bill_address_country_id, @countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
+	</p>
+	<p id="bphone">
+		<label for=""><%= t("phone") %></label>
+		<%= f.text_field :bill_address_phone, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p><input id="validate_billing" type="button" value="<%=t("continue")%>"/></p>
+</div>

data/app/views/checkout/_confirm_order.erb

@@ -0,0 +1,9 @@
+<h2><%= t("confirm") %></h2>
+<div class="inner">         
+	<input id="final_answer" name="final_answer" type="hidden">
+	<div id="bdisplay"><img src="/images/ajax_loader.gif" id="bconfirm_loader" /></div>
+	<div id="sdisplay"><img src="/images/ajax_loader.gif" id="sconfirm_loader" /></div>
+	<div class="clear"></div>
+	<%= render :partial => 'shared/order_details', :locals => {:order => @order} -%>
+	<%= submit_tag t('place_order') %>
+</div>

data/app/views/checkout/_form.html.erb

@@ -13,153 +13,21 @@
 
 <%= error_messages_for :checkout_presenter %>
 <div id="billing">
-  <h2><%= t("billing_address")%></h2>
-  <div class="inner">
-  <p id="bfname">
-    <label for="<%= t("first_name") %>"><%= t("first_name") %></label>
-    <%= f.text_field :bill_address_firstname, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p id="blname">
-    <label for="<%= t("last_name") %>"><%= t("last_name") %></label>
-    <%= f.text_field :bill_address_lastname, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p id="baddress">
-    <label for=""><%= t("street_address") %></label>
-    <%= f.text_field :bill_address_address1, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p id="baddress2">
-    <label for=""><%= t("street_address_2") %></label>
-    <%= f.text_field :bill_address_address2 %>
-  </p>
-  <p id="bcity">
-    <label for=""><%= t("city") %></label>
-    <%= f.text_field :bill_address_city, :class => 'required' -%><span class="req">*</span>
-  </p>                        
-  <p>
-    <label for=""><%= t("state") %></label>
-    <span id="bstate">
-      <%= collection_select("checkout_presenter", 
-        :bill_address_state_id, 
-        @states, 
-        :id, 
-        :name, 
-        {:include_blank => true}, 
-        {:style=> 'width:150px;'}) %>
-    </span>
-    <span class="req">*</span>
-  </p>
-  <p id="bzip">
-    <label for=""><%= t("zip") %></label>
-    <%= f.text_field :bill_address_zipcode, :class => 'required' -%><span class="req">*</span>
-  </p>    
-  <p id="bcountry">
-    <label for=""><%= t("country") %></label>
-    <span id="bcountry"><%= f.collection_select :bill_address_country_id, @countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
-  </p>
-  <p id="bphone">
-    <label for=""><%= t("phone") %></label>
-    <%= f.text_field :bill_address_phone, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p><input id="validate_billing" type="button" value="<%=t("continue")%>"/></p>
-  </div>
+  <%= render :partial => 'billing', :locals => {:f => f} %>
 </div>
 
 <div id="shipping" class="checkout_disabled">
-  <h2><%= t("shipping_address")%></h2>
-  <div class="inner">
-  <p><label for="<%= t("use_billing_address") %>" id="use_billing"><%= t("use_billing_address") %></label><input id="checkout_presenter_same_address" name="checkout_presenter_same_address" type="checkbox" /></p> 
-  <p id="sfname">
-      <label for="<%= t("first_name") %>"><%= t("first_name") %></label>
-      <%= f.text_field :ship_address_firstname, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p id="slname">
-    <label for="<%= t("last_name") %>"><%= t("last_name") %></label>
-    <%= f.text_field :ship_address_lastname, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p id="saddress">
-    <label for="<%= t("street_address") %>"><%= t("street_address") %></label>
-    <%= f.text_field :ship_address_address1, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p id="saddress2">
-    <label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label>
-    <%= f.text_field :ship_address_address2 %>
-  </p>
-  <p id="scity">
-    <label for="<%= t("city") %>"><%= t("city") %></label>
-    <%= f.text_field :ship_address_city, :class => 'required' -%><span class="req">*</span>
-  </p>    
-  <p>
-    <label for="<%= t("state") %>"><%= t("state") %></label>
-    <span id="sstate">
-        <%= collection_select("checkout_presenter", 
-          :ship_address_state_id, 
-          @states, 
-          :id, 
-          :name, 
-          {:include_blank => true}, 
-          {:style=> 'width:150px;'}) %>
-    </span>
-    <span class="req">*</span>
-  </p>  
-  <p id="szip">
-    <label for="<%=t ("zip") %>"><%= t("zip") %></label>
-    <%= f.text_field :ship_address_zipcode, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p id="scountry">
-    <label for="<%= t("country") %>"><%= t("country") %></label>
-    <span id="scountry"><%= f.collection_select :ship_address_country_id, @shipping_countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
-  </p>
-  <p id="sphone">
-    <label for="<%= t("phone") %>"><%= t("phone") %></label>
-    <%= f.text_field :ship_address_phone, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p><input id="validate_shipping" type="button" value="<%=t("continue")%>"/></p>
-  </div>
+  <%= render :partial => 'shipping', :locals => {:f => f} %>
 </div>
             
 <div id="shipping_method" class="checkout_disabled">
-  <h2><%= t("shipping_method") %></h2>
-  <div class="inner">
-    <div id="methods"></div>
-    <p><input id="select_shipping_method" type="button" value="<%=t("continue")%>"/></p>
-  </div>  
+  <%= render :partial => 'shipping_method', :locals => {:f => f} %>
 </div>
 
 <div id="creditcard" class="checkout_disabled">
-  <h2><%= t("payment_information") %></h2>
-  <div class="inner">
-  <p>
-    <%= image_tag "creditcard.gif", :id => 'creditcard-image' %>
-  </p>
-  <p>
-    <label for=""><%= t("card_number") %></label>
-    <%= f.text_field :creditcard_number, :size=> 19, :class => 'required' -%><span class="req">*</span>
-  </p>
-  <p>
-    <label for=""><%= t("expiration") %></label>
-    <%= select_month(@date, :prefix => 'checkout_presenter', :field_name => 'creditcard_month', :use_month_numbers => true, :class => 'required') -%>
-    <%= select_year(@date, :prefix => 'checkout_presenter', :field_name => 'creditcard_year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') -%>
-    <span class="req">*</span>
-  </p>
-  <p>
-    <label for=""><%= t("card_code") %></label>
-    <%= f.text_field :creditcard_verification_value, {:style => 'width:40px', :class => 'required'} -%><span class="req">*</span>
-      <a href="" onclick="window.open('/checkout/cvv','mywin','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
-	(<%= t("whats_this") %>)
-      </a>
-  </p>
-  <p><input id="confirm_payment" type="button" value="<%=t("continue")%>"/></p>
-  </div>
+  <%= render :partial => 'payment', :locals => {:f => f} %>
 </div>
 
 <div id="confirm_order" class="checkout_disabled">
-  <h2><%= t("confirm") %></h2>
-  <div class="inner">         
-    <input id="final_answer" name="final_answer" type="hidden">
-    <div id="bdisplay"><img src="/images/ajax_loader.gif" id="bconfirm_loader" /></div>
-    <div id="sdisplay"><img src="/images/ajax_loader.gif" id="sconfirm_loader" /></div>
-    <div class="clear"></div>
-    <%= render :partial => 'shared/order_details', :locals => {:order => @order} -%>
-    <%= submit_tag t('place_order') %>
-  </div>
+  <%= render :partial => 'confirm_order', :locals => {:f => f} %>
 </div>

data/app/views/checkout/_payment.erb

@@ -0,0 +1,24 @@
+<h2><%= t("payment_information") %></h2>
+<div class="inner">
+	<p>
+		<%= image_tag "creditcard.gif", :id => 'creditcard-image' %>
+	</p>
+	<p>
+		<label for=""><%= t("card_number") %></label>
+		<%= f.text_field :creditcard_number, :size=> 19, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p>
+		<label for=""><%= t("expiration") %></label>
+		<%= select_month(@date, :prefix => 'checkout_presenter', :field_name => 'creditcard_month', :use_month_numbers => true, :class => 'required') -%>
+		<%= select_year(@date, :prefix => 'checkout_presenter', :field_name => 'creditcard_year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') -%>
+		<span class="req">*</span>
+	</p>
+	<p>
+		<label for=""><%= t("card_code") %></label>
+		<%= f.text_field :creditcard_verification_value, {:style => 'width:40px', :class => 'required'} -%><span class="req">*</span>
+		<a href="" onclick="window.open('/checkout/cvv','mywin','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
+			(<%= t("whats_this") %>)
+		</a>
+	</p>
+	<p><input id="confirm_payment" type="button" value="<%=t("continue")%>"/></p>
+</div>

data/app/views/checkout/_shipping.html.erb

@@ -0,0 +1,50 @@
+<h2><%= t("shipping_address")%></h2>
+<div class="inner">
+	<p><label for="<%= t("use_billing_address") %>" id="use_billing"><%= t("use_billing_address") %></label><input id="checkout_presenter_same_address" name="checkout_presenter_same_address" type="checkbox" /></p> 
+	<p id="sfname">
+		<label for="<%= t("first_name") %>"><%= t("first_name") %></label>
+		<%= f.text_field :ship_address_firstname, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p id="slname">
+		<label for="<%= t("last_name") %>"><%= t("last_name") %></label>
+		<%= f.text_field :ship_address_lastname, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p id="saddress">
+		<label for="<%= t("street_address") %>"><%= t("street_address") %></label>
+		<%= f.text_field :ship_address_address1, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p id="saddress2">
+		<label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label>
+		<%= f.text_field :ship_address_address2 %>
+	</p>
+	<p id="scity">
+		<label for="<%= t("city") %>"><%= t("city") %></label>
+		<%= f.text_field :ship_address_city, :class => 'required' -%><span class="req">*</span>
+	</p>    
+	<p>
+		<label for="<%= t("state") %>"><%= t("state") %></label>
+		<span id="sstate">
+			<%= collection_select("checkout_presenter", 
+			:ship_address_state_id, 
+			@states, 
+			:id, 
+			:name, 
+			{:include_blank => true}, 
+			{:style=> 'width:150px;'}) %>
+		</span>
+		<span class="req">*</span>
+	</p>  
+	<p id="szip">
+		<label for="<%=t ("zip") %>"><%= t("zip") %></label>
+		<%= f.text_field :ship_address_zipcode, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p id="scountry">
+		<label for="<%= t("country") %>"><%= t("country") %></label>
+		<span id="scountry"><%= f.collection_select :ship_address_country_id, @shipping_countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
+	</p>
+	<p id="sphone">
+		<label for="<%= t("phone") %>"><%= t("phone") %></label>
+		<%= f.text_field :ship_address_phone, :class => 'required' -%><span class="req">*</span>
+	</p>
+	<p><input id="validate_shipping" type="button" value="<%=t("continue")%>"/></p>
+</div>

data/app/views/checkout/_shipping_method.html.erb

@@ -0,0 +1,5 @@
+<h2><%= t("shipping_method") %></h2>
+<div class="inner">
+	<div id="methods"></div>
+	<p><input id="select_shipping_method" type="button" value="<%=t("continue")%>"/></p>
+</div>

data/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.7.0' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.7.1' unless defined? SPREE_GEM_VERSION
           
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/config/locales/de.yml

@@ -437,7 +437,9 @@ de:
   tree: Baum
   try_again: "Erneut versuchen"
   type: Typ
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
   update: Speichern
   updated_successfully: "Erfolgreich aktualisiert"
   use_as_shipping_address: Use as Shipping Address

data/config/locales/en-GB.yml

@@ -437,7 +437,9 @@ en-GB:
   tree: Tree
   try_again: "Try Again"
   type: Type
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
   update: Update
   updated_successfully:
   use_as_shipping_address: Use as Shipping Address

data/config/locales/es.yml

@@ -437,7 +437,9 @@ es:
   tree: Tree
   try_again: "Volver a intentar"
   type: Tipo
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
   update: Actualizar
   updated_successfully:
   use_as_shipping_address: Use as Shipping Address

data/config/locales/fr-FR.yml

@@ -1,5 +1,5 @@
 --- 
-fr-FR:
+fr-FR: 
   a_copy_of_all_mail_will_be_sent_to_the_following_addresses: Une copie du courrier sera envoyé aux adresses suivantes
   abbreviation: Abréviation
   access_denied: "Accès interdit"
@@ -235,6 +235,7 @@ fr-FR:
   error: erreur
   event: Evenements
   existing_customer: "Client existant"
+  expiration: Expiration
   expiration_month: "Mois d'expiration"
   expiration_year: "Année d'expiration"
   extension: Prolongation
@@ -341,6 +342,7 @@ fr-FR:
   payment_information: "Information sur le paiement"
   payments: Paiements
   phone: Téléphone
+  place_order: Place Order        
   presentation: Presentation
   previous: Précédent
   price: Prix
@@ -435,9 +437,13 @@ fr-FR:
   tree: Arborescence
   try_again: "Reessayer"
   type: Type
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Impossible de récupérer votre carte de crédit"
+  unable_to_save_order: "Unable to Save Order"
   update: Mise à jour
   updated_successfully: "Mise à jour effectuée avec succès"
+  use_as_shipping_address: Use as Shipping Address
+  use_billing_address: Use Billing Address
   use_different_shipping_address: "Utiliser une adresse de facturation différente"
   user: Utilisateur
   user_account: Compte utilisateur
@@ -459,5 +465,3 @@ fr-FR:
   zone_based: "Zone de base"
   zone_setting_description: "Liste des pays, régions ou autre zone, utilisé dans plusieurs calcul."
   zones: Zones
-
-  

data/config/locales/it.yml

@@ -437,7 +437,9 @@ it:
   tree: Tree
   try_again: Riprova
   type: Tipo
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
   update: Salva
   updated_successfully:
   use_as_shipping_address: Use as Shipping Address

data/config/locales/nb-NO.yml

@@ -455,3 +455,470 @@ nb-NO:
   zone_based: "Soner"
   zone_setting_description: "Liste over land, stater og andre soner som brukes i diverse beregninger."
   zones: Soner
+
+nb-NO: 
+  a_copy_of_all_mail_will_be_sent_to_the_following_addresses: A copy of all mail be sent to the following addresses
+  abbreviation: Abbreviation
+  access_denied: "Access Denied"
+  account: Account
+  action: Action
+  actions: 
+    cancel: Cancel
+    create: Create
+    destroy: Destroy
+    list: List
+    listing: Listing
+    new: New
+    update: Update
+  activerecord: 
+    attributes: 
+      address: 
+        address1: Address
+        address2: "Address (contd.)"
+        city: City
+        firstname: "First Name"
+        lastname: "Last Name"
+        phone: Phone
+        zipcode: "Zip Code"
+      country: 
+        iso: ISO
+        iso3: ISO3
+        iso_name: "ISO Name"
+        name: Name
+        numcode: "ISO Code"
+      creditcard: 
+        cc_type: Type
+        month: Month
+        number: Number
+        verification_value: "Verification Value"
+        year: Year
+      inventory_unit: 
+        state: State
+      line_item: 
+        price: Price
+        quantity: Quantity
+      order: 
+        checkout_complete: "Checkout Complete"
+        ip_address: "IP Address"
+        item_total: "Item Total"
+        number: Number
+        ship_amount: "Ship Amount"
+        special_instructions: "Special Instructions"
+        state: State
+        tax_amount: "Tax Amount"
+        total: Total
+      product: 
+        available_on: "Available On"
+        description: Description
+        master_price: "Master Price"
+        name: Name
+        on_hand: "On Hand"
+      property: 
+        name: Name
+        presentation: Presentation
+      prototype: 
+        name: Name
+      role: 
+        name: Name
+      state: 
+        abbr: Abbreviation
+        name: Name
+      taxon: 
+        name: Name
+        permalink: Permalink
+        position: Position
+      taxonomy: 
+        name: Name
+      user: 
+        email: Email
+      variant: 
+        depth: Depth
+        height: Height
+        price: Price
+        sku: SKU
+        weight: Weight
+        width: Width
+      zone: 
+        description: Description
+        name: Name
+    models: 
+      address: 
+        one: Address
+        other: Addresses
+      country: 
+        one: Country
+        other: Countries
+      creditcard: 
+        one: "Credit Card"
+        other: "Credit Cards"
+      creditcard_payment: 
+        one: "Credit Card Payment"
+        other: "Credit Card Payments"
+      creditcard_txn: 
+        one: "Credit Card Transaction"
+        other: "Credit Card Transactions"
+      inventory_unit: 
+        one: "Inventory Unit"
+        other: "Inventory Units"
+      line_item: 
+        one: "Line Item"
+        other: "Line Items"
+      order: 
+        one: Order
+        other: Orders
+      payment: 
+        one: Payment
+        other: Payments
+      product: 
+        one: Product
+        other: Products
+      property: 
+        one: Property
+        other: Properties
+      prototype: 
+        one: Prototype
+        other: Prototypes
+      role: 
+        one: Roles
+        other: Roles
+      state: 
+        one: State
+        other: States
+      taxon: 
+        one: Taxon
+        other: Taxons
+      taxonomy: 
+        one: Taxonomy
+        other: Taxonomies
+      user: 
+        one: User
+        other: Users
+      variant: 
+        one: Variant
+        other: Variants
+      zone: 
+        one: Zone
+        other: Zones
+  add: Add
+  add_category: "Add Category"
+  add_country: "Add Country"
+  add_option_type: "Add Option Type"
+  add_option_types: "Add Option Types"
+  add_option_value: "Add Option Value"
+  add_product_properties: "Add Product Properties"
+  add_state: "Add State"
+  add_to_cart: "Add To Cart"
+  add_zone: "Add Zone"
+  address: Address
+  address_information: "Address Information"
+  adjustment: Adjustment
+  administration: Administration
+  allow_backorders: "Allow Backorders"
+  allow_ssl_to_be_used_when_in_developement_and_test_modes: Allow SSL to be used when in development and test modes
+  allow_ssl_to_be_used_when_in_production_mode: Allow SSL to be used in production mode         
+  amount: Amount
+  are_you_sure: "Are you sure"
+  are_you_sure_category: "Are you sure you want to delete this category?"
+  are_you_sure_delete: "Are you sure you want to delete this record?"
+  are_you_sure_delete_image: "Are you sure you want to delete this image?"
+  are_you_sure_option_type: "Are you sure you want to delete this option type?"
+  are_you_sure_you_want_to_capture: "Are you sure you want to capture?"
+  assign_taxon: "Assign Taxon"
+  assign_taxons: "Assign Taxons"
+  authorization_failure: "Authorization Failure"
+  authorized: Authorized
+  available_on: "Available On"
+  available_taxons: "Available Taxons"
+  back: Back
+  back_to_store: "Go Back To Store"
+  bill_address: "Bill Address"
+  billing_address: "Billing Address"
+  cancel: cancel
+  canceled: Canceled
+  capture: capture
+  card_code: "Card Code"
+  card_number: "Card Number"
+  cart: Cart
+  categories: Categories
+  category: Category
+  change: Change
+  change_language: "Change Language"
+  charged: Charged
+  checkout: Checkout
+  city: City
+  comp_order: "Comp Order"
+  comp_order_confirmation: "Customer will not be charged.  Are you sure you want to comp this order?"
+  configuration: Configuration
+  configuration_options: "Configuration Options"
+  configurations: Configurations
+  confirm: Confirm
+  confirm_password: "Password Confirmation"
+  continue: Continue
+  continue_shopping: "Continue shopping"
+  copy_all_mails_to: Copy All Mails To                                                                             
+  country: Country
+  country_based: "Country Based"
+  create: Create
+  create_a_new_account: "Create a new account"
+  created_successfully: "Created Successfully"
+  credit_card: "Credit Card"
+  credit_card_capture_complete: "Credit Card Was Captured"
+  credit_card_payment: "Credit Card Payment"
+  creditcard: Creditcard
+  current: Current
+  customer: Customer
+  date_range: "Date Range"
+  delete: Delete
+  depth: Depth
+  description: Description
+  destroy: Destroy
+  display: Display
+  edit: Edit
+  editing_category: "Editing Category"
+  editing_option_type: "Editing Option Type"
+  editing_option_types: "Editing Option Types"
+  editing_product: "Editing Product"
+  editing_property: "Editing Property"
+  editing_prototype: "Editing Prototype"
+  editing_state: "Editing State"
+  editing_tax_category: "Editing Tax Category"
+  editing_user: "Editing User"   
+  editing_zone: "Editing Zone"
+  email: Email
+  email_address: "Email Address"
+  email_server_settings_description: "Set email server settings."
+  empty_cart: "Empty Cart"
+  enable_mail_delivery: Enable Mail Delivery      
+  error: error
+  event: Event
+  existing_customer: "Existing Customer"
+  expiration: Expiration
+  expiration_month: "Expiration Month"
+  expiration_year: "Expiration Year"
+  extension: Extension
+  extensions: Extensions
+  filename: Filename
+  final_confirmation: "Final Confirmation"
+  first_name: "First Name"
+  gateway: Gateway
+  gateway_error: "Gateway Error"
+  gateway_setting_description: "Select a payment gateway and configure its settings."
+  general_settings: "General Settings"
+  general_settings_description: "Configure general Spree settings."
+  google_analytics: "Google Analytics"
+  google_analytics_active: "Active"
+  google_analytics_create: "Create New Google Analytics Account"
+  google_analytics_id: "Analytics ID"
+  google_analytics_new: "New Google Analytics Account"
+  google_analytics_setting_description: "Manage Google Analytics ID" 
+  height: Height
+  hello_user: "Hello User"
+  image: Image
+  images: Images
+  in_progress: "In Progress"
+  invalid_search: "Invalid search criteria."
+  inventory: Inventory
+  inventory_adjustment: "Inventory Adjustment"
+  inventory_setting_description: "Inventory Configuration, Backordering, Zero-Stock Display"
+  inventory_settings: "Inventory Settings"
+  item: Item
+  item_description: "Item Description"
+  item_total: "Item Total"
+  last_name: "Last Name"
+  list: List
+  listing_categories: "Listing Categories"
+  listing_option_types: "Listing Option Types"
+  listing_orders: "Listing Orders"
+  listing_reports: "Listing Reports"
+  listing_tax_categories: "Listing Tax Categories"
+  listing_users: "Listing Users"
+  locale_changed: "Locale Changed"
+  log_in: "Log In"
+  logged_in_as: "Logged in as"
+  login_name: Login
+  logout: Logout
+  mail_delivery_enabled: "Mail delivery is enabled"
+  mail_delivery_not_enabled: "Mail delivery is not enabled"
+  mail_server_preferences: Mail Server Preferences
+  mail_server_settings: "Mail Server Settings"
+  master_price: "Master Price"
+  my_account: "My Account"
+  my_orders: "My Orders"    
+  name: Name
+  new: New
+  new_category: "New category"
+  new_credit_card_payment: "New Credit Card Payment"
+  new_customer: "New Customer"
+  new_image: "New Image"
+  new_option_type: "New Option Type"
+  new_option_value: "New Option Value"
+  new_product: "New Product"
+  new_property: "New Property"
+  new_prototype: "New Prototype"
+  new_shipment: "New Shipment"
+  new_state: "New State"
+  new_tax_category: "New Tax Category"
+  new_tax_rate: "New Tax Rate"
+  new_taxonomy: "New Taxonomy"
+  new_user: "New User"
+  new_variant: "New Variant"
+  new_zone: "New Zone"
+  next: Next
+  no_items_in_cart: ""
+  no_match_found: "No Match Found"
+  none: None
+  none_available: "None Available"
+  on_hand: "On Hand"
+  operation: Operation
+  option_Values: "Option Values"
+  option_types: "Option Types"
+  option_values: "Option Values"
+  options: Options
+  or: or
+  order: Order
+  order_confirmation_note: ""
+  order_date: "Order Date"
+  order_details: "Order Details"
+  order_email_resent: "Order Email Resent"
+  order_number: Order
+  order_operation_authorize: Authorize
+  order_processed_successfully: "Your order has been processed successfully"
+  order_total: "Order Total"
+  order_total_message: "The total amount charged to your card will be"
+  order_updated: "Order Updated"
+  orders: Orders
+  out_of_stock: "Out of Stock"
+  overview: Overview
+  paid: Paid
+  parent_category: "Parent Category"
+  password: Password
+  path: Path      
+  pay: pay
+  payment: Payment
+  payment_gateway: "Payment Gateway"
+  payment_information: "Payment Information"
+  payments: Payments
+  phone: Phone
+  place_order: Place Order        
+  presentation: Presentation
+  previous: Previous
+  price: Price
+  problem_authorizing_card: "Problem authorizing credit card"
+  problem_capturing_card: "Problem capturing credit card"
+  problems_processing_order: "We had problems processing your order"
+  process: Process
+  product: Product
+  product_details: "Product Details"
+  product_properties: "Product Properties"
+  products: Products
+  properties: Properties
+  property: Property
+  prototypes: Prototypes
+  qty: Qty
+  rate: Rate
+  remember_me: "Remember me"
+  remove: Remove
+  reports: Reports
+  resend: Resend
+  response_code: "Response Code"  
+  resume: "resume"
+  resumed: Resumed
+  return: return
+  returned: Returned
+  roles: Roles
+  sales_total: "Sales Total"
+  sales_total_for_all_orders: "Sales total for all orders"
+  sales_totals: "Sales Totals"
+  sales_totals_description: "Sales Total For All Orders"
+  save_preferences: Save Preferences           
+  search: Search
+  secure_connection_type: Secure Connection Type
+  select: Select
+  select_from_prototype: "Select From Prototype"
+  send_copy_of_all_mails_to: Send Copy of All Mails To
+  send_copy_of_orders_mails_to: Send Copy of Order Mails To         
+  send_mails_as: Send Mails As                    
+  send_order_mails_as: Send Order Mails As   
+  ship: ship
+  ship_address: "Ship Address"
+  shipment: Shipment
+  shipped: Shipped
+  shipping: Shipping
+  shipping_address: "Shipping Address"
+  shipping_error: "Shipping Error"
+  shipping_method: "Shipping Method"
+  shipping_total: "Shipping Total"
+  shopping_cart: "Shopping Cart"
+  show_deleted: "Show Deleted"
+  show_incomplete_orders: "Show Incomplete Orders"
+  show_only_complete_orders: "Only show complete orders"
+  show_out_of_stock_products: "Show out-of-stock products"
+  sign_up: "Sign up"
+  sku: SKU
+  smtp_authentication_type: SMTP Authentication Type         
+  smtp_domain: SMTP Domain
+  smtp_mail_host: SMTP Mail Host                       
+  smtp_password: SMTP Password
+  smtp_port: SMTP Port          
+  smtp_username: SMTP Username  
+  spree:
+    date: Date
+    time: Time                                               
+  start: Start
+  state: State
+  state_based: "State Based"
+  state_setting_description: "Administer the list of states/provinces associated with each country."
+  states: States
+  status: Status
+  stop: Stop
+  store: Store
+  street_address: "Street Address"
+  street_address_2: "Street Address (cont'd)"
+  subtotal: Subtotal
+  subtract: Subtract
+  system: System
+  tax: Tax
+  tax_categories: "Tax Categories"
+  tax_categories_setting_description: "Set up tax categories to identify which products should be taxable."
+  tax_category: "Tax Category"
+  tax_total: "Tax Total"
+  tax_type: "Tax Type"
+  taxon: Taxon
+  taxonomies: Taxonomies
+  taxonomies_setting_description: "Create and manage taxonomies"
+  taxons: Taxons
+  thank_you_for_your_order: "Thank you for your business.  Please print out a copy of this confirmation page for your records."
+  this_file_language: "English (US)"
+  total: Total
+  transaction: Transaction
+  tree: Tree
+  try_again: "Try Again"
+  type: Type
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
+  unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
+  update: Update
+  updated_successfully: "Updated Successfully"                    
+  use_as_shipping_address: Use as Shipping Address
+  use_billing_address: Use Billing Address
+  use_different_shipping_address: "Use Different Shipping Address"
+  user: User
+  user_account: User Account
+  user_details: "User Details"
+  users: Users
+  value: Value
+  variants: Variants
+  version: Version
+  website: Website
+  weight: Weight
+  welcome_to_sample_store: "Welcome to the sample store"
+  what_is_a_cvv: "What is a (CVV) Credit Card Code?"
+  what_is_this: "What's This?"
+  whats_this: "What's this"
+  width: Width
+  your_cart_is_empty: "Your cart is empty"
+  zip: Zip
+  zone: Zone
+  zone_based: "Zone Based"
+  zone_setting_description: "Collections of countries, states or other zones to be used in various calculations."
+  zones: Zones  

data/config/locales/pl.yml

@@ -437,7 +437,9 @@ pl:
   tree: Tree
   try_again: "Spróbuj ponownie"
   type: Typ
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
   update: Aktualizuj
   updated_successfully:
   use_as_shipping_address: Use as Shipping Address

data/config/locales/pt-BR.yml

@@ -437,7 +437,9 @@ pt-BR:
   tree: Tree
   try_again: "Tente novamente"
   type: Tipo
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
   update: Atualizar
   updated_successfully:
   use_as_shipping_address: Use as Shipping Address

data/config/locales/pt-PT.yml

@@ -437,7 +437,9 @@ pt-PT:
   tree: Árvore
   try_again: "Tente de novo"
   type: Tipo
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
   update: Actualizar
   updated_successfully: Actualizado com sucesso
   use_as_shipping_address: Use as Shipping Address

data/config/locales/ru-RU.yml

@@ -1,5 +1,5 @@
 ---
-ru-RU:
+ru-RU: 
   a_copy_of_all_mail_will_be_sent_to_the_following_addresses: Копии всех писем будут отосланы на следующие адреса
   abbreviation: Аббревиатура
   access_denied: "Доступ запрещен"
@@ -207,6 +207,7 @@ ru-RU:
   credit_card: "Кредитная карта"
   credit_card_capture_complete: "Credit Card Was Captured ??"
   credit_card_payment: "Платеж крелитной картой"
+  creditcard: Creditcard
   current: Текущий
   customer: Пользователь
   date_range: "Период времени"
@@ -234,6 +235,7 @@ ru-RU:
   error: ошибка
   event: Событие
   existing_customer: "Для зарегистрированных пользователей"
+  expiration: Expiration
   expiration_month: "Месяц экспирации ??"
   expiration_year: "Год экспирации ??"
   extension: Расширение
@@ -340,6 +342,7 @@ ru-RU:
   payment_information: "Информация о платеже"
   payments: Платежи
   phone: Телефон
+  place_order: Place Order        
   presentation: Презентация ??
   previous: предыдущий
   price: Цена
@@ -391,6 +394,7 @@ ru-RU:
   shopping_cart: "Корзина"
   show_deleted: "Показать удаленные"
   show_incomplete_orders: "Показать необработанные заказы"
+  show_only_complete_orders: "Only show complete orders"
   show_out_of_stock_products: "Показать продукты, которых нет в наличии"
   sign_up: "Регистрация"
   sku: SKU
@@ -433,11 +437,16 @@ ru-RU:
   tree: Дерево
   try_again: "Попробуйте еще раз"
   type: Тип
+  unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_save_order: "Unable to Save Order"
   update: Изменить
   updated_successfully: "Успешна изменена"
+  use_as_shipping_address: Use as Shipping Address
+  use_billing_address: Use Billing Address
   use_different_shipping_address: "использовать другой адрес доставки"
   user: Пользователь
+  user_account: User Account
   user_details: "Дополнительно"
   users: Пользователи
   value: Значение

data/db/sample/states.yml

@@ -167,7 +167,7 @@ south_dakota:
   abbr: SD
   country_id: 214
 tennesse:
-  name: Tennesse
+  name: Tennessee
   abbr: TN
   country_id: 214
 texas:
@@ -201,4 +201,4 @@ wisconsin:
 wyoming:
   name: Wyoming
   abbr: WY
-  country_id: 214
+  country_id: 214

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '7'
-      Tiny  = '0'
+      Tiny  = '1'
 
       class << self
         def to_s

data/lib/tasks/release.rake

@@ -31,7 +31,11 @@ namespace 'spree' do
     s.bindir = 'bin'
     s.executables = ['spree']
     s.add_dependency 'rake', '>= 0.7.1'
-    s.add_dependency 'highline', '>=1.4.0'
+    s.add_dependency 'highline', '= 1.4.0'
+    s.add_dependency 'rails', '= 2.2.2'
+    s.add_dependency 'activemerchant', '>= 1.4.1'
+    s.add_dependency 'activerecord-tableless', '>= 0.1.0'
+    s.add_dependency 'tlsmail', '>= 0.0.1'
     s.has_rdoc = true
     #s.rdoc_options << '--title' << RDOC_TITLE << '--line-numbers' << '--main' << 'README'
     rdoc_excludes = Dir["**"].reject { |f| !File.directory? f }

data/lib/tasks/translation.rake

@@ -45,6 +45,7 @@ def create_hash(data, basename)
   parent = Array.new
   previous_key = 'base'
   data.split("\n").each do |w|
+    next if w.strip.blank?
     (key, value) = w.split(':')
     value ||= ''
     shift = (key =~ /\w/)/2 - parent.size                             #Determine level of current key in comparison to parent array

data/public/javascripts/checkout.js

@@ -1,24 +1,13 @@
 var regions = new Array('billing', 'shipping', 'shipping_method', 'creditcard', 'confirm_order');
 
+/*
 $(document).ajaxSend(function(event, request, settings) {
   if (typeof(AUTH_TOKEN) == "undefined") return;
   // settings.data is a serialized string like "foo=bar&baz=boink" (or null)
   settings.data = settings.data || "";
   settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
 });
-
-// public/javascripts/application.js
-jQuery.ajaxSetup({ 
-  'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript")}
-})
-
-jQuery.fn.submitWithAjax = function() {
-  this.change(function() {
-    $.post('select_country', $(this).serialize(), null, "script");
-    return false;
-  })
-  return this;
-};
+*/
 
 jQuery.fn.sameAddress = function() {
   this.click(function() {
@@ -36,12 +25,10 @@ jQuery.fn.sameAddress = function() {
 
 //On page load
 $(function() {  
-  //$("#checkout_presenter_bill_address_country_id").submitWithAjax();  
   $('#checkout_presenter_same_address').sameAddress();
   $('span#bcountry select').change(function() { update_state('b'); });
   $('span#scountry select').change(function() { update_state('s'); });
   get_states();
-
   $('#validate_billing').click(function() { if(validate_section('billing')) { submit_billing(); }});
   $('#validate_shipping').click(function() { if(validate_section('shipping')) { submit_shipping(); }});
   $('#select_shipping_method').click(function() { submit_shipping_method(); });  
@@ -88,7 +75,6 @@ var chg_state_input_element = function (parent, html) {
 
 // TODO: better as sibling dummy state ?
 // Update the input method for address.state 
-//
 var update_state = function(region) {
   var country        = $('span#' + region + 'country :only-child').val();
   var states         = state_mapper[country];
@@ -123,7 +109,6 @@ var update_state = function(region) {
   });
 };
 
-
 var validate_section = function(region) {
   var validator = $('form#checkout_form').validate();
   var valid = true;
@@ -173,7 +158,7 @@ var submit_billing = function() {
 
 var build_address = function(title, region) {
   var address = '<h3>' + title + '</h3>';
-  address += $('p#' + region + 'fname input').val() + ' ' + $('p#blname input').val() + '<br />';
+  address += $('p#' + region + 'fname input').val() + ' ' + $('p#' + region + 'lname input').val() + '<br />';
   address += $('p#' + region + 'address input').val() + '<br />';
   if($('p#' + region + 'address2').val() != '') {
     address += $('p#' + region + 'address2').val() + '<br />';
@@ -255,18 +240,21 @@ var update_shipping_methods = function(methods) {
     $('div$methods img#shipping_loader').remove();
     var p = document.createElement('p');
     var s = this.name + ' ' + this.rate;
-    $(p).append($(document.createElement('input'))
-                .attr('id', s)
+    var i = $(document.createElement('input'))
+                .attr('id', this.id)
                 .attr('type', 'radio')
                 .attr('name', 'method_id')
-                .attr(1 == $(methods).length ? 'checked' : 'notchecked', 'foo')
                 .val(this.id)
-                );
-    $(p).append($(document.createElement('label'))
+                .click(function() { $('div#methods input').attr('checked', ''); $(this).attr('checked', 'checked'); });
+    if($(methods.length) == 1) {
+      i.attr('checked', 'checked');
+    }
+    var l = $(document.createElement('label'))
                 .attr('for', s)
                 .html(s)
-                .css('top', '-1px'));
-    $('div#methods').append(p);
+                .css('top', '-1px')
+                .css('width', '300px');
+    $('div#methods').append($(p).append(i).append(l));
   });
   $('div#methods input:first').attr('validate', 'required:true');
   return;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-10 00:00:00 -04:00
+date: 2009-03-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,50 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.4.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.2.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activemerchant
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord-tableless
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: tlsmail
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.1
+    version: 
 description: "Spree is a complete commerce solution designed for use by experienced Rails developers. No solution can possibly solve everyone\xE2\x80\x99s needs perfectly. There are simply too many ways that people do business for us to model them all specifically. Rather then come up short (like so many projects before it), Spree\xE2\x80\x99s approach is to simply accept this and not even try. Instead Spree tries to focus on solving the 90% of the problem that most commerce projects face and anticipate that the other 10% will need to be addressed by the end developer familiar with the client\xE2\x80\x99s exact business requirements."
 email: sean.schofield@gmail.com
 executables: 
@@ -270,11 +310,17 @@ files:
 - app/views/admin/zones/new.html.erb
 - app/views/admin/zones/show.html.erb
 - app/views/checkout
+- app/views/checkout/_billing.html.erb
+- app/views/checkout/_confirm_order.erb
 - app/views/checkout/_form.html.erb
+- app/views/checkout/_payment.erb
+- app/views/checkout/_shipping.html.erb
+- app/views/checkout/_shipping_method.html.erb
 - app/views/checkout/cvv.html.erb
 - app/views/checkout/new.html.erb
 - app/views/countries
 - app/views/countries/index.js.erb
+- app/views/creditcards
 - app/views/layouts
 - app/views/layouts/admin.html.erb
 - app/views/layouts/application.html.erb
@@ -1685,6 +1731,8 @@ files:
 - vendor/extensions/shipping/app/views/admin/shipping_methods/edit.html.erb
 - vendor/extensions/shipping/app/views/admin/shipping_methods/index.html.erb
 - vendor/extensions/shipping/app/views/admin/shipping_methods/new.html.erb
+- vendor/extensions/shipping/app/views/orders
+- vendor/extensions/shipping/app/views/shipments
 - vendor/extensions/shipping/config
 - vendor/extensions/shipping/config/locales
 - vendor/extensions/shipping/config/locales/de.yml
@@ -2164,8 +2212,6 @@ files:
 - vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_test.rb
 - vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stick_test.rb
 - vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stone_test.rb
-- vendor/plugins/has_many_polymorphs/test/integration/app/vendor
-- vendor/plugins/has_many_polymorphs/test/integration/app/vendor/plugins
 - vendor/plugins/has_many_polymorphs/test/integration/server_test.rb
 - vendor/plugins/has_many_polymorphs/test/models
 - vendor/plugins/has_many_polymorphs/test/models/aquatic