ri18n 0.0.3 → 0.0.4

data/lib/gettext.rb

@@ -7,10 +7,10 @@ require 'rake'
 require 'rake/tasklib'
 
 class GettextScanner < String
-  SINGLE = "'(.+?)'"
-  DOUBLE = '"(.+?)"'
-  MSG_PATTERN_SINGLE = /\W_i?\(#{SINGLE}\)/mu
-	MSG_PATTERN_DOUBLE = /\W_i?\(#{DOUBLE}\)/mu
+  SINGLE = "'((?:[^\\\\]|(?:\\\\'))+?)'"
+  DOUBLE = '"((?:[^\\\\]|(?:\\\\"))+?)"'
+  MSG_PATTERN_SINGLE = /\W(?:s_|N_|_|_i)\(#{SINGLE}\)/mu
+	MSG_PATTERN_DOUBLE = /\W(?:s_|N_|_|_i)\(#{DOUBLE}\)/mu
   MSG_PATTERN_PLURAL = /\Wn_\(#{SINGLE},\s*#{SINGLE},\s*.+?\)/mu
 	def GettextScanner::Gettext(source)
 		GettextScanner.new(source).gettext

data/lib/ri18n/catalog.rb

@@ -11,7 +11,15 @@ class  Catalog < Hash
     @lang=lang
   end
   
-# in PO, header is defined as empty msgstr
+# creates a catalog with untranslated msgstr
+# lang is l, needed for plural forms (nplural depends on lang)
+  def Catalog.new_from_msgidlist(l, new_msg)
+    c = Catalog.new(l)
+    new_msg.each{|m| c[m] = Msg.new_untranslated(nil, m.id_plural, c.nplural)}
+    c
+  end
+  
+# in PO, header is defined as empty msgid
   def header
     self[""]
   end
@@ -25,7 +33,7 @@ class  Catalog < Hash
     header[:comments]
   end
 
-    
+# returns the formated PO header    
   def po_header(app_enc)
     if header
       ret = header_comments ? header_comments.dup.strip + "\n" : ''
@@ -78,12 +86,9 @@ msgstr ""
   
 # update the catalog with the new_msg messages
   def update(new_msg)
-    new_ids = {}
-    empty_plurals = []
-    nplural.times do empty_plurals << "" end
-    new_msg.each{|m| new_ids[m] = Msg.new("", nil, m.id_plural, empty_plurals )}
+    new_ids = Catalog.new_from_msgidlist(@lang, new_msg)
     new_msg.each{|m| self[m] = new_ids[m] unless self.has_key?(m)}
   end
-
+  
 end
 

data/lib/ri18n/msg.rb

@@ -12,17 +12,22 @@ class Msg < String
         msg = Msg.new(str, com)
         [id, msg]
       else 
-        [id, Msg::Plurals(str, com)]
+        [id, Msg::ParsePlurals(str, com)]
       end
   end
   
   MSGSTR_PLURAL_RE = /(.+?)(msgstr\[\d+\]\s+.+?)+/m
-  def Msg::Plurals(entry, com)
+  def Msg::ParsePlurals(entry, com)
     all, idp, pl = *(MSGSTR_PLURAL_RE.match(entry))
     plurals = pl.strip.split(/msgstr\[\d+\]/).collect!{|mp| mp.strip_q}.compact
     Msg.new(plurals[0], com, idp.strip_q, plurals)
   end
   
+# build a new untranslated msgstr 
+  def Msg::new_untranslated(comments, id_plural, nplural)
+    Msg.new("", comments, id_plural, Array.new(nplural, "") )
+  end
+  
   def initialize(msg, comments, idp=nil, pl=nil)
     super(msg)
     @comments = comments

data/lib/ri18n/po.rb

@@ -54,6 +54,29 @@ class PoSource < String
 
   private
   def set_entries
-    @entries = self.split(ENTRY_SEP)
+
+      newFile = [""]
+
+      self.each_line do |line|
+            if line.chomp.strip == ""
+                  if newFile.last[-2] != '"'[0] and  newFile.last != ""
+                        newFile[-1] = newFile[-1].to_s + line
+                  else
+                        if newFile.last != ""
+                              newFile[-1] = newFile[-1].chomp
+                              newFile.push("")
+                        end
+                  end
+            else
+                  newFile[-1] = newFile[-1].to_s + line
+            end
+      end
+
+      if newFile.last == ""
+            newFile.delete_at(-1)
+      end
+
+      @entries = newFile
   end
+
 end

data/lib/ri18n/translators.rb

@@ -8,6 +8,12 @@ def _(string)
   fetch.empty? ? string : fetch
 end
 
+def s_(string)
+  fetch = I18nService.instance.table.fetch(string, "") 
+  fetch.empty? ? string.split('|').last : fetch
+end
+
+
 # Returns the translated +string+ if available; otherwise returns +string+
 # Does #{} interpolation on the tranlated string
 def _i(string, caller = self)
@@ -30,6 +36,11 @@ def n_(msgid, msgid_plural, n)
 	end
 end
 
+# the 'noop' translator, better named 'message marker'
+def N_(msg)
+  msg
+end
+
 unless i18n.try_load
   i18n.table = {}
 # Default translator used in case where no catalog is loaded.

metadata

@@ -1,48 +1,65 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
-specification_version: 1
 name: ri18n
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2005-05-01
-summary: Ruby application internationalization and localization library
-require_paths: 
-  - lib
-email: dmertz at online dot de
-homepage: http://ri18n.berlios.de/
-rubyforge_project: ri18n
-description: Ri18n is an internationalization and localization library for Ruby applications.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-  version: 
+  version: 0.0.4
 platform: ruby
 authors: 
-  - Denis Mertz
-files: 
-  - lib/i18nservice.rb
-  - lib/gettext.rb
-  - lib/ri18n/po.rb
-  - lib/ri18n/langtools.rb
-  - lib/ri18n/plural_forms.rb
-  - lib/ri18n/translators.rb
-  - lib/ri18n/standard_exts.rb
-  - lib/ri18n/catalog.rb
-  - lib/ri18n/msg.rb
-  - lib/ri18n/pohelper.rb
-  - lib/ri18n/newmsglist.rb
-test_files: []
-rdoc_options: []
-extra_rdoc_files: []
+- Denis Mertz
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-01-06 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: "     Ri18n is an internationalization and localization library for Ruby applications.\n"
+email: dmertz at online dot de
 executables: []
+
 extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- lib/i18nservice.rb
+- lib/ri18n/standard_exts.rb
+- lib/ri18n/pohelper.rb
+- lib/ri18n/plural_forms.rb
+- lib/ri18n/po.rb
+- lib/ri18n/translators.rb
+- lib/ri18n/msg.rb
+- lib/ri18n/newmsglist.rb
+- lib/ri18n/catalog.rb
+- lib/ri18n/langtools.rb
+- lib/gettext.rb
+has_rdoc: true
+homepage: http://ri18n.berlios.de/
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: 
-  - Rake
-dependencies: []
+- Rake
+rubyforge_project: ri18n
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: Ruby application internationalization and localization library
+test_files: []
+