activeadmin-globalize 0.6.3 → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a0d5a4b4d8229c79ebc2a651fd3dafc532e839
-  data.tar.gz: fb06e589b6c9adb39b8d3b1889005ae213637ff3
+  metadata.gz: 644ef78265b060ccdd7111b353338c96271c8a43
+  data.tar.gz: a0bbac682946d23d452af8dd090576ca6c62645e
 SHA512:
-  metadata.gz: 45377c6432d3338feebe6ce60380d7f32d4cded5aa80506737e61644b1609669c50c086aa75e39e983213b00ef8e4df4205f067d7d3d727799a1ed6679664644
-  data.tar.gz: c305e8e0b0bc8be3d586a12bdab883da91b4d619d4ed6bdbc42ea4f7c956c10bf7fc8e9399612654b989ee2c2ceefeb22fdd55e7f87dd09dec25a11913094ead
+  metadata.gz: 537af108f150104a125e8125abbee32a0969ae7708661417e517294d19f77f281b173ba0c2c9f0504aea4d9a557e7fdfe53b3e34b941be249c35d2504ebe5e12
+  data.tar.gz: a81398008358f3463ceff01e2ee54426ad7ed33e0d25b5f1a941474161447d6e71807f20e52ff11a207f6b68da7eb974a239facad3167683825716da70577473

data/README.md

@@ -1,13 +1,32 @@
 # ActiveAdmin::Globalize
+
 Makes it easy to translate your resource fields.
 
+[![Gem Version](https://badge.fury.io/rb/activeadmin-globalize.svg)](http://badge.fury.io/rb/activeadmin-globalize)
+[![Build Status](https://travis-ci.org/fabn/activeadmin-globalize.svg?branch=develop)](https://travis-ci.org/fabn/activeadmin-globalize)
+
+## Help Needed
+
+Looking for maintainers. See https://github.com/fabn/activeadmin-globalize/issues/26
+
 ## Installation
 
+Current released version on rubygems is `1.0.0.pre`, I won't call it 1.0.0 until some issues has been solved, 
+but, as reported in [this PR](https://github.com/fabn/activeadmin-globalize/pull/25) it should work with both
+AA 1.0.0 and AA 1.1.0. 
+
+Current version targets Rails 4 and greater and ActiveAdmin >= 1.0.0.
+
 ```ruby
-gem 'activeadmin-globalize', '~> 0.6.3'
+gem 'activeadmin-globalize', '~> 1.0.0.pre'
 ```
 
-This version targets Rails 3.2.x only and ActiveAdmin ~> 0.6.3.
+Previous version with support for Rails 3 is maintained in branch [support/0.6.x](https://github.com/fabn/activeadmin-globalize/tree/support/0.6.x)
+
+## Require Assets
+
+- active_admin.js: `//= require active_admin/active_admin_globalize.js`
+- active_admin.css: `*= require active_admin/active_admin_globalize`
 
 ## Your model
 
@@ -16,42 +35,93 @@ 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, :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.
 
-## Friendly ID
-
-If you want to use Friendly ID together with Globalize, 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)
 
+```ruby
   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.
+ I needed it for AA 0.6.x so I forked the original project and expanded it with more features.

data/app/assets/javascripts/active_admin/active_admin_globalize.js.coffee

@@ -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()
-

data/app/assets/stylesheets/active_admin/{active_admin_globalize.css.sass → active_admin_globalize.sass}

@@ -1,5 +1,5 @@
 @import "active_admin/mixins"
-
+@import "active_admin_globalize_mixins"
 @import "active_admin_globalize_flags"
 
 .active_admin

data/app/assets/stylesheets/active_admin/{active_admin_globalize_flags.css.sass → active_admin_globalize_flags.sass}

@@ -3,10 +3,11 @@
 
 // Override flag positions in your stylesheet if you want to change default flags
 .flag
+  display: inline-block
   width: 16px
   height: 11px
   vertical-align: middle
-  background: url(active_admin_image_path('flags.png')) no-repeat
+  background: image-url('active_admin/flags.png') no-repeat
   &.flag-ar // originally flag-ae
     background-position: -16px 0
   &.flag-br
@@ -33,10 +34,18 @@
     background-position: -32px -22px
   &.flag-en // originally flag-us
     background-position: -48px -22px
+  &.flag-he // originally flag-il
+    background-position: 0 -33px
 
 // Used to distantiate inline locale selector
 span.inline-locale-selector
   margin-right: 10px
+  > .ui-translation-trigger
+    opacity: .4
+    &.empty
+      filter: grayscale(100%)
+    &.active
+      opacity: 1
 
 .field-translation.hidden
   display: none
@@ -53,4 +62,4 @@ div.field-translation
 
 // prevent tr height flickering
 span.field-translation.empty
-  vertical-align: bottom
+  vertical-align: bottom

data/app/assets/stylesheets/active_admin/active_admin_globalize_mixins.sass

@@ -0,0 +1,27 @@
+@mixin border-top-radius($radius)
+  -webkit-border-top-right-radius: $radius
+  border-top-right-radius: $radius
+  -webkit-border-top-left-radius: $radius
+  border-top-left-radius: $radius
+  background-clip: padding-box
+
+@mixin border-right-radius($radius)
+  -webkit-border-bottom-right-radius: $radius
+  border-bottom-right-radius: $radius
+  -webkit-border-top-right-radius: $radius
+  border-top-right-radius: $radius
+  background-clip: padding-box
+
+@mixin border-bottom-radius($radius)
+  -webkit-border-bottom-right-radius: $radius
+  border-bottom-right-radius: $radius
+  -webkit-border-bottom-left-radius: $radius
+  border-bottom-left-radius: $radius
+  background-clip: padding-box
+
+@mixin border-left-radius($radius)
+  -webkit-border-bottom-left-radius: $radius
+  border-bottom-left-radius: $radius
+  -webkit-border-top-left-radius: $radius
+  border-top-left-radius: $radius
+  background-clip: padding-box

data/config/locales/ar.yml

@@ -0,0 +1,16 @@
+ar:
+  active_admin:
+    globalize:
+      translations: "ترجمة"
+      language:
+        de: "ألماني"
+        en: "الإنجليزية"
+        es: "الأسبانية"
+        fr: "اللغة الفرنسية"
+        hu: "الهنغارية"
+        it: "الإيطالي"
+        pt-BR: "البرتغالية"
+        pt-PT: "البرتغالية (البرتغال)"
+        tr: "اللغة التركية"
+        he: "العبرية"
+

data/config/locales/de.yml

@@ -12,4 +12,6 @@ de:
         pt-BR: "Portugiesisch"
         pt-PT: "Portugiesisch (Portugal)"
         tr: "Türkisch"
+        he: "Hebräisch"
+        ar: "Arabisch"
 

data/config/locales/en.yml

@@ -12,4 +12,6 @@ en:
         pt-BR: "Portuguese"
         pt-PT: "Portuguese (Portugal)"
         tr: "Turkish"
+        he: "Hebrew"
+        ar: "Arabic"
 

data/config/locales/es.yml

@@ -0,0 +1,17 @@
+es:
+  active_admin:
+    globalize:
+      translations: "Traducciones"
+      language:
+        de: "Alemán"
+        en: "Inglés"
+        es: "Español"
+        fr: "Francés"
+        hu: "Húngaro"
+        it: "Italiano"
+        pt-BR: "Portugués"
+        pt-PT: "Portugués (Portugal)"
+        tr: "Turco"
+        he: "Hebreo"
+        ar: "Arábica"
+

data/config/locales/he.yml

@@ -0,0 +1,17 @@
+he:
+  active_admin:
+    globalize:
+      translations: "תרגומים"
+      language:
+        de: "גרמנית"
+        en: "אנגלית"
+        es: "ספרדית"
+        fr: "צרפתית"
+        hu: "הונגרית"
+        it: "איטלקית"
+        pt-BR: "פורטוגזית"
+        pt-PT: "פורטוגזית (פורטוגל)"
+        tr: "טורקית"
+        he: "עברית"
+        ar: "ערבית"
+

data/config/locales/hu.yml

@@ -12,4 +12,6 @@ hu:
         pt-BR: "Portuguese"
         pt-PT: "Portuguese (Portugal)"
         tr: "Török"
+        he: "Héber"
+        ar: "Arab"
 

data/config/locales/it.yml

@@ -12,4 +12,6 @@ it:
         pt-BR: "Portoghese"
         pt-PT: "Portoghese (Portogallo)"
         tr: "Turco"
+        he: "Ebraico"
+        ar: "Arabo"
 

data/config/locales/pt-BR.yml

@@ -12,4 +12,6 @@ pt-BR:
         pt-BR: "Português"
         pt-PT: "Português (Portugal)"
         tr: "Turco"
+        he: "Hebraico"
+        ar: "Árabe"
 

data/config/locales/pt-PT.yml

@@ -12,4 +12,6 @@ pt-PT:
         pt-BR: "Português"
         pt-PT: "Português (Portugal)"
         tr: "Turco"
+        he: "Hebraico"
+        ar: "Árabe"
 

data/lib/active_admin/globalize/attributes_table_extension.rb

@@ -53,7 +53,7 @@ module ActiveAdmin
           if options[:inline]
             ''.html_safe.tap do |value|
               # Add selectors for inline locale
-              value << inline_locale_selectors
+              value << inline_locale_selectors(field, options[:locale], &block)
               # Build translations spans
               value << field_translations(field, :span, options[:locale], &block)
             end
@@ -61,7 +61,7 @@ module ActiveAdmin
             content_tag(:div, class: 'activeadmin-translations') do
               ''.html_safe.tap do |value|
                 # Render selectors as in translation ui
-                value << block_locale_selectors
+                value << block_locale_selectors(field, options[:locale], &block)
                 # Build translations divs for actual translations
                 value << field_translations(field, :div, options[:locale], &block)
               end
@@ -74,28 +74,26 @@ module ActiveAdmin
 
       # @return [Boolean] true iff the field is translatable
       def translatable?(field)
-        @record.class.translates? &&
-            @record.class.translated_attribute_names.include?(field.to_sym)
+        @resource_class.translates? &&
+            @resource_class.translated_attribute_names.include?(field.to_sym)
       end
 
       # Build a tag for each field translation with appropriate css classes to make javascript working
       # @param [String] field field name to render
       # @param [Symbol] tag tag to enclose field translation
       # @param [Symbol] initial_locale locale to set as not hidden
-      def field_translations(field, tag, initial_locale)
+      def field_translations(field, tag, initial_locale, &block)
         available_translations.map do |translation|
           # Classes for translation span only first element is visible
           css_classes = ['field-translation', "locale-#{translation.locale}"]
           # Initially only element for selected locale is visible
           css_classes.push 'hidden' unless translation.locale == initial_locale.to_sym
           # Build content for cell or div using translation locale and given block
-          content = I18n.with_locale(translation.locale) do
-            block_given? ? yield(translation) : translation.send(field)
-          end
+          content = field_translation_value(translation, field, &block)
           # return element
           if tag == :span # inline element
             # attach class to span if inline
-            css_classes.push(:empty) if content.blank?
+            css_classes.push('empty') if content.blank?
             content_tag(tag, content.presence || 'Empty', class: css_classes)
           else
             # block content
@@ -107,13 +105,16 @@ module ActiveAdmin
         end.join(' ').html_safe
       end
 
-      def block_locale_selectors
+      def block_locale_selectors(field, initial_locale, &block)
         content_tag(:ul, class: 'available-locales locale-selector') do
-          available_translations.map(&:locale).map do |locale|
-            default = 'default' if locale == I18n.default_locale
-            content_tag(:li, class: 'translation-tab') do
-              I18n.with_locale(locale) do
-                content_tag(:a, I18n.t(:"active_admin.globalize.language.#{locale}"), href: ".locale-#{locale}", class: default)
+          available_translations.map do |translation|
+            css_classes = ['translation-tab']
+            css_classes << 'active' if translation.locale == initial_locale.to_sym
+            css_classes << 'empty' unless content.presence
+            content_tag(:li, class: css_classes) do
+              I18n.with_locale(translation.locale) do
+                default = 'default' if translation.locale == initial_locale.to_sym
+                content_tag(:a, I18n.t(:"active_admin.globalize.language.#{translation.locale}"), href: ".locale-#{translation.locale}", class: default)
               end
             end
           end.join.html_safe
@@ -121,19 +122,28 @@ module ActiveAdmin
       end
 
       # Return flag elements to show the given locale using javascript
-      def inline_locale_selectors
+      def inline_locale_selectors(field, initial_locale, &block)
         content_tag(:span, class: 'inline-locale-selector') do
           available_translations.map do |translation|
+            content = field_translation_value(translation, field, &block)
+            css_classes = ['ui-translation-trigger']
+            css_classes << 'active' if translation.locale == initial_locale.to_sym
+            css_classes << 'empty' unless content.presence
             # Build a link to show the given translation
-            link_to(flag_icon(translation.locale), '#', class: 'ui-translation-trigger', data: {locale: translation.locale})
+            link_to(flag_icon(translation.locale), '#', class: css_classes, data: {locale: translation.locale})
           end.join(' ').html_safe
         end
       end
 
       def available_translations
-        @record_translations ||= @record.translations.order(:locale)
+        @record_translations ||= @collection.first.translations.order(:locale)
       end
 
+      def field_translation_value(translation, field)
+        I18n.with_locale(translation.locale) do
+          block_given? ? yield(translation) : translation.send(field)
+        end
+      end
     end
   end
 end

data/lib/active_admin/globalize/engine.rb

@@ -7,13 +7,6 @@ module ActiveAdmin
           "active_admin/active_admin_globalize.js"
         ]
       end
-
-      initializer "add assets" do
-        ActiveAdmin.application.register_stylesheet "active_admin/active_admin_globalize.css", :media => :screen
-        ActiveAdmin.application.register_javascript "active_admin/active_admin_globalize.js"
-      end
-
     end
   end
 end
-

data/lib/active_admin/globalize/form_builder_extension.rb

@@ -5,12 +5,13 @@ module ActiveAdmin
 
       def translated_inputs(name = "Translations", options = {}, &block)
         options.symbolize_keys!
+        available_locales = options.fetch(:available_locales, I18n.available_locales)
         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
+        default_locale = options.fetch(:default_locale, I18n.default_locale)
+        template.content_tag(:div, class: "activeadmin-translations") do
           template.content_tag(:ul, class: "available-locales") do
-            (auto_sort ? I18n.available_locales.sort : I18n.available_locales).map do |locale|
-              default = 'default' if locale == I18n.default_locale
+            available_locales.map do |locale|
+              default = 'default' if locale == default_locale
               template.content_tag(:li) do
                 I18n.with_locale(switch_locale ? locale : I18n.locale) do
                   template.content_tag(:a, I18n.t(:"active_admin.globalize.language.#{locale}"), href:".locale-#{locale}", :class => default)
@@ -18,7 +19,7 @@ module ActiveAdmin
               end
             end.join.html_safe
           end <<
-          (auto_sort ? I18n.available_locales.sort : I18n.available_locales).map do |locale|
+          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|
@@ -42,4 +43,3 @@ module ActiveAdmin
     end
   end
 end
-

data/lib/active_admin/globalize/version.rb

@@ -1,6 +1,5 @@
 module ActiveAdmin
   module Globalize
-    VERSION = '0.6.3'
+    VERSION = '1.0.0.pre'
   end
 end
-

data/lib/active_admin/view_helpers/flag_helper.rb

@@ -6,7 +6,7 @@ module ActiveAdmin
 
       # Return an image tag with background of given locale
       def flag_icon(locale)
-        image_tag('active_admin/transparent.gif', class: "flag flag-#{locale}")
+        content_tag :i, '', class: "flag flag-#{locale}", title: I18n.t("active_admin.globalize.language.#{locale}")
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-globalize
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Stefano Verna
@@ -9,65 +9,77 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Handles globalize translations in ActiveAdmin 0.6.3 and Rails 3.2.x
+description: Handles globalize translations in ActiveAdmin 1.0 and Rails 4.x-5.x
 email:
 - stefano.verna@gmail.com
 - f.napoleoni@gmail.com
@@ -78,12 +90,15 @@ files:
 - MIT-LICENSE
 - README.md
 - app/assets/images/active_admin/flags.png
-- app/assets/images/active_admin/transparent.gif
 - app/assets/javascripts/active_admin/active_admin_globalize.js.coffee
-- app/assets/stylesheets/active_admin/active_admin_globalize.css.sass
-- app/assets/stylesheets/active_admin/active_admin_globalize_flags.css.sass
+- app/assets/stylesheets/active_admin/active_admin_globalize.sass
+- app/assets/stylesheets/active_admin/active_admin_globalize_flags.sass
+- app/assets/stylesheets/active_admin/active_admin_globalize_mixins.sass
+- config/locales/ar.yml
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/es.yml
+- config/locales/he.yml
 - config/locales/hu.yml
 - config/locales/it.yml
 - config/locales/pt-BR.yml
@@ -107,17 +122,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Handles globalize translations