radiant-globalize2-extension 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/globalize2_extension.rb

@@ -3,7 +3,7 @@
 require 'globalize2/form_builder_extensions'
 
 class Globalize2Extension < Radiant::Extension
-  version "0.2.1"
+  version "0.2.2"
   description "Translate content in Radiant CMS using the Globalize2 Rails plugin."
   url "http://blog.aissac.ro/radiant/globalize2-extension/"
 
@@ -16,15 +16,15 @@ class Globalize2Extension < Radiant::Extension
   } 
   
   def self.default_language
-    @@default_language ||= Radiant::Config['globalize.default_language'].blank? ? "en" : Radiant::Config['globalize.default_language']
+    @@default_language ||= Radiant::Config['globalize.default_language']
   end
   
   def self.languages
-    @@languages ||= Radiant::Config['globalize.languages'].blank? ? [] : Radiant::Config['globalize.languages'].split(",").map(&:to_s)
+    @@languages ||= Radiant::Config['globalize.languages'].split(",")
   end
   
   def self.locales
-    @@locales ||= [default_language, *languages].map(&:to_s)
+    @@locales ||= ([default_language] | languages)
   end
   
   def self.content_locale
@@ -36,6 +36,9 @@ class Globalize2Extension < Radiant::Extension
   end
   
   def activate
+    Radiant::Config['globalize.default_language'] ||= 'en'
+    Radiant::Config['globalize.languages']        ||= 'en' # Hack: Config won't write empty settings to database.
+    
     require 'i18n/backend/fallbacks'
     I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
 

data/lib/globalize2/form_builder_extensions.rb

@@ -7,12 +7,12 @@ module Globalize2
     
     def text_field_with_globalize(method, options = {})
       Rails.logger.debug "FormBuilder: text_field_with_globalize"
-      options[:value] = options[:value] || I18n.with_locale(Globalize2Extension.content_locale) { object.send(method) }
+      options[:value] = options[:value] || I18n.with_locale(Globalize2Extension.content_locale) { object && object.send(method) }
       text_field_without_globalize(method, options)
     end
     
     def text_area_with_globalize(method, options = {})
-      options[:value] = options[:value] || I18n.with_locale(Globalize2Extension.content_locale) { object.send(method) }
+      options[:value] = options[:value] || I18n.with_locale(Globalize2Extension.content_locale) { object && object.send(method) }
       text_area_without_globalize(method, options)
     end
   end

data/lib/globalize2/globalized_fields_controller_extension.rb

@@ -1,7 +1,7 @@
 module Globalize2
   module GlobalizedFieldsControllerExtension
     def self.included base
-      base.before_filter :set_content_locale
+      base.prepend_before_filter :set_content_locale
     end
 
 

data/lib/globalize2/localized_content.rb

@@ -0,0 +1,15 @@
+module Globalize2::LocalizedContent
+  def localized_content_for *fields
+    fields.each do |field|
+      class_eval %{
+        def #{field}_with_localized_content
+          I18n.with_locale(Globalize2Extension.content_locale) do
+            #{field}_without_localized_content
+          end
+        end
+      }
+
+      alias_method_chain field, :localized_content
+    end
+  end
+end

data/lib/globalize2/page_extensions.rb

@@ -8,13 +8,16 @@ module Globalize2
 
 
       base.class_eval do
-
+        extend Globalize2::LocalizedContent
+        
         def self.locale
           I18n.locale
         end
         #eigenclass = class << self; self; end
 
         translates :title, :slug, :breadcrumb, :description, :keywords
+        localized_content_for :title, :slug, :breadcrumb
+        
         attr_accessor :reset_translations
         alias_method_chain 'tag:link', :globalize
         alias_method_chain 'tag:children:each', :globalize
@@ -70,12 +73,12 @@ module Globalize2
     
     def path_with_globalize
       unless parent || Globalize2Extension.locales.size <= 1
-        '/' + I18n.locale.to_s + path_without_globalize
+        '/' + Globalize2Extension.content_locale + path_without_globalize
       else
         path_without_globalize
       end
     end
-    
+        
     def clone
       new_page = super
       translations.each do |t|

data/lib/globalize2/page_part_extensions.rb

@@ -1,7 +1,11 @@
 module Globalize2
   module PagePartExtensions
     def self.included(base)
-      base.alias_method_chain :content, :globalize
+      base.class_eval do
+        extend Globalize2::LocalizedContent
+        
+        localized_content_for :content
+      end
     end
 
     def clone
@@ -11,11 +15,5 @@ module Globalize2
       end
       new_page_part
     end
-    
-    def content_with_globalize
-      I18n.with_locale(Globalize2Extension.content_locale) do
-        content_without_globalize
-      end
-    end
   end
 end

data/lib/globalize2/pages_controller_extensions.rb

@@ -7,8 +7,7 @@ module Globalize2
     end
     
     def reset_locale
-      @locale = Globalize2Extension.default_language
-      Globalize2Extension.content_locale = I18n.locale = @locale.to_sym
+      Globalize2Extension.content_locale = session[:content_locale] = Globalize2Extension.default_language unless params[:content_locale]
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-globalize2-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Cristi Duma
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +02:00
+date: 2011-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - lib/globalize2/form_builder_extensions.rb
 - lib/globalize2/globalize_tags.rb
 - lib/globalize2/globalized_fields_controller_extension.rb
+- lib/globalize2/localized_content.rb
 - lib/globalize2/page_extensions.rb
 - lib/globalize2/page_part_extensions.rb
 - lib/globalize2/pages_controller_extensions.rb