effective_addresses 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04c90ea7c4568fe3c95ea6a070d0c45f6a836dc7
-  data.tar.gz: a181edd95b89dcf31e12605e1f2b5628fc962d9c
+  metadata.gz: 41c69251c76730e7fe6cf466b4d892e39cdc9569
+  data.tar.gz: 9561541536799e5f8f4d3fab9a8f23390c9d45d5
 SHA512:
-  metadata.gz: 4d3a90340426b5addcffce1161dae0399a37fd3bbe7583636dceef0ef8093957698a0ac75268739404009350c62d10de7ca9ef6701bacb18a95bd07282be400e
-  data.tar.gz: 59a4afb5daee0c48aec5d2e25d3ce94263a629a67894824fb240b61dc923f64241ab821285b3726bc96e4a57c556b00aa3b195287fbd2f142e2b1cf3f7340367
+  metadata.gz: f135e6e8b0d6512f62df507af47590ca7b7aa2ab9a1960337afac042809b94099c025731542b698c342c9fd4c0f3eacc4e3041a1b5a33fbcfabae9160a6f0a14
+  data.tar.gz: 4e49543e8691690ac0978dc2ae5b15dd0427c6450769f2660f0b7c4c982e9addb856495918c4b5d9c4173b68a3d01145e2d22868422671a769ed893ab838eb06

data/app/helpers/effective_addresses_helper.rb

@@ -40,7 +40,7 @@ module EffectiveAddressesHelper
       collection.insert(0, ['---------------------', '', :disabled])
 
       EffectiveAddresses.country_codes_priority.reverse.each do |code|
-        if (country = countries.coded(code))
+        if (country = Carmen::Country.coded(code))
           collection.insert(0, [country.name, country.code])
         end
       end

data/app/views/effective/addresses/_address_fields_simple_form.html.haml

@@ -6,17 +6,18 @@
     - fa.object.errors.add(:address1, f.object.errors[method].first)
 
   - if use_full_name || fa.object.errors.include?(:full_name)
-    = fa.input :full_name, :required => required, :label => 'Full name', :placeholder => 'Full name'
+    = fa.input :full_name, :required => required
 
-  = fa.input :address1, :placeholder => 'Address', :label => 'Address 1', :required => required
-  = fa.input :address2, :label => 'Address 2'
-  = fa.input :city, :placeholder => 'City', :required => required
 
-  = fa.input :country_code, :as => :select, :label => 'Country', :prompt => 'Choose country...', :collection => region_options_for_simple_form_select(), :input_html => {'data-effective-address-country' => uuid}, :required => required
+  = fa.input :address1, :required => required
+  = fa.input :address2
+  = fa.input :city, :required => required
+
+  = fa.input :country_code, :as => :select, :collection => region_options_for_simple_form_select(), :input_html => {'data-effective-address-country' => uuid}, :required => required
 
   - if fa.object.try(:country_code).present?
-    = fa.input :state_code, :as => :select, :label => 'Province / State', :prompt => 'Please choose a country first', :collection => region_options_for_simple_form_select(Carmen::Country.coded(fa.object.country_code).subregions), :input_html => {'data-effective-address-state' => uuid}, :required => required
+    = fa.input :state_code, :as => :select, :collection => region_options_for_simple_form_select(Carmen::Country.coded(fa.object.country_code).subregions), :input_html => {'data-effective-address-state' => uuid}, :required => required
   - else
-    = fa.input :state_code, :as => :select, :label => 'Province / State', :disabled => true, :prompt => 'Please choose a country', :collection => [], :input_html => { 'data-effective-address-state' => uuid }, :required => required
+    = fa.input :state_code, :as => :select, :disabled => true, :collection => [], :input_html => { 'data-effective-address-state' => uuid }, :required => required
 
-  = fa.input :postal_code, :label => 'Postal / Zip code', :placeholder => 'Postal / Zip code', :required => required
+  = fa.input :postal_code, :required => required

data/config/locales/simple_form.en.yml

@@ -0,0 +1,25 @@
+en:
+  simple_form:
+    labels:
+      defaults:
+        full_name: Full name
+        address1: Address 1
+        address2: Address 2
+        country_code: Country
+        state_code: Province / State
+        postal_code: Postal / Zip code
+
+#    hints:
+#      defaults:
+
+    placeholders:
+      defaults:
+        full_name: Full name
+        address1: Address
+        city: City
+        postal_code: Postal / Zip code
+
+    prompts:
+      defaults:
+        country_code: Choose country...
+        state_code: Please choose a country first

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.2.3'.freeze
+  VERSION = '1.2.4'.freeze
 end

data/lib/generators/templates/effective_addresses.rb

@@ -11,7 +11,7 @@ EffectiveAddresses.setup do |config|
   #config.country_codes = ['US', 'CA'] # Or you can be more selective...
 
   # Select these countries ontop of the others
-  config.country_codes_priority = ['US', 'CA'] # Leave empty array for no priority countries
+  config.country_codes_priority = ['US', 'CA'] # nil for no priority countries
 
   # Preselect this country on any new address forms
   # Valid values are: country code, country name, or nil

data/spec/dummy/config/initializers/effective_addresses.rb

@@ -8,7 +8,7 @@ EffectiveAddresses.setup do |config|
 
   # Country codes to display in country_select dropdowns.
   config.country_codes = :all #
-  config.country_codes_priority = ['US', 'CA'] # Leave empty array for no priority countries
+  config.country_codes_priority = ['US', 'CA'] # nil for no priority countries
 
   # Or you can be more selective...
   #config.country_codes = ['US', 'CA']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -257,6 +257,7 @@ files:
 - app/views/effective/addresses/_address_fields_formtastic.html.haml
 - app/views/effective/addresses/_address_fields_simple_form.html.haml
 - app/views/effective/addresses/_subregions.html.haml
+- config/locales/simple_form.en.yml
 - config/routes.rb
 - db/migrate/01_create_effective_addresses.rb.erb
 - lib/effective_addresses.rb