formtastic 0.9.9 → 0.9.10

data/README.textile

@@ -337,7 +337,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
           title: "Choose a good title for you post."
           body: "Write something inspiring here."
       actions:
-        create: "Create my %{model}"
+        create: "Create my {{model}}"
         update: "Save changes"
         dummie: "Launch!"
 </pre>
@@ -354,7 +354,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
       <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
     <% form.buttons do %>
-      <%= form.commit_button %>     # => "Create my %{model}"
+      <%= form.commit_button %>     # => "Create my {{model}}"
     <% end %>
   <% end %>
 </pre>

data/lib/formtastic.rb

@@ -1595,9 +1595,9 @@ module Formtastic #:nodoc:
       #
       # Lookup priority:
       #
-      #   'formtastic.%{type}.%{model}.%{action}.%{attribute}'
-      #   'formtastic.%{type}.%{model}.%{attribute}'
-      #   'formtastic.%{type}.%{attribute}'
+      #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
+      #   'formtastic.{{type}}.{{model}}.{{attribute}}'
+      #   'formtastic.{{type}}.{{attribute}}'
       # 
       # Example:
       #   
@@ -1622,10 +1622,10 @@ module Formtastic #:nodoc:
 
             defaults = ::Formtastic::I18n::SCOPES.collect do |i18n_scope|
               i18n_path = i18n_scope.dup
-              i18n_path.gsub!('%{action}', action_name)
-              i18n_path.gsub!('%{model}', model_name)
-              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
-              i18n_path.gsub!('%{attribute}', attribute_name)
+              i18n_path.gsub!('{{action}}', action_name)
+              i18n_path.gsub!('{{model}}', model_name)
+              i18n_path.gsub!('{{nested_model}}', nested_model_name) unless nested_model_name.nil?
+              i18n_path.gsub!('{{attribute}}', attribute_name)
               i18n_path.gsub!('..', '.')
               i18n_path.to_sym
             end

data/lib/formtastic/i18n.rb

@@ -7,16 +7,16 @@ module Formtastic
         :required       => 'required',
         :yes            => 'Yes',
         :no             => 'No',
-        :create         => 'Create %{model}',
-        :update         => 'Update %{model}'
+        :create         => 'Create {{model}}',
+        :update         => 'Update {{model}}'
       }.freeze
     SCOPES = [
-        '%{model}.%{nested_model}.%{action}.%{attribute}',
-        '%{model}.%{action}.%{attribute}',
-        '%{model}.%{nested_model}.%{attribute}',
-        '%{model}.%{attribute}',
-        '%{nested_model}.%{attribute}',
-        '%{attribute}'
+        '{{model}}.{{nested_model}}.{{action}}.{{attribute}}',
+        '{{model}}.{{action}}.{{attribute}}',
+        '{{model}}.{{nested_model}}.{{attribute}}',
+        '{{model}}.{{attribute}}',
+        '{{nested_model}}.{{attribute}}',
+        '{{attribute}}'
       ]
       
     class << self

data/spec/commit_button_spec.rb

@@ -136,7 +136,7 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit %{model}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit {{model}}'}
           end
           
           after do
@@ -171,7 +171,7 @@ describe 'SemanticFormBuilder#commit_button' do
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => 'Custom Submit %{model}'
+                     :submit => 'Custom Submit {{model}}'
                     }
                   }
                }
@@ -210,7 +210,7 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create %{model}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create {{model}}'}
           end
 
           after do
@@ -245,7 +245,7 @@ describe 'SemanticFormBuilder#commit_button' do
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => 'Custom Create %{model}'
+                      :create => 'Custom Create {{model}}'
                      }
                    }
                 }
@@ -284,7 +284,7 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save %{model}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save {{model}}'}
           end
           
           after do
@@ -319,7 +319,7 @@ describe 'SemanticFormBuilder#commit_button' do
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => 'Custom Save %{model}'
+                      :update => 'Custom Save {{model}}'
                      }
                    }
                 }

data/spec/i18n_spec.rb

@@ -26,11 +26,11 @@ describe 'Formtastic::I18n' do
       @formtastic_strings = {
           :yes            => 'Default Yes',
           :no             => 'Default No',
-          :create         => 'Default Create %{model}',
-          :update         => 'Default Update %{model}',
+          :create         => 'Default Create {{model}}',
+          :update         => 'Default Update {{model}}',
           :custom_scope   => {
               :duck           => 'Duck',
-              :duck_pond      => '%{ducks} ducks in a pond'
+              :duck_pond      => '{{ducks}} ducks in a pond'
             }
         }
       ::I18n.backend.store_translations :en, :formtastic => @formtastic_strings
@@ -71,7 +71,7 @@ describe 'Formtastic::I18n' do
 
     it "should use default strings" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
-        ::Formtastic::I18n.t(key, :model => '%{model}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
+        ::Formtastic::I18n.t(key, :model => '{{model}}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
       end
     end
     

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '2.3.7'
-gem 'actionpack', '2.3.7'
+gem 'activesupport', '2.3.8'
+gem 'actionpack', '2.3.8'
 require 'active_support'
 require 'action_pack'
 require 'action_view'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Justin French
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 +10:00
+date: 2010-05-26 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency