jekyll-multiple-languages-plugin 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe3855f441762da2b1d4a9737a2e273bac6a639d
-  data.tar.gz: aab8762a89829c8b565831f9727ff7c02710784c
+  metadata.gz: 6187612df275e2d51d0e6f5f99963febe2333679
+  data.tar.gz: fc44bb0d56f3e24b2f56fc01b7aa0d13518c36c7
 SHA512:
-  metadata.gz: c696bf500206369ab839d2649dfa7a44f268c0897ac61a4dce146c4467de208fe42efe660be6254ea44fbb0683e2442810d82bb0cce904148253e20052abd0ef
-  data.tar.gz: 5564ef20925fa8cbdadd669aae6db1a9b51d8d7d34c6d9036d4e0f23afbe1d569f558c6a393eabe6e88c094df66fb99b515e8b557db1057a940fc5d6bd4cfa7e
+  metadata.gz: 8e1f9008fb309d343c0134f780cecefac777f0f063d35d20f4ec248ab0747a689ec12fba7919c05141339ac8ef61b9881d2fc16514fd03df672871e8461d18e7
+  data.tar.gz: d7ed899954f8d9c65e6b70c47ce4dcc078862d741bd9c54e880f801031418c0d21a148ba8676e40a15140a98cb9b79be9050f277631fc5bef1f2ea50fd6198a0

data/README.md

@@ -12,19 +12,19 @@ This plugin is available as a Rubygem, https://rubygems.org/gems/jekyll-multiple
 
 Add this line to your application's Gemfile:
 
-  gem 'jekyll-multiple-languages-plugin'
-
-And then execute:
-
-  $ bundle
+```
+gem 'jekyll-multiple-languages-plugin'
+```
 
-Or install it yourself as:
+And then execute: `$ bundle`
 
-  $ gem install jekyll-multiple-languages-plugin
+Or install it yourself as: `$ gem install jekyll-multiple-languages-plugin`
 
 To activate the plugin add this line in to a *.rb file in the _plugins directory:
-    
-  require 'jekyll/multiple/languages/plugin'
+
+```ruby
+require 'jekyll/multiple/languages/plugin'
+```
 
 
 ### Submodule
@@ -33,18 +33,22 @@ manage your plugins by utilizing git submodules.
 
 To install this plugin as a git submodule:
 
-  git submodule add git://github.com/screeninteraction/jekyll-multiple-languages-plugin.git _plugins/multiple-languages
+```sh
+$ git submodule add git://github.com/screeninteraction/jekyll-multiple-languages-plugin.git _plugins/multiple-languages
+```
 
 To update:
 
-  cd _plugins/multiple-languages
-  git pull origin master
+```sh
+$ cd _plugins/multiple-languages
+$ git pull origin master
+```
 
 
 ### Copy file
 Copy or link the file `lib/jekyll/multiple/languages/plugin.rb` into your `_plugins` folder for your Jekyll project.
 
-    
+
 ##Features
 * Supports multiple languages with the same code base.
 * Supports all template languages that your Liquid pipeline supports.
@@ -56,6 +60,8 @@ Copy or link the file `lib/jekyll/multiple/languages/plugin.rb` into your `_plug
 * Supports translated template files
 
 ##Changelog
+  1.2.3
+    Much, much, much faster compilation when lots of translated strings.
 * 1.2.2
   * Supports translated posts in Octopress
 * 1.2.1
@@ -77,7 +83,7 @@ Copy or link the file `lib/jekyll/multiple/languages/plugin.rb` into your `_plug
 ###Configuration
 Add the i18n configuration to your _config.yml:
 
-```yaml	
+```yaml
 languages: ["sv", "en", "de", "fr"]
 ```
 
@@ -97,12 +103,12 @@ Create this folder structure in your Jekyll project as an example:
 
 To add a string to your site use one of these
 
-```liquid	
+```liquid
 {% t key %}
-or 
+or
 {% translate key %}
 ```
-	
+
 Liquid tags. This will pick the correct string from the `language.yml` file during compilation.
 
 The language.yml files are written in YAML syntax which caters for a simple grouping of strings.
@@ -115,31 +121,31 @@ pages:
 	home: Home
 	work: Work
 ```
-	
+
   To access the english key, use this tag:
 
-```liquid  	
-{% t global.english %} 
-or 
+```liquid
+{% t global.english %}
+or
 {% translate global.english %}
 ```
-  	
-The plugin also supports using different markdown files for different languages using the 
 
-```liquid	
-{% tf pagename/blockname.md %} 
-or 
+The plugin also supports using different markdown files for different languages using the
+
+```liquid
+{% tf pagename/blockname.md %}
+or
 {% translate_file pagename/blockname.md %}
 ```
 
 This plugin have exactly the same support and syntax as the built in
 
-```liquid	
+```liquid
 {% include file %}
 ```
 
 tag, so plugins that extends its functionality should be picked up by this plugin as well.
-  
+
 ###i18n in templates
 Sometimes it is convenient to add keys even in template files. This works in the exact same way as in ordinary files, however sometimes it can be useful to include different string in different pages even if they use the same template.
 
@@ -152,34 +158,34 @@ A perfect example is this:
 	</head>
 </html>
 ```
-	
+
 So how can I add different translated titles to all pages? Don't worry, it's easy. The Multiple Languages plugin supports Liguid variables as well as strings so define a page variable in your page definition
 
 ```yaml
---- 
+---
 layout: default
 title: titles.home
---- 
-```	
-	
+---
+```
+
 and `<title>{% t page.title %}</title>` will pick up the `titles.home` key from `language.yml`
 
-```yaml	
+```yaml
 titles:
 	home: "Home"
 ```
-		
+
 ##Link between languages
 This plugin gives you the variables
-	
+
 ```liquid
 {{ page.lang }}
-	
+
 and
-	
+
 {{ site.baseurl_root }}
 ```
-	
+
 to play with in your template files.
 
 This allows you to create solutions like this:

data/lib/jekyll/multiple/languages/plugin.rb

@@ -16,7 +16,7 @@ module Jekyll
       #Loop
       self.config['lang'] = languages.first
       puts
-      puts "Building site for default language: \"#{self.config['lang']}\" to: " + self.dest
+      puts "Building site for default language: \"#{self.config['lang']}\" to: #{self.dest}"
       process_org
       languages.drop(1).each do |lang|
 
@@ -24,7 +24,7 @@ module Jekyll
         self.dest = self.dest + "/" + lang
         self.config['baseurl'] = self.config['baseurl'] + "/" + lang
         self.config['lang'] = lang
-        puts "Building site for language: \"#{self.config['lang']}\" to: " + self.dest
+        puts "Building site for language: \"#{self.config['lang']}\" to: #{self.dest}"
         process_org
 
         #Reset variables for next language
@@ -33,7 +33,7 @@ module Jekyll
       end
       puts 'Build complete'
     end
-    
+
     alias :read_posts_org :read_posts
     def read_posts(dir)
       if dir == ''
@@ -49,6 +49,7 @@ module Jekyll
     def initialize(tag_name, key, tokens)
       super
       @key = key.strip
+      @@langs ||= {}
     end
 
     def render(context)
@@ -58,21 +59,16 @@ module Jekyll
         key = @key
       end
       lang = context.registers[:site].config['lang']
-      candidate = YAML.load_file(context.registers[:site].source + "/_i18n/#{lang}.yml")
-      path = key.split(/\./) if key.is_a?(String)
-      while !path.empty?
-        key = path.shift
-        if candidate[key]
-          candidate = candidate[key]
-        else
-          candidate = ""
-        end
+      unless @@langs.has_key?(lang)
+        puts "Loading translation from file #{context.registers[:site].source}/_i18n/#{lang}.yml"
+        @@langs[lang] = YAML.load_file("#{context.registers[:site].source}/_i18n/#{lang}.yml")
       end
-      if candidate == ""
-        puts "Missing i18n key: " + lang + ":" + key
-        "*" + lang + ":" + key + "*"
+      translation = @@langs[lang].access(key) if key.is_a?(String)
+      if translation.empty?
+        puts "Missing i18n key: #{lang}:#{key}"
+        "*#{lang}:#{key}*"
       else
-        candidate
+        translation
       end
     end
   end
@@ -121,6 +117,23 @@ module Jekyll
   end
 end
 
+unless Hash.method_defined? :access
+  class Hash
+    def access(path)
+      ret = self
+      path.split('.').each do |p|
+        if p.to_i.to_s == p
+          ret = ret[p.to_i]
+        else
+          ret = ret[p.to_s] || ret[p.to_sym]
+        end
+        break unless ret
+      end
+      ret
+    end
+  end
+end
+
 Liquid::Template.register_tag('t', Jekyll::LocalizeTag)
 Liquid::Template.register_tag('translate', Jekyll::LocalizeTag)
 Liquid::Template.register_tag('tf', Jekyll::Tags::LocalizeInclude)

data/lib/jekyll/multiple/languages/plugin/version.rb

@@ -2,7 +2,7 @@ module Jekyll
   module Multiple
     module Languages
       module Plugin
-        VERSION = "1.2.2"
+        VERSION = "1.2.3"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages-plugin
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Martin Kurtsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: I18n plugin for Jekyll and Octopress