jekyll-gettext-plugin 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d292cf009ec4387d1337d7903f914d61720bf2
-  data.tar.gz: ddb1256b89b00ed331c8ece5d781dcce19c9a9a4
+  metadata.gz: 1716d592cfa9aa978f06d9627be07fe01e56e715
+  data.tar.gz: 83179f3b398ab399692bd03a6c42396556b92b70
 SHA512:
-  metadata.gz: 503c986408329d0dad2582c59a5b0b1e9ff3d408076bbf5a34680182e773df8310429f454a1b6f7747ceba053753ed359e9f67b81d1a5ca9dab99d6c41aa919c
-  data.tar.gz: 63c24f2ce739e37af085419807834a01cd1debcf1247c799e1f4f88fea1dd80a54782795deee8b35e93785dd2acc19c97869e37be9fbb4d9cf5ebe8df742d294
+  metadata.gz: 4b3b49c5f887e17f2b253ef5c470ca3baa24736bd840f10cced0d4a22f7c8fef0ed3e35aa9f18bc0cdd4b48d4113a96130ea96309c9e8b22c77839b123c70c12
+  data.tar.gz: ddaeacc634bd6622e39dbe07c8907c77f671316d8afa31f7b4e4e861aac98202e191608a0392a97aa2893fe861f3aab7ce137d2ced0a7ae6f5758436288fd934

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-gettext-plugin (0.0.1)
+    jekyll-gettext-plugin (0.0.2)
       fast_gettext (~> 0.8)
       get_pomo (~> 0.6)
 

data/README.md

@@ -20,11 +20,14 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+- In _config.yml, add a languages array where the first one is your primary language, for example `languages: ["ja", "ja", "en"]`
+- For each language, make sure there is a po file in `_i18n/<LANG>/<LANG>.po`. So if you're doing japanese translations for the first time you'd do something like `mkdir -p _i18n/ja && touch _i18n/ja/ja.po`
+- Use tags that look like this {% t hey there! %} in your web pages
+- Any time jekyll builds, the plugin will add any new keys to the po file. Fill these in and rebuild to see the translated website. Each translated website is served at a url relative to that language, IE `http://localhost:8080/ja/`, `http://localhost:8080/en/`, etc.
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/jekyll-gettext-plugin/fork )
+1. Fork it ( http://github.com/Stonelinks/jekyll-gettext-plugin/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/jekyll/gettext/plugin/version.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Gettext
     module Plugin
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/lib/jekyll/gettext/plugin.rb

@@ -3,9 +3,24 @@ require "jekyll/gettext/plugin/version"
 require 'fast_gettext'
 require 'get_pomo'
 
-# require 'pry'
+require 'pry'
+
+class TranslationLogger
+  def initialize
+    @translations = []
+  end
+  
+  def get_translations
+    return @translations
+  end
+  
+  def call(unfound)
+    @translations.push(unfound)
+  end
+end
 
 module Jekyll
+
   class Site
     
     alias :process_org :process
@@ -22,19 +37,22 @@ module Jekyll
 
       # loop
       self.config['lang'] = languages.first
-      self.load_translations
       puts
       puts "Building site for default language: \"#{self.config['lang']}\" to: " + self.dest
+      self.load_translations
       process_org
+      self.save_missing_translations
+      
       languages.drop(1).each do |lang|
 
         # build site for language lang
         self.dest = self.dest + "/" + lang
         self.config['baseurl'] = self.config['baseurl'] + "/" + lang
         self.config['lang'] = lang
-        self.load_translations
         puts "Building site for language: \"#{self.config['lang']}\" to: " + self.dest
+        self.load_translations
         process_org
+        self.save_missing_translations
 
         # reset variables for next language
         self.dest = dest_org
@@ -43,16 +61,45 @@ module Jekyll
       puts 'Build complete'
     end
 
-    # TODO:
-    # parse the po file and store it in site whenever lang changes
-    # if a key is missing, add it to a list on site object
-    # when site is done processing, write back to po file
-
     def load_translations
-      FastGettext.add_text_domain(self.config['lang'], :path => self.source + "/_i18n", :type => :po)
+      @all_translations = TranslationLogger.new
+      @missing_translations = TranslationLogger.new
+
+      repos = [
+        FastGettext::TranslationRepository.build(self.config['lang'], :type=>:logger, :callback=>@all_translations),
+        FastGettext::TranslationRepository.build(self.config['lang'], :type=>:logger, :callback=>@missing_translations),
+        FastGettext::TranslationRepository.build(self.config['lang'], :path => self.source + "/_i18n", :type => :po)
+      ]
+      FastGettext.add_text_domain(self.config['lang'], :type=>:chain, :chain=>repos)
+
       FastGettext.text_domain = self.config['lang']
       FastGettext.locale = self.config['lang']
     end
+
+    def save_missing_translations
+      filename = self.source + "/_i18n/" + self.config['lang'] + '/' + self.config['lang'] + '.po'
+      existing_translations = GetPomo.unique_translations(GetPomo::PoFile.parse(File.read(filename)))
+      
+      # ignores any keys that already exist
+      missing_translations_msgids = @missing_translations.get_translations.reject {|msgid| existing_translations.find {|trans| trans.msgid == msgid}}
+      
+      final_translations = existing_translations
+      
+      missing_translations_msgids.each do |new_msgid|
+        new_trans = GetPomo::Translation.new
+        new_trans.msgid = new_msgid
+        new_trans.msgstr = ""
+        final_translations.push(new_trans)
+      end
+      
+      # uncomment this to remove translations that were not used
+      # not_used = final_translations.reject { |trans| @all_translations.get_translations.find {|msgid| trans.msgid == msgid}}
+      # final_translations = final_translations.reject {|trans1| not_used.find {|trans2| trans1.msgid == trans2.msgid}}
+      
+      final_translations.sort_by!(&:msgid)
+      
+      File.open(filename, 'w'){|f|f.print(GetPomo::PoFile.to_text(final_translations))}
+    end
   end
 
   class LocalizeTag < Liquid::Tag
@@ -64,20 +111,10 @@ module Jekyll
     end
 
     def render(context)
-      if "#{context[@key]}" != "" # check for page variable
-        key = "#{context[@key]}"
-      else
-        key = @key
-      end
-      candidate = _(key)
-
-      # binding.pry
-
-      lang = context.registers[:site].config['lang']
+      candidate = _(@key)
 
-      if candidate == key and lang != 'en'
-        puts "Missing i18n key: " + lang + ":" + key
-        "*" + lang + ":" + key + "*"
+      if candidate == ""
+        candidate = @key
       end
       candidate
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gettext-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Lucas Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext