jekyll-localization 0.1.0 → 0.1.1

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to jekyll-localization version 0.1.0
+This documentation refers to jekyll-localization version 0.1.1
 
 
 == DESCRIPTION

data/lib/jekyll/localization.rb

@@ -71,7 +71,9 @@ module Jekyll
         initialize_without_localization(*args)
 
         if @lang = extract_lang(@name)
-          data['lang'] = @lang
+          data['lang']           = @lang
+          data['content_lang'] ||= @lang
+
           @lang_ext = ".#{@lang}"
         end
       end
@@ -90,23 +92,22 @@ module Jekyll
         basename, lang, ext = extract_lang(name, true)
         return unless lang
 
-        data = self.data  # keep original YAML data!
+        original_data = data  # keep original YAML data!
 
         (LANGUAGES - [lang]).each { |alternate_lang|
           alternate_name = [basename, alternate_lang, ext].join('.')
 
           if File.exists?(File.join(base, alternate_name))
             read_yaml(base, alternate_name, false)
-            break unless content.empty?
-          end
-        }
 
-        # Set YAML data too unless it is already set.
-        self.data.each { |k, v|
-          data[k] = v unless data.has_key?(k)
+            unless content.empty?
+              data['content_lang'] = alternate_lang
+              break
+            end
+          end
         }
 
-        self.data = data
+        data.update(original_data)
       end
 
     end
@@ -215,7 +216,9 @@ module Jekyll
     end
 
     def url_lang(url, lang)
-      url.sub(Localization::LANG_END_RE, '.' + lang)
+      url = url.sub(Localization::LANG_END_RE, '')
+      url << '.' << lang if lang
+      url
     end
 
     def local_posts

data/lib/jekyll/localization/version.rb

@@ -6,7 +6,7 @@ module Jekyll
 
       MAJOR = 0
       MINOR = 1
-      TINY  = 0
+      TINY  = 1
 
       class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll-localization
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jens Wille
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +01:00
-default_executable: 
+date: 2011-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll-rendering
@@ -52,7 +51,6 @@ files:
 - ChangeLog
 - Rakefile
 - COPYING
-has_rdoc: true
 homepage: http://github.com/blackwinter/jekyll-localization
 licenses: []
 
@@ -61,11 +59,11 @@ rdoc_options:
 - --charset
 - UTF-8
 - --title
-- jekyll-localization Application documentation (v0.1.0)
+- jekyll-localization Application documentation (v0.1.1)
 - --main
 - README
-- --all
 - --line-numbers
+- --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -89,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Jekyll plugin that adds localization features to the rendering engine.