Merge branch 'develop' of https://github.com/humancopy/activeadmin-globalize into feature/pull-13

Author: fabn

README.md

@@ -33,23 +33,23 @@ syntax shown below for form declaration doesn't work as is. See comments in code
 ```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
@@ -61,7 +61,7 @@ form do |f|
   f.inputs "Translated fields" do
     f.translated_inputs 'ignored title', switch_locale: false do |t|
       t.input :title
-      t.input :content
+      t.input :description
     end
   end
   # ...
@@ -79,7 +79,7 @@ form do |f|
   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 :content
+      t.input :description
     end
   end
   # ...
@@ -92,7 +92,7 @@ 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 :content
+      t.input :description
     end
   end
   # ...

app/assets/images/active_admin/flags.png

@@ -3,6 +3,7 @@
 
 // Override flag positions in your stylesheet if you want to change default flags
 .flag
+  display: inline-block
   width: 16px
   height: 11px
   vertical-align: middle
@@ -33,6 +34,8 @@
     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

app/assets/images/active_admin/transparent.gif

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

app/assets/stylesheets/active_admin/active_admin_globalize_flags.sass

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

config/locales/de.yml

@@ -0,0 +1,16 @@
+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"
+

config/locales/en.yml

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

config/locales/es.yml

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

config/locales/he.yml

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