radiant-globalize2-extension 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/globalize2_extension.rb

@@ -3,7 +3,7 @@
 require 'globalize2/form_builder_extensions'
 
 class Globalize2Extension < Radiant::Extension
-  version "0.2.5"
+  version "0.2.6"
   description "Translate content in Radiant CMS using the Globalize2 Rails plugin."
   url "http://blog.aissac.ro/radiant/globalize2-extension/"
 

data/lib/globalize2/globalize_tags.rb

@@ -36,7 +36,7 @@ module Globalize2
       <pre><code><r:locale /></code></pre>
     }
     tag 'locale' do |tag|
-      I18n.locale.to_s
+      Globalize2Extension.content_locale
     end
     
     desc %{
@@ -64,8 +64,11 @@ module Globalize2
       raise TagError.new("'codes' attribute must be set") if tag.attr['codes'].blank?
       
       result = []
-      codes = tag.attr["codes"].split("|").each do |code|
+      codes = tag.attr["codes"].split("|")
+      codes.each do |code|
         hash[:code] = code
+        tag.locals.first = code == codes.first
+        tag.locals.last = code == codes.last
         if I18n.locale.to_s == code
           result << (hash[:active] || hash[:normal]).call
         else
@@ -84,6 +87,13 @@ module Globalize2
         hash[symbol] = tag.block
       end
     end
+
+    tag "locales:if_first" do |tag|
+      tag.expand if tag.locals.first
+    end
+    tag "locales:if_last" do |tag|
+      tag.expand if tag.locals.last
+    end
   
     tag 'locales:code' do |tag|
       hash = tag.locals.locale
@@ -193,10 +203,10 @@ module Globalize2
       # Allows you to switch the current locale while within the block.
       # The previously current locale is reset after the block is finished.
       def switch_locale(locale)
-        current_locale = I18n.locale
-        I18n.locale = locale.to_sym
+        current_locale = Globalize2Extension.content_locale
+        Globalize2Extension.content_locale = locale
         result = yield
-        I18n.locale = current_locale
+        Globalize2Extension.content_locale = current_locale
         result
       end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-globalize2-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Cristi Duma