gettext_simple 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 160fe8d8a9f477f0b81264bc7505a02dc015b10b
-  data.tar.gz: c29d0a464ca361ad747ea9e018dbd803d113176d
+  metadata.gz: e43070b335b7174bf71fbb327f5fd561e4ea3138
+  data.tar.gz: 71c72e671bdb466f1ab9a5d4dd4ff04855e176e4
 SHA512:
-  metadata.gz: 20b8d3e2847981c4b12f9c99fd7cc7659f45c03316b08a8f29cb26a5a252e6fdf330c5ba5a393a8003a3c3f6368831fe579e1eb66a802588abb039e5c4c8c0b3
-  data.tar.gz: dd48e51243a04a8b5d06f1b0c08b4288e11c3beff410c4e2723f617677a32041756a1327a64d4269cb0300ac09bff56308d45a0db98ff2aa52ff190d4a3a2607
+  metadata.gz: 9c153f4b4a9b558445d11ebe3f8b0457ae74e5b0a27a120ff94e720c522e033fd4595d8632097db1f79318c2cc5ee9e5471bc0adbe413f20f356c68993806b6a
+  data.tar.gz: 4509cddc233d9f337c0216c29d29aaeac21337a232a925853255ac461767d97e4aecd4d6405e9bfd10fcc910c122591098dba04fc80d953f824675dcf27f1597

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/gettext_simple.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gettext_simple"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/lib/gettext_simple.rb

@@ -8,6 +8,7 @@ class GettextSimple
       :default_locale => "en"
     }.merge(args)
     @locales = {}
+    @debug = @args[:debug]
     
     # To avoid doing a hash lookup on every translate.
     @i18n = @args[:i18n]
@@ -37,20 +38,26 @@ class GettextSimple
     check_folders = ["LC_MESSAGES", "LC_ALL"]
     
     Dir.foreach(dir) do |file|
+      debug "New locale folder found: '#{file}'." if @debug
+      
       fn = "#{dir}/#{file}"
-      if File.directory?(fn) && file.match(/^[a-z]{2}/)
-        @locales[file] = {} unless @locales[file]
+      if !File.directory?(fn) || !file.match(/^[a-z]{2}/)
+        debug "Skipping: '#{file}'." if @debug
+        next
+      end
+      
+      @locales[file] = {} unless @locales[file]
+      
+      check_folders.each do |fname|
+        fpath = "#{dir}/#{file}/#{fname}"
+        next if !File.exists?(fpath) || !File.directory?(fpath)
+        debug "Found subfolder in '#{file}': '#{fname}'." if @debug
         
-        check_folders.each do |fname|
-          fpath = "#{dir}/#{file}/#{fname}"
-          
-          if File.exists?(fpath) && File.directory?(fpath)
-            Dir.foreach(fpath) do |pofile|
-              if pofile.match(/\.po$/)
-                pofn = "#{dir}/#{file}/#{fname}/#{pofile}"
-                scan_pofile(file, pofn)
-              end
-            end
+        Dir.foreach(fpath) do |pofile|
+          if pofile.match(/\.po$/)
+            debug "Starting to parse '#{pofile}'." if @debug
+            pofn = "#{dir}/#{file}/#{fname}/#{pofile}"
+            scan_pofile(file, pofn)
           end
         end
       end
@@ -78,12 +85,14 @@ class GettextSimple
       end
     end
     
+    debug "Translation with locale '#{locale}' and replaces '#{replaces}': '#{str}' to '#{translated_str}'." if @debug
+    
     return translated_str
   end
   
   def translate(str, replaces = nil)
     if @i18n
-      locale = I18n.locale
+      locale = I18n.locale.to_s
     elsif locale = Thread.current[:gettext_simple_locale]
       # Locale already set through condition.
     else
@@ -99,6 +108,10 @@ class GettextSimple
   end
   
 private
+
+  def debug(str)
+    $stderr.puts str if @debug
+  end
   
   def scan_pofile(locale, filepath)
     current_id = nil
@@ -107,6 +120,7 @@ private
     reading_id = false
     reading_translation = false
     
+    debug "Opening file for parsing: '#{filepath}' in locale '#{locale}'." if @debug
     File.open(filepath, "r", :encoding => @args[:encoding]) do |fp|
       fp.each_line do |line|
         if match = line.match(/^(msgid|msgstr)\s+"(.*)"$/)
@@ -150,6 +164,10 @@ private
   
   def add_translation(locale, key, val)
     raise "No such language: '#{locale}'." unless @locales.key?(locale)
-    @locales[locale][key] = val unless val.to_s.empty?
+    
+    if !key.to_s.empty? && !val.to_s.empty?
+      debug "Found translation for locale '#{locale}' '#{key}' which is: '#{val}'." if @debug
+      @locales[locale][key] = val
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_simple
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kasper Johansen