jekyll-multiple-languages-plugin 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c62b83447dfb672db4e214ae3e9d64bad83788e
-  data.tar.gz: d1db48cc7b9a2f8cd2a67c5bb5bd9b860f10a3cf
+  metadata.gz: bbcdc906fcb48165b18fa9a718fcd0eb884e9930
+  data.tar.gz: 29e2b75850e04368daa5a44d122120a786b46d53
 SHA512:
-  metadata.gz: e2230b6922100d16fdd678e6b68e1a520c1256d85241bee74260941aff41b5c5b5e37603d3e6c396821bca39fe5ca4e93add4b00f5d0a60c8ae618442a22aec0
-  data.tar.gz: ebb45c393fdfeb2bb927dfbe554a5203b6b305527aee5c8feb2d1337238ec896a44ce3c067ec2714f93a48e95e0d4dd3f4d9ee31e949a726c591c6645ad341da
+  metadata.gz: 8ce1a9bd7dbae43dfed4787f63e8a42f652e6c6d0542fe1998106b8e39b0410c5b82c3dc45a0c572c8e1e72126e40b24d4f5cac1922603f60c13dc4224b62b6c
+  data.tar.gz: 5c03f7adfe4c8febe35828627baeabba049ce1873cf82e20a0eac646c12fad6e85ea65132882d3f903d487f534dc452a38536ac6aff344a98265042474ae448b

data/README.md

@@ -60,17 +60,19 @@ Copy or link the file `lib/jekyll/multiple/languages/plugin.rb` into your `_plug
 * Supports translated template files
 
 ##Changelog
-  1.2.5
-    Fixed a bug when global variables wasn't as global as expected
-  1.2.4
-    Fixed a bug when changes in .yml files got lost during live reload.
-  1.2.3
-    Much, much, much faster compilation when lots of translated strings.
+* 1.2.6
+  * Added fallback to default language, thanks to [@agramian](https://github.com/agramian)
+* 1.2.5
+  * Fixed a bug when global variables wasn't as global as expected
+* 1.2.4
+  * Fixed a bug when changes in .yml files got lost during live reload.
+* 1.2.3
+  * Much, much, much faster compilation when lots of translated strings.
 * 1.2.2
   * Supports translated posts in Octopress
 * 1.2.1
   * Supports writing translated posts in Jekyll
-  * Supports Octopress
+  * Supports translated .yml files in Octopress
 * 1.2.0
   * Renamed the project to jekyll-multiple-languages-plugin
 * 1.1.2
@@ -221,3 +223,8 @@ This snippet will create a link that will toggle between Swedish and English. A
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+### Contributors
+- [Bersch](https://github.com/bersch), better paths
+- [Davrandom](https://github.com/davrandom), plugin usage example
+- [agramian](https://github.com/agramian), fallback to default language

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

@@ -21,7 +21,7 @@ module Jekyll
       dest_org = self.dest
 
       #Loop
-      self.config['lang'] = languages.first
+      self.config['lang'] = self.config['default_lang'] = languages.first
       puts
       puts "Building site for default language: \"#{self.config['lang']}\" to: #{self.dest}"
       process_org
@@ -71,12 +71,12 @@ module Jekyll
         Jekyll.langs[lang] = YAML.load_file("#{context.registers[:site].source}/_i18n/#{lang}.yml")
       end
       translation = Jekyll.langs[lang].access(key) if key.is_a?(String)
-      if translation.empty?
+      if translation.nil? or translation.empty?
+        translation = Jekyll.langs[context.registers[:site].config['default_lang']].access(key)
         puts "Missing i18n key: #{lang}:#{key}"
-        "*#{lang}:#{key}*"
-      else
-        translation
+        puts "Using translation '%s' from default language: %s" %[translation, context.registers[:site].config['default_lang']]
       end
+      translation
     end
   end
 

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

@@ -2,7 +2,7 @@ module Jekyll
   module Multiple
     module Languages
       module Plugin
-        VERSION = "1.2.5"
+        VERSION = "1.2.6"
       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.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Martin Kurtsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler