Merge pull request #1 from fabn/develop

Update from fabn fork

Author: Rob Florence

.travis.yml

@@ -1,6 +1,16 @@
+sudo: false
 language: ruby
+# Limit ruby versions to currently supported versions to avoid a big build matrix
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2
+  - 2.3.0
+# Update bundler on travis, since current one is broken, see https://github.com/rubygems/rubygems/issues/1419
+before_install:
+  - gem install bundler  
 # Load database schema before rake
-before_script: bundle exec rake db:schema:load
+before_script: bundle exec rake db:schema:load
+# Test on all supported rails versions
+gemfile:
+  - gemfiles/activeadmin_master.gemfile
+  - gemfiles/rails4_1.gemfile
+  - gemfiles/rails4_2.gemfile

Appraisals

@@ -0,0 +1,15 @@
+appraise 'rails4_1' do
+  gem 'rails', '~> 4.1.12'
+  gem 'globalize', '~> 4.0.3'
+end
+
+appraise 'rails4_2' do
+  gem 'rails', '~> 4.2.3'
+  gem 'globalize', '~> 5.0.0'
+end
+
+# Run tests on latest github version of ActiveAdmin
+appraise 'activeadmin_master' do
+  gem 'rails', '~> 4.2.0'
+  gem 'activeadmin', github: 'activeadmin/activeadmin'
+end

Gemfile

@@ -14,8 +14,7 @@ gemspec
 # gem 'debugger'
 
 # Gems used by the dummy application
-gem 'rails', '~> 4.0.0'
-gem 'sass-rails', '~> 4.0.2'
+gem 'sass-rails'
 gem 'coffee-rails'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
@@ -25,21 +24,21 @@ gem 'uglifier'
 # jquery-rails is
 gem 'jquery-rails'
 
-# Fetch activeadmin from github until is released
-gem 'devise'
+# ActiveAdmin requires devise < 4.0
+gem 'devise', '~> 3.2'
 
 group :test do
   gem 'sqlite3', '~> 1.3.5'
   gem 'rspec-rails', '~> 2.14.0'
   gem 'factory_girl_rails', '~> 4.2.1'
   gem 'database_cleaner', '~> 1.0.1'
-  gem 'guard-rspec', require: false
   gem 'spring', require: false
   gem 'spring-commands-rspec', require: false
   gem 'capybara', '~> 2.1.0'
   gem 'capybara-screenshot'
   gem 'poltergeist'
   gem 'fuubar'
+  gem 'appraisal'
   # Useful to debug tests
   gem 'awesome_print'
   gem 'pry'

Guardfile

@@ -25,30 +25,79 @@ active_admin_translates :title, :description do
   validates_presence_of :title
 end
 ```
-## Editor configuration
+## In your Active Admin resource definition
+
+**Important note:** I'm working on a fix for #4 because after AA deprecated and then removed [#form_buffers](https://github.com/activeadmin/activeadmin/pull/3486) the
+syntax shown below for form declaration doesn't work as is. See comments in code and [discussion](#4) to fix it until I found a solution.
 
 ```ruby
 
 # For usage with strong parameters you'll need to permit them
-permit_params translations_attributes: [:id, :locale, :title, :content, :_destroy]
+permit_params translations_attributes: [:id, :locale, :title, :description, :_destroy]
 
 index do
   # textual translation status
   translation_status
   # or with flag icons
   translation_status_flags
   # ...
-  default_actions
+  actions
 end
 
+# This was the original syntax proposed in this gem, however currently it doesn't work
 form do |f|
   # ...
   f.translated_inputs "Translated fields", switch_locale: false do |t|
     t.input :title
-    t.input :content
+    t.input :description
   end
   # ...
 end
+
+# Instead you have to nest the block inside an #inputs block and the title
+# should be passed to the inputs method
+form do |f|
+  # ...
+  f.inputs "Translated fields" do
+    f.translated_inputs 'ignored title', switch_locale: false do |t|
+      t.input :title
+      t.input :description
+    end
+  end
+  # ...
+end
+
+# You can also set locales to show in tabs
+# For example we want to show English translation fields without tab, and want to show other languages within tabs 
+form do |f|
+  # ...
+  f.inputs do
+    Globalize.with_locale(:en) do
+      f.input :title
+    end
+  end
+  f.inputs "Translated fields" do
+    f.translated_inputs 'ignored title', switch_locale: false, available_locales: (I18n.available_locales - [:en]) do |t|
+      t.input :title
+      t.input :description
+    end
+  end
+  # ...
+end
+
+# You can also set default language tab
+# For example we want to make Bengali translation tab as default
+form do |f|
+  # ...
+  f.inputs "Translated fields" do
+    f.translated_inputs 'ignored title', switch_locale: false, default_locale: :bn do |t|
+      t.input :title
+      t.input :description
+    end
+  end
+  # ...
+end
+
 ```
 If `switch_locale` is set, each tab will be rendered switching locale.
 

README.md

@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md)
 
   s.add_dependency 'activeadmin', '~> 1.0.0.pre'
-  s.add_dependency 'globalize', '~> 4.0'
+  # Try to support rails from 3.2 up to 4.2.x
+  s.add_dependency 'globalize', '>= 3.1.0', '< 6.0'
 
   # development dependencies
   s.add_development_dependency 'bundler', '>= 1.6.1'

activeadmin-globalize.gemspec

@@ -148,7 +148,8 @@ $ ->
     $td = $(this).closest('td')
     $('.field-translation', $td).hide()
     $(".locale-#{$locale}", $td).show()
+    $(this).parent().children('a.ui-translation-trigger').removeClass('active')
+    $(this).addClass('active')
     e.preventDefault()
 
   translations()
-