Merge branch 'release/0.6.3' into develop

Author: fabn

README.md

@@ -4,11 +4,10 @@ Makes it easy to translate your resource fields.
 ## Installation
 
 ```ruby
-gem "activeadmin-globalize", github: 'stefanoverna/activeadmin-globalize',
-branch: 'master'
+gem 'activeadmin-globalize', '~> 0.6.3'
 ```
-We still need to use GitHub because ActiveAdmin is still in active development
-and there's no released gem compatible with Rails 4.
+
+This version targets Rails 3.2.x only and ActiveAdmin ~> 0.6.3.
 
 ## Your model
 
@@ -20,13 +19,11 @@ end
 ## Editor configuration
 
 ```ruby
-# if you are using Rails 4 or Strong Parameters:
-permit_params translations_attributes: [:locale, :title, :content]
-
-
 index do
-  # ...
+  # textual translation status
   translation_status
+  # or with flag icons
+  translation_status_flags
   # ...
   default_actions
 end
@@ -54,3 +51,7 @@ to symbol (in application.rb)
 
   config.i18n.available_locales = [:en, :it, :de, :es, :"pt-BR"]
 
+## Credits
+
+This work is based on original idea by [@stefanoverna](https://github.com/stefanoverna/activeadmin-globalize),
+ I needed it for AA 0.6.x so I forked the original project.

activeadmin-globalize.gemspec

@@ -7,19 +7,19 @@ require 'active_admin/globalize/version'
 Gem::Specification.new do |s|
   s.name        = 'activeadmin-globalize'
   s.version     = ActiveAdmin::Globalize::VERSION
-  s.authors     = ['Stefano Verna']
-  s.email       = ['stefano.verna@gmail.com']
-  s.homepage    = 'http://github.com/stefanoverna/activeadmin-globalize'
+  s.authors     = ['Stefano Verna', 'Fabio Napoleoni']
+  s.email       = ['stefano.verna@gmail.com', 'f.napoleoni@gmail.com']
+  s.homepage    = 'http://github.com/fabn/activeadmin-globalize'
   s.summary     = 'Handles globalize translations'
-  s.description = 'Handles globalize translations'
+  s.description = 'Handles globalize translations in ActiveAdmin 0.6.3 and Rails 3.2.x'
 
   s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md)
 
-  s.add_dependency 'activeadmin', '>= 0.6.3'
-  s.add_dependency 'globalize', '>= 3.0.4'
+  s.add_dependency 'activeadmin', '~> 0.6.3'
+  s.add_dependency 'globalize', '~> 3.0.4'
 
   # development dependencies
-  s.add_development_dependency 'bundler', '~> 1.6.1'
+  s.add_development_dependency 'bundler', '>= 1.6.1'
   s.add_development_dependency 'rake'
   # Other development dependencies moved into Gemfile