gettext 1.9.0 → 1.10.0

data/lib/gettext/rails_compat.rb

@@ -0,0 +1,16 @@
+#
+# This file is for Rails-1.1.6.
+# From activesupport-1.4.1/lib/active_support/core_ext/module/aliasing.rb
+#
+class Module
+  unless defined? alias_method_chain
+    def alias_method_chain(target, feature)
+      # Strip out punctuation on predicates or bang methods since
+      # e.g. target?_without_feature is not a valid method name.
+      aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+      yield(aliased_target, punctuation) if block_given?
+      alias_method "#{aliased_target}_without_#{feature}#{punctuation}", target
+      alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
+    end
+  end
+end

data/lib/gettext/rgettext.rb

@@ -25,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/12/14 16:35:57 $)[1]
+    DATE = %w($Date: 2007/07/02 16:40:18 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -123,6 +123,41 @@ msgstr ""
       str
     end
 
+    def normalize(ary)  # :nodoc:
+      used_plural_msgs = []
+      ary.select{|item| item[0].include? "\000"}.each do |plural_msg|
+        next if used_plural_msgs.include?(plural_msg[0])
+
+        key = plural_msg[0].split("\000")[0]
+
+        ary.dup.each do |single_msg|
+          if single_msg[0] == key or
+              (single_msg[0] =~ /#{Regexp.quote(key)}\000/ and 
+               single_msg[0] != plural_msg[0])
+            if single_msg[0] != key 
+              warn %Q[Warning: n_("#{plural_msg[0].gsub(/\000/, '", "')}") and n_("#{single_msg[0].gsub(/\000/, '", "')}") are duplicated. First msgid was used.] 
+                used_plural_msgs << single_msg[0]
+            end
+
+            single_msg[1..-1].each do |line_info|
+              plural_msg << line_info
+              fname = line_info.split(/:/)[0]
+              sorted = plural_msg[1..-1].select{|l| l.split(/:/)[0].include?(fname)}.collect{|l| 
+                aline = l.split(/:/)
+                [aline[0], aline[1] =~ /[0-9]+/ ? aline[1].to_i : aline[1]]
+              }.sort.collect{|l| "#{l[0]}:#{l[1]}"}
+              plural_msg.delete_if{|i| sorted.include?(i)}
+              sorted.each {|i|
+                plural_msg << i
+              }
+            end
+            ary.delete(single_msg)
+          end
+        end
+      end
+      ary.collect{|i| i.uniq}
+    end
+
     def parse(files) # :nodoc:
       ary = []
       files.each do |file|
@@ -138,8 +173,7 @@ msgstr ""
 	  raise
 	end
       end
-
-      ary
+      normalize(ary)
     end
 
     def check_options # :nodoc:

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.20 2006/09/11 16:30:31 mutoh Exp $
+  $Id: textdomain.rb,v 1.22 2007/07/02 16:40:18 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -116,14 +116,34 @@ module GetText
     # * Returns: the translated string or nil if not found.
     def gettext(msgid)
       return "" if msgid == "" or msgid.nil?
-      if @current_mo and @current_mo[msgid] and (@current_mo[msgid].size > 0)
-	@current_mo[msgid]
+      return nil unless @current_mo
+      if @current_mo[msgid] and (@current_mo[msgid].size > 0)
+        @current_mo[msgid]
+      elsif msgid.include?("\000")
+        ret = nil
+        msgid_single = msgid.split("\000")[0]
+        @current_mo.each{|key, val| 
+          if key =~ /^#{Regexp.quote(msgid_single)}\000/
+              # Usually, this is not caused to make po-files from rgettext.
+              warn %Q[Warning: n_("#{msgid_single}", "#{msgid.split("\000")[1]}") and n_("#{key.gsub(/\000/, '", "')}") are duplicated.] if $DEBUG
+            ret = val
+            break
+          end
+        }
+        ret
       else
-        nil
+        ret = nil
+        @current_mo.each{|key, val| 
+          if key =~ /^#{Regexp.quote(msgid)}\000/
+              ret = val.split("\000")[0]
+            break
+          end
+        }
+        ret
       end
     end
 
-    # Gets the translated string.
+    # Gets the translated string. (Deprecated. Don't call this method directly)
     # * msgid: the original message(single).
     # * msgid: the original message(plural).
     # * n: the number
@@ -132,7 +152,7 @@ module GetText
       key = msgid + "\000" + msgid_plural
       msg = gettext(key)
       if ! msg
-	nil
+	nil  # do nothing.
       elsif msg == key
 	msg = n == 1 ? msgid : msgid_plural
       elsif msg.include?("\000")
@@ -151,6 +171,25 @@ module GetText
       msg
     end
 
+    def ngettext_data(msgid, msgid_plural)   #:nodoc:
+      key = msgid + "\000" + msgid_plural
+      msg = gettext(key)
+      ret = nil
+      if ! msg
+        ret = nil
+      elsif msg == key
+        ret = nil
+      elsif msg.include?("\000")
+        # [[msgstr[0], msgstr[1], msgstr[2],...], cond]
+        cond = @current_mo ? @current_mo.plural : nil
+        cond ||= "n != 1"
+        ret = [msg.split("\000"), cond]
+      else
+        ret = [[msg], "0"]
+      end
+      ret
+    end
+
     # Compare this object has the same name, topdir and locale.
     # * name: the textdomain name
     # * topdir: the top directory of mo files or nil.

data/lib/gettext/utils.rb

@@ -7,6 +7,13 @@
   license terms as Ruby.
 =end
 
+require 'rbconfig'
+if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
+  ENV['PATH'] = %w(bin lib).collect{|dir|
+    "#{Config::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
+  }.join('') + ENV['PATH']
+end
+
 require 'gettext/rgettext'
 require 'gettext/rmsgfmt'
 require 'fileutils'

data/lib/gettext/version.rb

@@ -8,5 +8,5 @@
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

data/po/bs/rails.po

@@ -0,0 +1,148 @@
+# 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"
+"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"
+"X-Generator: KBabel 1.11.4\n"
+
+#: lib/gettext/rails.rb:293
+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
+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
+msgid "less than 5 seconds"
+msgstr "manje od 5 sekundi"
+
+#: lib/gettext/rails.rb:382
+msgid "less than 10 seconds"
+msgstr "manje od 10 sekundi"
+
+#: lib/gettext/rails.rb:382
+msgid "less than 20 seconds"
+msgstr "manje od 20 sekundi"
+
+#: lib/gettext/rails.rb:383
+msgid "half a minute"
+msgstr "pola minute"
+
+#: lib/gettext/rails.rb:383
+msgid "less than a minute"
+msgstr "manje od minute"
+
+#: lib/gettext/rails.rb:383
+msgid "about 1 month"
+msgstr "oko 1 mjesec"
+
+#: lib/gettext/rails.rb:384
+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
+msgid "1 minute"
+msgid_plural "%{num} minutes"
+msgstr[0] "1 minuta"
+msgstr[1] "%{num} minute"
+msgstr[2] "%{num} minuta"
+
+#: lib/gettext/rails.rb:386
+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
+msgid "1 day"
+msgid_plural "%{num} days"
+msgstr[0] "1 dan"
+msgstr[1] "%{num} dana"
+msgstr[2] "%{num} dana"
+
+#: lib/gettext/rails.rb:388
+msgid "1 month"
+msgid_plural "%{num} months"
+msgstr[0] "1 mjesec"
+msgstr[1] "%{num} mjeseca"
+msgstr[2] "%{num} mjeseci"
+
+#: lib/gettext/active_record.rb:28
+msgid "Validation failed: %{error_messages}"
+msgstr "Provjera nije uspjela: %{error_messages}"
+
+#: lib/gettext/active_record.rb:215
+msgid "%{fn} is not included in the list"
+msgstr "%{fn} nije u listi"
+
+#: lib/gettext/active_record.rb:216
+msgid "%{fn} is reserved"
+msgstr "%{fn} je rezervisano"
+
+#: lib/gettext/active_record.rb:217
+msgid "%{fn} is invalid"
+msgstr "%{fn} je pogrešan"
+
+#: lib/gettext/active_record.rb:218
+msgid "%{fn} doesn't match confirmation"
+msgstr "%{fn} se ne podudara sa potvrdom"
+
+#: lib/gettext/active_record.rb:219
+msgid "%{fn} must be accepted"
+msgstr "%{fn} se mora prihvatiti"
+
+#: lib/gettext/active_record.rb:220
+msgid "%{fn} can't be empty"
+msgstr "%{fn} ne može biti prazan"
+
+#: lib/gettext/active_record.rb:221
+msgid "%{fn} can't be blank"
+msgstr "%{fn} ne može biti prazan"
+
+#: lib/gettext/active_record.rb:222
+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
+msgid "%{fn} is too short (minimum is %d characters)"
+msgstr "%{fn} nije dovoljno dugo (maksimum je %d karaktera)"
+
+#: lib/gettext/active_record.rb:224
+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
+msgid "%{fn} has already been taken"
+msgstr "%{fn} se već koristi"
+
+#: lib/gettext/active_record.rb:226
+msgid "%{fn} is not a number"
+msgstr "%{fn} nije broj"
+

data/po/bs/rgettext.po

@@ -0,0 +1,131 @@
+# 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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=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/utils.rb:52
+msgid "Failed to merge with %{defpo} - skipping!"
+msgstr "Spajanje sa %{defpo} nije uspjelo - nastavljam dalje!"
+
+#: lib/gettext/utils.rb:53
+msgid "Please check new .pot in %{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/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/rmsgfmt.rb:51 lib/gettext/rmsgmerge.rb:408
+#: lib/gettext/rgettext.rb:153
+msgid "Specific options:"
+msgstr "Specifične opcije:"
+
+#: lib/gettext/rmsgfmt.rb:53 lib/gettext/rmsgmerge.rb:410
+#: lib/gettext/rgettext.rb:155
+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
+msgid "display version information and exit"
+msgstr "prikaži informaciju o verziji i završi"
+
+#: 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]"
+
+#: lib/gettext/rmsgmerge.rb:406
+msgid ""
+"Merges two Uniforum style .po files together. The def.po file is an existing "
+"PO file with translations. The ref.pot file is the last created PO file with "
+"up-to-date source references. ref.pot is generally created by rgettext."
+msgstr ""
+"Spaja dvije Uniforum style .po datoteke skupa. def.po datoteka je već "
+"postojeća PO datoteka sa prevodima. ref.pot je zadnja napravljena PO "
+"datoteka sa najnovijim referencama koda. ref.pot je najčešće napravljen sa "
+"rgettext."
+
+#: lib/gettext/rmsgmerge.rb:447
+msgid "definition po is not given."
+msgstr "definicijski po nije dat."
+
+#: lib/gettext/rmsgmerge.rb:449
+msgid "reference pot is not given."
+msgstr "referencni po nije dat."
+
+#: lib/gettext/parser/glade.rb:74
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "'%{file}' nije glade-2.0 format."
+
+#: lib/gettext/parser/active_record.rb:39
+msgid "'%{file}' is not found."
+msgstr "'%{file} nije pronađen."
+
+#: lib/gettext/parser/active_record.rb:80
+msgid "Ignored '%{file}'. Solve dependencies first."
+msgstr "Ignorisano '%{file}'. Riješi prvo zavisnosti."
+
+#: lib/gettext/parser/active_record.rb:104
+msgid "No database is available."
+msgstr "Databaza nije dostupna."
+
+#: lib/gettext/parser/active_record.rb:138
+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"
+
+#: 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
+msgid "Warning: obsolete msgid exists.\n"
+msgstr "Upozorenje: nekorišteni msgid postoji.\n"