jekyll-localization 0.1.3 → 0.1.4

data/ChangeLog

@@ -1,5 +1,9 @@
 = Revision history for jekyll-localization
 
+== 0.1.4 [2012-04-18]
+
+* More flexible approach to date/time localization.
+
 == 0.1.3 [2011-05-30]
 
 * Switched license to Affero GPL.

data/README

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

data/lib/jekyll/localization.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 #--
 ###############################################################################
 #                                                                             #
@@ -44,15 +46,41 @@ module Jekyll
       'fr' => %w[French  Französisch Français]
     }
 
-    MONTH_LONG = {
-      'de' => %w[Januar  Februar März April Mai Juni Juli    August September Oktober November Dezember],
-      'fr' => %w[janvier février mars avril mai juin juillet août   septembre octobre novembre décembre]
-    }
+    DATE_FMT = Hash.new { |h, k| h[k] = '%a %e %b %Y %M:%M:%S %Z' }.update(
+      'en' => '%a %e %b %Y %M:%M:%S %p %Z'
+    )
 
-    MONTH_SHORT = {
-      'de' => %w[Jan  Feb Mär  Apr Mai Jun  Jul  Aug  Sep  Okt Nov Dez],
-      'fr' => %w[janv fév mars avr mai juin juil août sept oct nov déc]
-    }
+    DATE_FMT_LONG = Hash.new { |h, k| h[k] = '%e %B %Y' }.update(
+      'de' => '%e. %B %Y'
+    )
+
+    DATE_FMT_SHORT = Hash.new { |h, k| h[k] = '%e %b %Y' }.update(
+      'de' => '%e. %b %Y'
+    )
+
+    MONTHNAMES = Hash.new { |h, k| h[k] = Date::MONTHNAMES }.update(
+      'de' => [nil] + %w[Januar  Februar März April Mai Juni Juli    August September Oktober November Dezember],
+      'fr' => [nil] + %w[janvier février mars avril mai juin juillet août   septembre octobre novembre décembre]
+    )
+
+    ABBR_MONTHNAMES = Hash.new { |h, k| h[k] = Date::ABBR_MONTHNAMES }.update(
+      'de' => [nil] + %w[Jan   Feb  Mär  Apr   Mai Jun  Jul   Aug  Sep   Okt  Nov  Dez],
+      'fr' => [nil] + %w[janv. fév. mars avril mai juin juil. août sept. oct. nov. déc.]
+    )
+
+    DAYNAMES = Hash.new { |h, k| h[k] = Date::DAYNAMES }.update(
+      'de' => %w[Sonntag  Montag Dienstag Mittwoch Donnerstag Freitag  Samstag],
+      'fr' => %w[dimanche lundi  mardi    mercredi jeudi      vendredi samedi]
+    )
+
+    ABBR_DAYNAMES = Hash.new { |h, k| h[k] = Date::ABBR_DAYNAMES }.update(
+      'de' => %w[So   Mo   Di   Mi   Do   Fr   Sa],
+      'fr' => %w[dim. lun. mar. mer. jeu. ven. sam.]
+    )
+
+    MERIDIAN = Hash.new { |h, k| h[k] = ['', ''] }.update(
+      'en' => %w[AM PM]
+    )
 
     # What is considered a language extension
     LANG_EXT_RE = %r{\.([a-z]{2})}
@@ -187,7 +215,7 @@ module Jekyll
 
       yield
     ensure
-      site.posts.replace(original_posts) if original_posts && page.lang
+      site.posts.replace(original_posts) if original_posts && lang
     end
 
   end
@@ -265,27 +293,36 @@ module Jekyll
 
     # Overwrites the original method to generate localized date strings.
     def date_to_string(date, lang = lang)
-      local_date_string(date, false, lang)
+      local_date_string(date, Localization::DATE_FMT_SHORT[lang], lang)
     end
 
     alias_method :_localization_original_date_to_long_string, :date_to_long_string
 
     # Overwrites the original method to generate localized date strings.
     def date_to_long_string(date, lang = lang)
-      local_date_string(date, true, lang)
+      local_date_string(date, Localization::DATE_FMT_LONG[lang], lang)
     end
 
-    def local_date_string(date, long, lang)
-      format = "%d#{'.' if lang == 'de'} month#{'.' if lang == 'fr' && !long} %Y"
-
-      if Localization::LANGUAGES.include?(lang) && lang != 'en'
-        month = long ? Localization::MONTH_LONG[lang][date.month - 1]:
-          Localization::MONTH_SHORT[lang][date.month - 1]
-      else
-        month = long ? '%B' : '%b'
-      end
+    def local_date_string(date, fmt, lang = lang)
+      # unabashedly stole this snippet from Joshua Harvey's Globalize plugin,
+      # which itself unabashedly stole it from Tadayoshi Funaba's Date class
+      res = ''
+
+      fmt.scan(/%[EO]?(.)|(.)/o) { |a, b|
+        res << case a
+          when nil then b
+          when 'A' then Localization::DAYNAMES[lang][date.wday]
+          when 'a' then Localization::ABBR_DAYNAMES[lang][date.wday]
+          when 'B' then Localization::MONTHNAMES[lang][date.month]
+          when 'b' then Localization::ABBR_MONTHNAMES[lang][date.month]
+          when 'c' then local_date_string(date, Localization::DATE_FMT[lang], lang)
+          when 'P' then Localization::MERIDIAN[lang][date.send(:hour) < 12 ? 0 : 1].downcase
+          when 'p' then Localization::MERIDIAN[lang][date.send(:hour) < 12 ? 0 : 1]
+          else '%' << a
+        end
+      } if fmt
 
-      date.strftime(format.sub(/month/, month))
+      date.strftime(res)
     end
 
   end

data/lib/jekyll/localization/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll-localization
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jens Wille
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 Z
+date: 2012-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll-rendering
@@ -47,23 +47,23 @@ extra_rdoc_files:
 files: 
 - lib/jekyll/localization/version.rb
 - lib/jekyll/localization.rb
-- Rakefile
-- COPYING
 - ChangeLog
+- COPYING
 - README
+- Rakefile
 homepage: http://github.com/blackwinter/jekyll-localization
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --title
-- jekyll-localization Application documentation (v0.1.3)
 - --main
 - README
 - --charset
 - UTF-8
 - --all
+- --title
+- jekyll-localization Application documentation (v0.1.4)
+- --line-numbers
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Jekyll plugin that adds localization features to the rendering engine.