gettext 1.90.0 → 1.91.0

data/lib/gettext/textdomain.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: textdomain.rb,v 1.23 2008/01/19 17:07:02 mutoh Exp $
+  $Id: textdomain.rb,v 1.24 2008/03/31 06:26:47 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -76,25 +76,25 @@ module GetText
       @locale_paths = []
       if ENV["GETTEXT_PATH"]
         ENV["GETTEXT_PATH"].split(/,/).each {|i| 
-	  @locale_paths += ["#{i}/%{locale}/LC_MESSAGES/%{name}.mo", "#{i}/%{locale}/%{name}.mo"]
-	}
+      @locale_paths += ["#{i}/%{locale}/LC_MESSAGES/%{name}.mo", "#{i}/%{locale}/%{name}.mo"]
+    }
       elsif @topdir
         @locale_paths += ["#{@topdir}/%{locale}/LC_MESSAGES/%{name}.mo", "#{@topdir}/%{locale}/%{name}.mo"]
       end
 
       unless @topdir
-	@locale_paths += DEFAULT_LOCALE_PATHS
-	
-	if defined? Gem
-	  $:.each do |path|
-	    if GEM_PATH_RE =~ path
-	      @locale_paths += [
-		"#{$1}/data/locale/%{locale}/LC_MESSAGES/%{name}.mo", 
-		"#{$1}/data/locale/%{locale}/%{name}.mo", 
-		"#{$1}/locale/%{locale}/%{name}.mo"]
-	    end
-	  end
-	end
+    @locale_paths += DEFAULT_LOCALE_PATHS
+    
+    if defined? Gem
+      $:.each do |path|
+        if GEM_PATH_RE =~ path
+          @locale_paths += [
+        "#{$1}/data/locale/%{locale}/LC_MESSAGES/%{name}.mo", 
+        "#{$1}/data/locale/%{locale}/%{name}.mo", 
+        "#{$1}/locale/%{locale}/%{name}.mo"]
+        end
+      end
+    end
       end
    
       @mofiles = Hash.new
@@ -152,9 +152,9 @@ module GetText
       key = msgid + "\000" + msgid_plural
       msg = gettext(key)
       if ! msg
-	nil  # do nothing.
+    nil  # do nothing.
       elsif msg == key
-	msg = n == 1 ? msgid : msgid_plural
+    msg = n == 1 ? msgid : msgid_plural
       elsif msg.include?("\000")
         ary = msg.split("\000")
         if @current_mo
@@ -203,35 +203,38 @@ module GetText
     def load_mo(reload = false)
       @current_mo = nil
       return nil unless @current_locale
+
       unless reload
-	@current_mo = @mofiles[@current_locale]
-	if @current_mo
-	  if @current_mo == :empty
-	    @current_mo = nil
-	    return nil unless (@@check_mo or $DEBUG)
-	  elsif (@@check_mo or $DEBUG)
-	    @current_mo.update!
-	    return @current_mo
-	  else
-	    return @current_mo
-	  end
-	end
+        @current_mo = @mofiles[@current_locale]
+        if @current_mo
+          if @current_mo == :empty
+            @current_mo = nil
+            return nil unless (@@check_mo or $DEBUG)
+          elsif (@@check_mo or $DEBUG)
+            @current_mo.update!
+            return @current_mo
+          else
+            return @current_mo
+          end
+        end
       end
       locales = [@current_locale.orig_str, @current_locale.to_posix, @current_locale.language].uniq
       matched = false
       @locale_paths.each do |dir|
-	locales.each{|locale|
-	  fname = dir % {:locale => locale, :name => @name}
-	  @search_files << fname
-	  if File.exist?(fname)
-	    $stderr.puts "GetText::TextDomain#load_mo: mo file is #{fname}" if $DEBUG
-	    @current_mo = MOFile.open(fname, @current_locale.charset)
-	    @mofiles[@current_locale] = @current_mo
-	    matched = true
-	    break
-	  end
-	}
-	break if matched
+        locales.each{|locale|
+          fname = dir % {:locale => locale, :name => @name}
+          if $DEBUG
+            @search_files << fname unless @search_files.include?(fname)
+          end
+          if File.exist?(fname)
+            $stderr.puts "GetText::TextDomain#load_mo: mo file is #{fname}" if $DEBUG
+            @current_mo = MOFile.open(fname, @current_locale.charset)
+            @mofiles[@current_locale] = @current_mo
+            matched = true
+            break
+          end
+        }
+        break if matched
       end
       unless @current_mo
         @mofiles[@current_locale] = :empty

data/lib/gettext/utils.rb

@@ -19,8 +19,11 @@ require 'gettext/rmsgfmt'
 require 'fileutils'
 
 module GetText
+  bindtextdomain "rgettext"
+
   module_function
 
+
   # Merges two Uniforum style .po files together. 
   #
   # *Note* This function requires "msgmerge" tool included in GNU GetText. So you need to install GNU GetText. 
@@ -47,6 +50,10 @@ module GetText
 
     cont = ""
     if FileTest.exist? defpo
+      `#{cmd} --version`
+      unless $?.success?
+        raise _("`#{cmd}' may not be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly.")
+      end
       cont = `#{cmd} #{defpo} #{refpo}`
     else
       File.open(refpo) do |io| 
@@ -58,7 +65,7 @@ module GetText
       FileUtils.cp(refpo, failed_filename)
       $stderr.puts _("Failed to merge with %{defpo}") % {:defpo => defpo}
       $stderr.puts _("New .pot was copied to %{failed_filename}") %{:failed_filename => failed_filename}
-      raise _("`#{cmd}' may not be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly.")
+      raise _("Check these po/pot-files. It may have syntax errors or something wrong.")
     else
       cont.sub!(/(Project-Id-Version\:).*$/, "\\1 #{app_version}\\n\"")
       File.open(defpo, "w") do |out|

data/lib/gettext/version.rb

@@ -2,11 +2,11 @@
 =begin
   version - version information of Ruby-GetText-Package
 
-  Copyright (C) 2005-2007 Masao Mutoh
+  Copyright (C) 2005-2008 Masao Mutoh
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "1.90.0"
+  VERSION = "1.91.0"
 end

data/lib/locale/jruby.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: jruby.rb,v 1.2 2007/11/08 16:44:22 mutoh Exp $
+  $Id: jruby.rb,v 1.3 2008/03/21 06:28:10 mutoh Exp $
 =end
 
 require 'locale/base'
@@ -21,14 +21,14 @@ module Locale
     if java.lang.System.getProperties['os.name'].downcase =~ /windows/
       require 'locale/win32_table'
 
-      extend SystemWin32Table
+      extend ::Locale::SystemWin32Table
     end
 
     module_function
     def default_locale  #:nodoc:
       locale = java.util.Locale.getDefault
       charset = java.nio.charset.Charset.defaultCharset.name
-      Locale::Object.new(locale, nil, charset)
+      Locale::Object.new(locale.to_s, nil, charset)
     end
   end
   @@locale_system_module = SystemJRuby

data/lib/locale/win32.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: win32.rb,v 1.4 2008/02/02 16:47:40 mutoh Exp $
+  $Id: win32.rb,v 1.5 2008/03/21 06:28:10 mutoh Exp $
 =end
 
 require 'locale/base'
@@ -18,6 +18,7 @@ module Locale
   # This is a low-level class. Application shouldn't use this directly.
   module SystemWin32
     extend SystemBase
+    include SystemWin32Table
 
     @@default_locale = Locale::Object.new("en", nil, "CP1252")
     @@win32 = Win32API.new("kernel32.dll", "GetUserDefaultLangID", nil, "i")

data/lib/locale/win32_table.rb

@@ -6,11 +6,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: win32_table.rb,v 1.3 2008/02/02 16:47:40 mutoh Exp $
+  $Id: win32_table.rb,v 1.4 2008/03/21 06:28:10 mutoh Exp $
 =end
 
 module Locale
-  module SystemWin32
+  module SystemWin32Table
 
     #LangID, locale name, code page
     LocaleTable = [

data/po/bs/rails.po

@@ -1,148 +1,150 @@
 # translation of rails.po to Bosnian
-#
+# 
 # a po-file for Ruby-GetText-Package and Ruby on Rails.
-#
+# 
 # Copyright (C) 2005-2007 Masao Mutoh
-#
+# 
 # This file is distributed under the same license as the Ruby-GetText-Package.
-#
+# 
 # Sanjin Sehic <saserr at gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: rails\n"
-"POT-Creation-Date: 2007-06-26 14:02+0900\n"
+"Project-Id-Version: ruby-gettext 1.90.0\n"
+"POT-Creation-Date: 2008-05-10 01:52+0900\n"
 "PO-Revision-Date: 2007-06-26 19:02+0200\n"
 "Last-Translator: Sanjin Sehic <saserr at gmail.com>\n"
 "Language-Team: Bosnian <saserr at gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n"
+"%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/gettext/rails.rb:293
+#: lib/gettext/rails.rb:295
 msgid "%{num} error prohibited this %{record} from being saved"
 msgid_plural "%{num} errors prohibited this %{record} from being saved"
 msgstr[0] "%{num} greška je spriječila %{record} od spašavanja"
 msgstr[1] "%{num} greške su spriječile %{record} od spašavanja"
 msgstr[2] "%{num} grešaka su spriječile %{record} od spašavanja"
 
-#: lib/gettext/rails.rb:295
+#: lib/gettext/rails.rb:297
 msgid "There was a problem with the following field:"
 msgid_plural "There were problems with the following fields:"
 msgstr[0] "Postoji problem u sljedečem polju:"
 msgstr[1] "Postoje problemi u sljedečim poljima:"
 msgstr[2] "Postoje problemi u sljedečim poljima:"
 
-#: lib/gettext/rails.rb:382
+#: lib/gettext/rails.rb:403
 msgid "less than 5 seconds"
 msgstr "manje od 5 sekundi"
 
-#: lib/gettext/rails.rb:382
+#: lib/gettext/rails.rb:403
 msgid "less than 10 seconds"
 msgstr "manje od 10 sekundi"
 
-#: lib/gettext/rails.rb:382
+#: lib/gettext/rails.rb:403
 msgid "less than 20 seconds"
 msgstr "manje od 20 sekundi"
 
-#: lib/gettext/rails.rb:383
+#: lib/gettext/rails.rb:404
 msgid "half a minute"
 msgstr "pola minute"
 
-#: lib/gettext/rails.rb:383
+#: lib/gettext/rails.rb:404
 msgid "less than a minute"
 msgstr "manje od minute"
 
-#: lib/gettext/rails.rb:383
+#: lib/gettext/rails.rb:404
 msgid "about 1 month"
 msgstr "oko 1 mjesec"
 
-#: lib/gettext/rails.rb:384
+#: lib/gettext/rails.rb:405
 msgid "about 1 year"
 msgstr "oko godinu dana"
 
-#: lib/gettext/rails.rb:384
-msgid "over 2 years"
-msgstr "preko 2 godine"
-
-#: lib/gettext/rails.rb:385
+#: lib/gettext/rails.rb:406
 msgid "1 minute"
 msgid_plural "%{num} minutes"
 msgstr[0] "1 minuta"
 msgstr[1] "%{num} minute"
 msgstr[2] "%{num} minuta"
 
-#: lib/gettext/rails.rb:386
+#: lib/gettext/rails.rb:407
 msgid "about 1 hour"
 msgid_plural "about %{num} hours"
 msgstr[0] "oko 1 sat"
 msgstr[1] "oko %{num} sata"
 msgstr[2] "oko %{num} sati"
 
-#: lib/gettext/rails.rb:387
+#: lib/gettext/rails.rb:408
 msgid "1 day"
 msgid_plural "%{num} days"
 msgstr[0] "1 dan"
 msgstr[1] "%{num} dana"
 msgstr[2] "%{num} dana"
 
-#: lib/gettext/rails.rb:388
+#: lib/gettext/rails.rb:409
 msgid "1 month"
 msgid_plural "%{num} months"
 msgstr[0] "1 mjesec"
 msgstr[1] "%{num} mjeseca"
 msgstr[2] "%{num} mjeseci"
 
+#: lib/gettext/rails.rb:410
+msgid "over 1 year"
+msgid_plural "over %{num} years"
+msgstr[0] "preko 1 godine"
+msgstr[1] "preko %{num} godine"
+
 #: lib/gettext/active_record.rb:28
 msgid "Validation failed: %{error_messages}"
 msgstr "Provjera nije uspjela: %{error_messages}"
 
-#: lib/gettext/active_record.rb:215
+#: lib/gettext/active_record.rb:219
 msgid "%{fn} is not included in the list"
 msgstr "%{fn} nije u listi"
 
-#: lib/gettext/active_record.rb:216
+#: lib/gettext/active_record.rb:220
 msgid "%{fn} is reserved"
 msgstr "%{fn} je rezervisano"
 
-#: lib/gettext/active_record.rb:217
+#: lib/gettext/active_record.rb:221
 msgid "%{fn} is invalid"
 msgstr "%{fn} je pogrešan"
 
-#: lib/gettext/active_record.rb:218
+#: lib/gettext/active_record.rb:222
 msgid "%{fn} doesn't match confirmation"
 msgstr "%{fn} se ne podudara sa potvrdom"
 
-#: lib/gettext/active_record.rb:219
+#: lib/gettext/active_record.rb:223
 msgid "%{fn} must be accepted"
 msgstr "%{fn} se mora prihvatiti"
 
-#: lib/gettext/active_record.rb:220
+#: lib/gettext/active_record.rb:224
 msgid "%{fn} can't be empty"
 msgstr "%{fn} ne može biti prazan"
 
-#: lib/gettext/active_record.rb:221
+#: lib/gettext/active_record.rb:225
 msgid "%{fn} can't be blank"
 msgstr "%{fn} ne može biti prazan"
 
-#: lib/gettext/active_record.rb:222
+#: lib/gettext/active_record.rb:226
 msgid "%{fn} is too long (maximum is %d characters)"
 msgstr "%{fn} je previše dugo (maksimum je %d karaktera)"
 
-#: lib/gettext/active_record.rb:223
+#: lib/gettext/active_record.rb:227
 msgid "%{fn} is too short (minimum is %d characters)"
 msgstr "%{fn} nije dovoljno dugo (maksimum je %d karaktera)"
 
-#: lib/gettext/active_record.rb:224
+#: lib/gettext/active_record.rb:228
 msgid "%{fn} is the wrong length (should be %d characters)"
 msgstr "%{fn} je pogrešne dužine (trebalo bi biti %d karaktera)"
 
-#: lib/gettext/active_record.rb:225
+#: lib/gettext/active_record.rb:229
 msgid "%{fn} has already been taken"
 msgstr "%{fn} se već koristi"
 
-#: lib/gettext/active_record.rb:226
+#: lib/gettext/active_record.rb:230
 msgid "%{fn} is not a number"
 msgstr "%{fn} nije broj"
-

data/po/bs/rgettext.po

@@ -1,15 +1,15 @@
-# translation of rgettext.po to Bosnian
-#
-# a po-file for Ruby-GetText-Package
-#
-# Copyright (C) 2004-2006 Masao Mutoh
-# This file is distributed under the same license as the Ruby-GetText-Package.
-#
-# Sanjin Sehic <saserr@gmail.com>, 2007.
+# translation of rgettext.po to Bosnian
+# 
+# a po-file for Ruby-GetText-Package
+# 
+# Copyright (C) 2004-2006 Masao Mutoh
+# This file is distributed under the same license as the Ruby-GetText-Package.
+# 
+# Sanjin Sehic <saserr@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.9.0\n"
-"POT-Creation-Date: 2007-06-26 14:09+0900\n"
+"Project-Id-Version: ruby-gettext 1.90.0\n"
+"POT-Creation-Date: 2008-05-10 01:52+0900\n"
 "PO-Revision-Date: 2007-03-17 16:19+0100\n"
 "Last-Translator: Sanjin Sehic <saserr@gmail.com>\n"
 "Language-Team: Bosnian <saserr@gmail.com>\n"
@@ -20,41 +20,71 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/gettext/utils.rb:52
-msgid "Failed to merge with %{defpo} - skipping!"
+#: lib/gettext/utils.rb:66
+#, fuzzy
+msgid "Failed to merge with %{defpo}"
 msgstr "Spajanje sa %{defpo} nije uspjelo - nastavljam dalje!"
 
-#: lib/gettext/utils.rb:53
-msgid "Please check new .pot in %{failed_filename}"
+#: lib/gettext/utils.rb:67
+#, fuzzy
+msgid "New .pot was copied to %{failed_filename}"
 msgstr "Molim da provjerite novi .pot u %{failed_filename}"
 
-#: lib/gettext/rmsgfmt.rb:31 lib/gettext/rgettext.rb:196
-msgid "no input files"
-msgstr "nema ulaznih datoteka"
+#: lib/gettext/utils.rb:68
+msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+msgstr ""
 
-#: lib/gettext/rmsgfmt.rb:47
-msgid "Usage: %s input.po [-o output.mo]"
-msgstr "Korištenje: %s ulaz.po [-o izlaz.mo]"
+#: lib/gettext/rgettext.rb:43
+msgid "'%{klass}' is ignored."
+msgstr "%{klass} je ignorisan."
 
-#: lib/gettext/rmsgfmt.rb:49
-msgid "Generate binary message catalog from textual translation description."
-msgstr "Generiši binarni katalog poruka iz tekstualnog opisa prevoda"
+#: lib/gettext/rgettext.rb:183
+msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
+msgstr "Korištenje: %s ulaz.rb [-r parser.rb] [-o izlaz.pot]"
 
-#: lib/gettext/rmsgfmt.rb:51 lib/gettext/rmsgmerge.rb:408
-#: lib/gettext/rgettext.rb:153
+#: lib/gettext/rgettext.rb:185
+msgid "Extract translatable strings from given input files."
+msgstr "Izvadi niske za prevođenje iz date ulazne datoteke."
+
+#: lib/gettext/rgettext.rb:187 lib/gettext/rmsgfmt.rb:51
+#: lib/gettext/rmsgmerge.rb:408
 msgid "Specific options:"
 msgstr "Specifične opcije:"
 
-#: lib/gettext/rmsgfmt.rb:53 lib/gettext/rmsgmerge.rb:410
-#: lib/gettext/rgettext.rb:155
+#: lib/gettext/rgettext.rb:189 lib/gettext/rmsgfmt.rb:53
+#: lib/gettext/rmsgmerge.rb:410
 msgid "write output to specified file"
 msgstr "zapiši izlaz u specifičnu datoteku"
 
-#: lib/gettext/rmsgfmt.rb:57 lib/gettext/rmsgmerge.rb:421
-#: lib/gettext/rgettext.rb:172
+#: lib/gettext/rgettext.rb:193
+msgid "File '%s' already exists."
+msgstr "Datoteka '%s' već postoji."
+
+#: lib/gettext/rgettext.rb:198
+msgid "require the library before executing rgettext"
+msgstr "zahtjevaj biblioteku prije izvršavanja rgettext-a"
+
+#: lib/gettext/rgettext.rb:202
+msgid "run in debugging mode"
+msgstr "pokreni u modu za nalaženje grešaka"
+
+#: lib/gettext/rgettext.rb:206 lib/gettext/rmsgfmt.rb:57
+#: lib/gettext/rmsgmerge.rb:421
 msgid "display version information and exit"
 msgstr "prikaži informaciju o verziji i završi"
 
+#: lib/gettext/rgettext.rb:230 lib/gettext/rmsgfmt.rb:31
+msgid "no input files"
+msgstr "nema ulaznih datoteka"
+
+#: lib/gettext/rmsgfmt.rb:47
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Korištenje: %s ulaz.po [-o izlaz.mo]"
+
+#: lib/gettext/rmsgfmt.rb:49
+msgid "Generate binary message catalog from textual translation description."
+msgstr "Generiši binarni katalog poruka iz tekstualnog opisa prevoda"
+
 #: lib/gettext/rmsgmerge.rb:403
 msgid "Usage: %s def.po ref.pot [-o output.pot]"
 msgstr "Korištenje: %s def.po ref.pot [-o izlaz.pot]"
@@ -98,34 +128,14 @@ msgstr "Databaza nije dostupna."
 msgid "rubygems are not found."
 msgstr "rubygems se ne mogu pronaći."
 
-#: lib/gettext/rgettext.rb:43
-msgid "'%{klass}' is ignored."
-msgstr "%{klass} je ignorisan."
-
-#: lib/gettext/rgettext.rb:149
-msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
-msgstr "Korištenje: %s ulaz.rb [-r parser.rb] [-o izlaz.pot]"
-
-#: lib/gettext/rgettext.rb:151
-msgid "Extract translatable strings from given input files."
-msgstr "Izvadi niske za prevođenje iz date ulazne datoteke."
-
-#: lib/gettext/rgettext.rb:159
-msgid "File '%s' already exists."
-msgstr "Datoteka '%s' već postoji."
-
-#: lib/gettext/rgettext.rb:164
-msgid "require the library before executing rgettext"
-msgstr "zahtjevaj biblioteku prije izvršavanja rgettext-a"
-
-#: lib/gettext/rgettext.rb:168
-msgid "run in debugging mode"
-msgstr "pokreni u modu za nalaženje grešaka"
+#: lib/gettext.rb:363
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr ""
 
 #: src/poparser.ry:26 src/poparser.ry:41
 msgid "Warning: fuzzy message was ignored.\n"
 msgstr "Upozorenje: čudna poruka je ignorisana.\n"
 
-#: src/poparser.ry:125
+#: src/poparser.ry:129
 msgid "Warning: obsolete msgid exists.\n"
 msgstr "Upozorenje: nekorišteni msgid postoji.\n"