From 2748a68f37791f0001fd1056d0164c82c0f953a3 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Date: Wed, 27 May 2015 15:31:43 +0100 Subject: [PATCH 1/7] Added locale before content in show page --- lib/active_admin/views/translate_attributes_table.rb | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 lib/active_admin/views/translate_attributes_table.rb diff --git a/lib/active_admin/views/translate_attributes_table.rb b/lib/active_admin/views/translate_attributes_table.rb old mode 100644 new mode 100755 index 3aaa7cc..c670a92 --- a/lib/active_admin/views/translate_attributes_table.rb +++ b/lib/active_admin/views/translate_attributes_table.rb @@ -17,6 +17,9 @@ def row(attr, &block) header_content_for(attr) end end + td :width => 1 do + "#{locale}".raw + end td do ::I18n.with_locale locale do content_for(block || attr) From 010989ea71835ae097c5ac67b5069a25dd1f09ea Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Date: Wed, 27 May 2015 15:34:07 +0100 Subject: [PATCH 2/7] Undefined method raw --- lib/active_admin/views/translate_attributes_table.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_admin/views/translate_attributes_table.rb b/lib/active_admin/views/translate_attributes_table.rb index c670a92..5958812 100755 --- a/lib/active_admin/views/translate_attributes_table.rb +++ b/lib/active_admin/views/translate_attributes_table.rb @@ -18,7 +18,7 @@ def row(attr, &block) end end td :width => 1 do - "#{locale}".raw + raw("#{locale}") end td do ::I18n.with_locale locale do From 3ccce903c192a83e23c63f8166997cbabb402da1 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Date: Wed, 27 May 2015 15:35:10 +0100 Subject: [PATCH 3/7] Bumped version --- lib/active_admin/translate/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 lib/active_admin/translate/version.rb diff --git a/lib/active_admin/translate/version.rb b/lib/active_admin/translate/version.rb old mode 100644 new mode 100755 index e5344fc..67bdff7 --- a/lib/active_admin/translate/version.rb +++ b/lib/active_admin/translate/version.rb @@ -1,6 +1,6 @@ module ActiveAdmin module Translate # The current released version - VERSION = '0.2.2' + VERSION = '0.2.3' end end From 97f4d52974f75b07f952f8c8d25c2ca8e82b6fe8 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Date: Wed, 27 May 2015 15:42:41 +0100 Subject: [PATCH 4/7] Uppercased locales --- lib/active_admin/views/translate_attributes_table.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_admin/views/translate_attributes_table.rb b/lib/active_admin/views/translate_attributes_table.rb index 5958812..5b09b92 100755 --- a/lib/active_admin/views/translate_attributes_table.rb +++ b/lib/active_admin/views/translate_attributes_table.rb @@ -18,7 +18,7 @@ def row(attr, &block) end end td :width => 1 do - raw("#{locale}") + raw("#{locale.upcase}") end td do ::I18n.with_locale locale do From b7f3ac94f6eb5790fc622a832b3bff10a5a8d623 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Date: Mon, 4 Apr 2016 16:57:14 +0100 Subject: [PATCH 5/7] Trying to track a circular dependency. --- activeadmin-translate.gemspec | 3 --- 1 file changed, 3 deletions(-) diff --git a/activeadmin-translate.gemspec b/activeadmin-translate.gemspec index 78193d6..d71598a 100644 --- a/activeadmin-translate.gemspec +++ b/activeadmin-translate.gemspec @@ -13,7 +13,4 @@ Gem::Specification.new do |gem| gem.require_paths = %w(lib) gem.version = ActiveAdmin::Translate::VERSION - gem.add_dependency 'activeadmin' - gem.add_dependency 'globalize3' - gem.add_dependency 'railties' end From b596fddfb1459595066c81dee9024145c071fb99 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Date: Mon, 4 Apr 2016 18:45:53 +0100 Subject: [PATCH 6/7] Update activeadmin-translate.gemspec --- activeadmin-translate.gemspec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/activeadmin-translate.gemspec b/activeadmin-translate.gemspec index d71598a..78193d6 100644 --- a/activeadmin-translate.gemspec +++ b/activeadmin-translate.gemspec @@ -13,4 +13,7 @@ Gem::Specification.new do |gem| gem.require_paths = %w(lib) gem.version = ActiveAdmin::Translate::VERSION + gem.add_dependency 'activeadmin' + gem.add_dependency 'globalize3' + gem.add_dependency 'railties' end From d5edbc0b26d160cfb84efba09d1e46e4c7caeeb8 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Date: Mon, 4 Apr 2016 18:50:11 +0100 Subject: [PATCH 7/7] Update version.rb --- lib/active_admin/translate/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_admin/translate/version.rb b/lib/active_admin/translate/version.rb index 67bdff7..7424a76 100755 --- a/lib/active_admin/translate/version.rb +++ b/lib/active_admin/translate/version.rb @@ -1,6 +1,6 @@ module ActiveAdmin module Translate # The current released version - VERSION = '0.2.3' + VERSION = '0.2.4' end end