jekyll-multiple-languages 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37014369977d7cae2b4ab030f140d34a36283703
-  data.tar.gz: d00fd1b80de40d57bd154b30631a17e8e2081b4b
+  metadata.gz: dceec3b9f537809ad9a13c1b9365f2e093b9c3a4
+  data.tar.gz: e8ae9840c963a672de0336850bc049bcd1c09c3a
 SHA512:
-  metadata.gz: 45743cc76873f8e3da56d5ecf46a9c5df647ef38d957a11f3865797ad3a7109373f7e10a7b315736efa74f801dfa89995f8960b402726c58726e8d32567a52f4
-  data.tar.gz: 296856ed323cecf234dc77598c1fb96c93578c0a2df5e078ad878485fe8b7b0b79af7a171a04f0c23742f3b7d96bb6583be97b96c63bf92a86a91de7d73f7685
+  metadata.gz: 0eff793caeb0b12ce11324a0434e5de19c3d12b921a7e6e25ba46242e036c765a029526c0d88d96bbee628247a56e23e4f6c0ea7312f49901d09384086f7a6ea
+  data.tar.gz: 38e3ec0a1b021513ce2cbfbc9a3a07535b7dc92314e94e9ba1ef4a3e6fd2338ff5e76949f7f2580b499e2804185c38133e43b3d7f7c0084ee4741820be912e2a

data/lib/jekyll-multiple-languages/multilang.rb

@@ -10,10 +10,15 @@ module Jekyll
       # xxx.$lang.md / $lang.xxx.md
       lang = nil
       site.config['languages'].each{ |item|
-        lang_str = item + '.'
+
+        if name.start_with? (item + '.') or name.include? ('/' + item + '.')
+          raise RuntimeError, "This kind of name is not supported any longer: '#{name}', which starts with '$lang'"
+        end
+
+        lang_str = '.' + item + '.'
         if name_no_language.include? lang_str
           lang = item
-          name_no_language.slice! lang_str
+          name_no_language.slice! lang + '.'
         end
       }
 
@@ -25,6 +30,9 @@ module Jekyll
     end
 
     def url_no_language
+      if not @url_no_language
+        url
+      end
       @url_no_language
     end
 

data/lib/jekyll-multiple-languages/site.rb

@@ -3,7 +3,7 @@ module Jekyll
   # Rewrite Jekyll.site
   #
   class Site
-    attr_accessor :language_default, :languages, :posts_by_language, :pages_by_language, :fill_default_content
+    attr_accessor :language_default, :languages, :posts_by_language, :pages_by_language
 
     alias :process_org :process
     def process
@@ -17,54 +17,45 @@ module Jekyll
     alias :read_org :read
     def read
       read_org
-      group_posts_and_pages
+    end
+
+    alias :generate_org :generate
+    def generate
+      group_posts
+      generate_org
+      group_pages
     end
 
     # Group the post by the language
     #
-    def group_posts_and_pages
-      lang_default = self.language_default
-      langs_remain = self.languages.dup
-      langs_remain.delete(lang_default)
-
-      @posts_by_language = {}
-      @pages_by_language = {}
-
-      self.languages.dup.each { |lang|
-        @posts_by_language[lang] ||= {}
-        @pages_by_language[lang] ||= {}
-      }
-
+    def group_posts
       self.posts.docs.each {|post|
         @posts_by_language[post.language][post.url_no_language] = post
       }
-      self.pages.each {|page|
-        # @pages_by_language[page.language][page.url_no_language] = page
-      }
-
-      if (@fill_default_content)
-        self.fill_default_content(@posts, @posts_by_language, lang_default, langs_remain, Post)
-        self.fill_default_content(@pages, @pages_by_language, lang_default, langs_remain, Page)
-      end
     end
 
-    def fill_default_content(contents, grouped_contents, default, targets, kclass)
-      grouped_contents[default].select{|k,v| !v.data['no_fill_default_content']}.each{ |k, content|
-        targets.each{|lang|
-          if !grouped_contents[lang][k]
-            c = kclass.new(self, @source, content.dir_source, content.name)
-            c.language = lang
-            c.is_default_language = false
-            grouped_contents[lang][k] = c
-            contents << c
-          end
-        }
+    # Group the pages by the language
+    #
+    def group_pages
+      self.pages.each {|page|
+        @pages_by_language[page.language][page.url_no_language] = page
       }
     end
 
     # Only when site is initialized, this plugin will be loaded
     def begin_inject
+
       self.update_config(self.config)
+
+      # initialize
+      @posts_by_language = {}
+      @pages_by_language = {}
+
+      self.languages.dup.each { |lang|
+        @posts_by_language[lang] ||= {}
+        @pages_by_language[lang] ||= {}
+      }
+
     end
 
     # Update config, process languages and language_default options.
@@ -77,7 +68,7 @@ module Jekyll
       # set the default value of `i18ndir` to `_i18n`
       config['i18ndir'] ||= "_i18n";
 
-      %w[languages language_default fill_default_content].each do |opt|
+      %w[languages language_default].each do |opt|
         self.send("#{opt}=", config[opt])
       end
     end
@@ -85,11 +76,20 @@ module Jekyll
     # add `posts_by_language` and `pages_by_language`
     alias :site_payload_org :site_payload
     def site_payload
+
       original = site_payload_org
+
+      posts_by_language = {}
+      pages_by_language = {}
+      self.languages.dup.each { |lang|
+        posts_by_language[lang] = @posts_by_language[lang].values.sort { |a, b| b <=> a }
+        pages_by_language[lang] = @pages_by_language[lang].values
+      }
+
       payload = original['site']
       payload = payload.merge({
-        'posts_by_language' => self.posts_by_language,
-        'pages_by_language' => self.pages_by_language
+        'posts_by_language' => posts_by_language,
+        'pages_by_language' => pages_by_language
       })
       original['site'] = payload
       original

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - srain