jekyll-localization 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9b67c96366b53e5e2659f7a65ecce74a842f9cd4
+  data.tar.gz: 8ac3645b43c4a10adfb9fb762132c2b4cc4359ea
+SHA512:
+  metadata.gz: 577c1991f8450c879e98822ff38e7060fb55a5e9e23ec2282dd516f1b97a9be2e9c83f251522d561db2326d4287d5e3d82f6ef1add42b4b1ea545cd0131179d6
+  data.tar.gz: fd20283e377b3192b45f5607e63d22463d8e6ac9ef4407b0742094c56d869a740a167e24ee4d70f00b2799746e96491ea48f1d54c9dd1e04ed37b3679d2bc475

data/ChangeLog

@@ -1,3 +1,5 @@
+# markup: rd
+
 = Revision history for jekyll-localization
 
 == 0.1.6 [2012-05-24]

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to jekyll-localization version 0.1.6
+This documentation refers to jekyll-localization version 0.1.7
 
 
 == DESCRIPTION
@@ -32,14 +32,14 @@ Jekyll::Localization::HUMAN_LANGUAGES accordingly!
 == LINKS
 
 <b></b>
-Documentation:: http://rdoc.info/projects/blackwinter/jekyll-localization
+Documentation:: http://blackwinter.github.com/jekyll-localization
 Source code::   http://github.com/blackwinter/jekyll-localization
 RubyGem::       http://rubygems.org/gems/jekyll-localization
 
 
 == AUTHORS
 
-* Jens Wille <mailto:jens.wille@uni-koeln.de>
+* Jens Wille <mailto:jens.wille@gmail.com>
 * Arne Eilermann <mailto:eilermann@lavabit.com>
 
 
@@ -48,6 +48,8 @@ RubyGem::       http://rubygems.org/gems/jekyll-localization
 Copyright (C) 2010-2012 University of Cologne,
 Albertus-Magnus-Platz, 50923 Cologne, Germany
 
+Copyright (C) 2013 Jens Wille
+
 jekyll-localization is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by the
 Free Software Foundation, either version 3 of the License, or (at your option)

data/Rakefile

@@ -9,7 +9,7 @@ begin
       :version      => Jekyll::Localization::VERSION,
       :summary      => %q{Jekyll plugin that adds localization features to the rendering engine.},
       :authors      => ['Jens Wille', 'Arne Eilermann'],
-      :email        => ['jens.wille@uni-koeln.de', 'eilermann@lavabit.com'],
+      :email        => ['jens.wille@gmail.com', 'eilermann@lavabit.com'],
       :homepage     => :blackwinter,
       :dependencies => %w[jekyll-rendering]
     }

data/lib/jekyll/localization.rb

@@ -10,8 +10,10 @@
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # jekyll-localization is free software; you can redistribute it and/or modify #
 # it under the terms of the GNU Affero General Public License as published by #
@@ -46,39 +48,58 @@ module Jekyll
       'fr' => %w[French  Französisch Français]
     }
 
-    DATE_FMT = Hash.new { |h, k| h[k] = '%a %-d %b %Y %M:%M:%S %Z' }.update(
-      'en' => '%a %-d %b %Y %M:%M:%S %p %Z'
-    )
+    # Path to I18n locale files (*.yml).
+    I18N_LOCALES = ENV['I18N_LOCALES'] || File.join(begin
+      [Gem::Specification.find_by_name('rails-i18n').gem_dir, 'rails']
+    rescue LoadError
+      __FILE__.chomp('.rb')
+    end, 'locale')
 
-    DATE_FMT_LONG = Hash.new { |h, k| h[k] = '%-d %B %Y' }.update(
-      'de' => '%-d. %B %Y'
-    )
+    # Cache for I18n locale information.
+    I18N = Hash.new { |h, k|
+      h[k] = YAML.load_file(File.join(I18N_LOCALES, "#{k}.yml"))[k] rescue nil
+    }
 
-    DATE_FMT_SHORT = Hash.new { |h, k| h[k] = '%-d %b %Y' }.update(
-      'de' => '%-d. %b %Y'
-    )
+    class << self
 
-    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]
-    )
+      private
+
+      def i18n(key)  # :nodoc:
+        key = key.split('.')
 
-    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.]
+        Hash.new { |h, k| h[k] = key.inject(I18N[k]) { |i, j|
+          if (v = i[j]).is_a?(Hash) then v else break v end
+        } }
+      end
+
+    end
+
+    TIME_FMT = i18n('time.formats.default').update(
+      'en' => '%a %-d %b %Y %H:%M:%S %p %Z',
+      'de' => '%a %-d %b %Y %H:%M:%S %Z'
     )
 
-    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]
+    # For backwards compatibility.
+    DATE_FMT = TIME_FMT
+
+    DATE_FMT_LONG = i18n('date.formats.long').update(
+      'en' => '%-d %B %Y',
+      'de' => '%-d. %B %Y'
     )
 
-    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.]
+    DATE_FMT_SHORT = i18n('date.formats.short').update(
+      'en' => '%-d %b %Y',
+      'de' => '%-d. %b %Y'
     )
 
-    MERIDIAN = Hash.new { |h, k| h[k] = ['', ''] }.update(
+    MONTHNAMES      = i18n('date.month_names')
+    ABBR_MONTHNAMES = i18n('date.abbr_month_names')
+    DAYNAMES        = i18n('date.day_names')
+    ABBR_DAYNAMES   = i18n('date.abbr_day_names')
+
+    MERIDIAN = Hash.new { |h, k|
+      h[k] = %w[am pm].map { |i| i18n("time.#{i}")[k] }
+    }.update(
       'en' => %w[AM PM]
     )
 
@@ -229,7 +250,9 @@ module Jekyll
 
   end
 
-  class Pagination < Generator
+  parent = const_defined?(:Generators) ? Generators : self
+
+  class parent::Pagination < Generator
 
     include Helpers
 
@@ -277,12 +300,18 @@ module Jekyll
     end
 
     # call-seq:
-    #   t 'default', 'translation', ... => aString (Ruby-style)
-    #   'default' | t: 'translation', ... => aString (Liquid-style)
+    #   t 'default', 'translation', ... => aString (Ruby-style with array)
+    #   'default' | t: 'translation', ... => aString (Liquid-style with array)
+    #   t 'en' => 'default', 'de' => 'translation', ... => aString (Ruby-style with hash)
+    #   { 'en' => 'default', 'de' => 'translation', ... } | t => aString (Liquid-style with hash)
     #
-    # Returns the argument whose position corresponds to the current
-    # language's position in the Localization::LANGUAGES array. If that
-    # particular argument is missing, +default+ is returned.
+    # If array given, returns the argument whose position corresponds to
+    # the current language's position in the Localization::LANGUAGES array.
+    # If that particular argument is missing, +default+ is returned.
+    #
+    # If hash given, returns the value for the current language. If that
+    # particular value is missing, the value for the default language is
+    # returned.
     def translate(*translations)
       translate_lang(lang, *translations)
     end
@@ -292,8 +321,19 @@ module Jekyll
     def translate_lang(lang, *translations)
       translations.flatten!
 
-      index = Localization::LANGUAGES.index(lang)
-      index && translations[index] || translations.first
+      if translations.last.is_a?(Hash)
+        hash = translations.pop
+
+        if translations.empty?
+          hash[key = lang] || hash[key.to_sym] ||
+          hash[key = Localization::LANGUAGES.first] || hash[key.to_sym]
+        else
+          raise ArgumentError, 'both hash and array given'
+        end
+      else
+        index = Localization::LANGUAGES.index(lang)
+        index && translations[index] || translations.first
+      end
     end
 
     alias_method :tl, :translate_lang
@@ -317,14 +357,14 @@ module Jekyll
       # which itself unabashedly stole it from Tadayoshi Funaba's Date class
       res = ''
 
-      fmt.scan(/%[EO]?(.)|(.)/o) { |a, b|
+      fmt.scan(/%[EO]?(.)|(.)/) { |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 'c' then local_date_string(date, Localization::TIME_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

data/lib/jekyll/localization/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-localization
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Jens Wille
@@ -10,27 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-rendering
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Jekyll plugin that adds localization features to the rendering engine.
 email:
-- jens.wille@uni-koeln.de
+- jens.wille@gmail.com
 - eilermann@lavabit.com
 executables: []
 extensions: []
@@ -43,10 +40,11 @@ files:
 - lib/jekyll/localization/version.rb
 - COPYING
 - ChangeLog
-- Rakefile
 - README
+- Rakefile
 homepage: http://github.com/blackwinter/jekyll-localization
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset
@@ -54,27 +52,25 @@ rdoc_options:
 - --line-numbers
 - --all
 - --title
-- jekyll-localization Application documentation (v0.1.6)
+- jekyll-localization Application documentation (v0.1.7)
 - --main
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Jekyll plugin that adds localization features to the rendering engine.
 test_files: []