Merge branch 'master' of git://github.com/stefanoverna/activeadmin-globalize3

Conflicts:
	lib/active_admin/globalize3/form_builder_extension.rb

Author: marcusg

README.md

@@ -38,3 +38,10 @@ If `switch_locale` is set, each tab will be rendered switching locale.
 
 If you want to use Friendly ID together with Globalize3, please take a look
 at the `activeadmin-seo` gem.
+
+## Hints
+
+To use the dashed locale keys as 'pt-BR' or 'pt-PT' you need to convert a string to symbol (in application.rb)
+
+  config.i18n.available_locales = [:en, :it, :de, :es, :"pt-BR"]
+

lib/active_admin/globalize3/form_builder_extension.rb

@@ -6,17 +6,18 @@ module FormBuilderExtension
       def translated_inputs(name = "Translations", options = {}, &block)
         options.symbolize_keys!
         switch_locale = options.fetch(:switch_locale, false)
+        auto_sort = options.fetch(:auto_sort, true)
         form_buffers.last << template.content_tag(:div, class: "activeadmin-translations") do
           template.content_tag(:ul, class: "available-locales") do
-            I18n.available_locales.sort.map do |locale|
+            (auto_sort ? I18n.available_locales.sort : I18n.available_locales).map do |locale|
               template.content_tag(:li) do
                 I18n.with_locale(switch_locale ? locale : I18n.locale) do
                   template.content_tag(:a, I18n.t(:"active_admin.globalize3.language.#{locale}"), href:".locale-#{locale}")
                 end
               end
             end.join.html_safe
           end <<
-          I18n.available_locales.sort.map do |locale|
+          (auto_sort ? I18n.available_locales.sort : I18n.available_locales).map do |locale|
             translation = object.translations.find { |t| t.locale.to_s == locale.to_s }
             translation ||= object.translations.build(locale: locale)
             fields = proc do |form|