gettext 1.8.0-mswin32 → 1.9.0-mswin32

data/lib/gettext/parser/ruby.rb

@@ -9,73 +9,13 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: ruby.rb,v 1.8 2006/09/11 16:30:31 mutoh Exp $
+  $Id: ruby.rb,v 1.9 2007/01/13 18:34:08 mutoh Exp $
 =end
 
 require 'irb/ruby-lex.rb'
 require 'stringio'
 
 class RubyLexX < RubyLex  # :nodoc: all
-  
-  def initialize
-    super
-    @prompt = nil
-    @here_header = nil
-    @lex_state = nil
-  end
-  
-  def read_escape
-    case ch = getc
-    when "\n", "\r", "\f"
-    when "\\", "n", "t", "r", "f", "v", "a", "e", "b" #"
-      return "\\".concat(ch)
-    when /[0-7]/
-      ungetc ch
-      3.times do
-        case ch = getc
-        when /[0-7]/
-        when nil
-          break
-        else
-          ungetc
-          break
-        end
-      end
-      
-    when "x"
-      2.times do
-        case ch = getc
-        when /[0-9a-fA-F]/
-        when nil
-          break
-        else
-          ungetc
-          break
-        end
-      end
-      
-    when "M"
-      if (ch = getc) != '-'
-        ungetc
-      else
-        if (ch = getc) == "\\" #"
-          read_escape
-        end
-      end
-      
-    when "C", "c", "^"
-      if ch == "C" and (ch = getc) != "-"
-        ungetc
-      elsif (ch = getc) == "\\" #"
-        read_escape
-      end
-    when '#'
-      return ch
-    else
-      # other characters
-    end
-  end
-
   # Parser#parse resemlbes RubyLex#lex
   def parse
     until (  (tk = token).kind_of?(RubyToken::TkEND_OF_SCRIPT) && !@continue or tk.nil?  )
@@ -114,7 +54,6 @@ class RubyLexX < RubyLex  # :nodoc: all
       
       yield tk
     end
-   
     return nil
   end
 
@@ -185,7 +124,9 @@ module GetText
 	  targets
 	end
       rescue
-	$stderr.puts "\n\nError: #{$!} in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}"
+	$stderr.print "\n\nError: #{$!.inspect} "
+        $stderr.print " in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}" if tk
+        $stderr.print "\n"
 	exit
       end
       targets

data/lib/gettext/rails.rb

@@ -6,11 +6,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.51 2006/09/10 15:08:32 mutoh Exp $
+  $Id: rails.rb,v 1.55 2007/01/21 15:16:06 mutoh Exp $
 =end
 
 require 'gettext/cgi'
-require 'active_support'
+require 'action_controller'
 
 module GetText
   # GetText::Rails supports Ruby on Rails.
@@ -70,7 +70,6 @@ module GetText
   end
 end
 
-
 module ActionController #:nodoc:
   class Base
     helper GetText::Rails
@@ -78,23 +77,21 @@ module ActionController #:nodoc:
 
     @@gettext_domainnames = []
     @@gettext_content_type = nil
-
+    
     prepend_before_filter :init_gettext
     after_filter :init_content_type
- 
-    
+     
     def init_gettext_main(cgi) #:nodoc:
-      cgi.params["lang"] = [@params["lang"]] if @params["lang"]
+      cgi.params["lang"] = [params["lang"]] if params["lang"]
       set_cgi(cgi)
       set_locale_all(nil)
     end
 
-    REGEXP_GETTEXT_CONTENT_TYPE = /javascript/  #:nodoc:
     def init_content_type #:nodoc:
-      if @headers["Content-Type"] and REGEXP_GETTEXT_CONTENT_TYPE  =~ @headers["Content-Type"]
-	@headers["Content-Type"] = "text/javascript; charset=#{GetText.output_charset}"
-      elsif ! @headers["Content-Type"]
-	@headers["Content-Type"] = "#{@@gettext_content_type}; charset=#{GetText.output_charset}"
+      if headers["Content-Type"] and /javascript/ =~ headers["Content-Type"]
+	headers["Content-Type"] = "text/javascript; charset=#{GetText.output_charset}"
+      elsif ! headers["Content-Type"]
+	headers["Content-Type"] = "#{@@gettext_content_type}; charset=#{GetText.output_charset}"
       end
     end
 
@@ -111,7 +108,7 @@ module ActionController #:nodoc:
     def init_gettext # :nodoc:
       cgi = nil
       if defined? request.cgi
-	cgi = request.cgi
+        cgi = request.cgi
       end
       call_methods_around_init_gettext(@@before_init_gettext)
       init_gettext_main(cgi) if @@gettext_domainnames.size > 0
@@ -170,7 +167,7 @@ module ActionController #:nodoc:
     #   * :content_type - the content type. Default is "text/html"
     #   * :locale_path - the path to locale directory. Default is {RAILS_ROOT}/locale or {plugin root directory}/locale.
     #
-    # locale is searched the order by @params["lang"] > "lang" value of QUERY_STRING > 
+    # locale is searched the order by params["lang"] > "lang" value of QUERY_STRING > 
     # "lang" value of Cookie > HTTP_ACCEPT_LANGUAGE value > Default locale(en). 
     # And the charset is set order by "the argument of bindtextdomain" > HTTP_ACCEPT_CHARSET > Default charset(UTF-8).
     #
@@ -192,14 +189,17 @@ module ActionController #:nodoc:
       if options.kind_of? String
 	# For backward compatibility
 	opt.merge!(:charset => options, :content_type => content_type)
+      else
+	opt.merge!(options)
       end
       GetText.output_charset = opt[:charset]
       @@gettext_content_type = opt[:content_type]
       locale_path = opt[:locale_path]
       unless locale_path
-	begin
-	  locale_path = File.join(caller[0].split(/app.controllers/)[0] + "locale")
-	rescue RuntimeError
+	cal = caller[0]
+	if cal =~ /app.controllers/
+	  locale_path = File.join(cal.split(/app.controllers/)[0] + "locale")
+	else
 	  locale_path = File.join(RAILS_ROOT, "locale")
 	end
       end
@@ -239,7 +239,10 @@ module ActionController #:nodoc:
   class TestRequest < AbstractRequest  #:nodoc:
     @cgi = nil
     def cgi
-      @cgi = CGI.new unless @cgi
+      unless @cgi
+        ENV['REQUEST_URI'] ||= "http://localhost:3000/"
+        @cgi = CGI.new 
+      end
       @cgi
     end
   end
@@ -390,7 +393,7 @@ if defined? ActionMailer
       include GetText::Rails 
       extend GetText::Rails
       
-      alias :_create! :create! #:nodoc:
+      alias :create_without_gettext! :create! #:nodoc:
       
       def base64(text, charset="iso-2022-jp", convert=true)
 	if convert
@@ -403,7 +406,7 @@ if defined? ActionMailer
       end
       
       def create!(*arg) #:nodoc:
-	_create!(*arg)
+	create_without_gettext!(*arg)
 	if Locale.get.language == "ja"
 	  require 'nkf'
 	  @mail.subject = base64(@mail.subject)

data/lib/gettext/rgettext.rb

@@ -2,11 +2,11 @@
 =begin
   rgettext.rb - Generate a .pot file.
 
-  Copyright (C) 2003-2005  Masao Mutoh
+  Copyright (C) 2003-2006  Masao Mutoh
   Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
  
-      Yasushi Shoji   <yashi@yashi.com>
-      Masao Mutoh     <mutoh@highway.ne.jp>
+      Yasushi Shoji   <yashi at atmark-techno.com>
+      Masao Mutoh     <mutoh at highway.ne.jp>
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -25,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/09/10 15:08:32 $)[1]
+    DATE = %w($Date: 2006/12/14 16:35:57 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -156,12 +156,12 @@ msgstr ""
 	unless FileTest.exist? out
 	  output = File.new(File.expand_path(out), "w+")
 	else
-	  $stderr.puts(_("File '%s' has already existed.") % out)
+	  $stderr.puts(_("File '%s' already exists.") % out)
 	  exit 1
 	end
       end
 
-      opts.on("-r", "--require=PARSER", _("read an option parser")) do |out|
+      opts.on("-r", "--require=library", _("require the library before executing rgettext")) do |out|
 	require out
       end
 

data/lib/gettext/utils.rb

@@ -1,7 +1,7 @@
 =begin
   utils.rb - Utility functions
 
-  Copyright (C) 2005 Masao Mutoh
+  Copyright (C) 2005,2006 Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -36,8 +36,7 @@ module GetText
   # * Returns: self 
   def msgmerge(defpo, refpo, app_version) 
     $stderr.puts defpo
-    cmd = ENV["MSGMERGE_PATH"]
-    cmd ||= "msgmerge"
+    cmd = ENV["MSGMERGE_PATH"] || "msgmerge"
 
     cont = ""
     if FileTest.exist? defpo
@@ -47,9 +46,16 @@ module GetText
 	cont = io.read
       end
     end
-    cont.sub!(/(Project-Id-Version\:).*$/, "\\1 #{app_version}\\n\"")
-    File.open(defpo, "w") do |out| 
-      out.write(cont)
+    if cont.empty?
+      failed_filename = refpo + "~"
+      FileUtils.cp(refpo, failed_filename)
+      $stderr.puts _("Failed to merge with %{defpo} - skipping!") % {:defpo => defpo}
+      $stderr.puts _("Please check new .pot in %{failed_filename}") %{:failed_filename => failed_filename}
+    else
+      cont.sub!(/(Project-Id-Version\:).*$/, "\\1 #{app_version}\\n\"")
+      File.open(defpo, "w") do |out|
+        out.write(cont)
+      end
     end
     self
   end

data/lib/gettext/version.rb

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

data/po/ca/rails.po

@@ -0,0 +1,121 @@
+#
+# a po-file for Ruby-GetText-Package and Ruby on Rails.
+#
+# Copyright (C) 2005,2006 Masao Mutoh
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Ramon Salvadó <rsalvado at gnuine.com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ruby-gettext 1.9.0\n"
+"POT-Creation-Date: 2006-12-20 00:05+0900\n"
+"PO-Revision-Date: 2005-12-17 14:33+0900\n"
+"Last-Translator: Ramon Salvadó <rsalvado at gnuine.com>\n"
+"Language-Team: Catalan\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/gettext/rails.rb:278
+msgid "%{num} error prohibited this %{record} from being saved"
+msgid_plural "%{num} errors prohibited this %{record} from being saved"
+msgstr[0] "%{num} error impedeix que es pugui guardar %{record}"
+msgstr[1] "%{num} errors impedeixen que es pugui guardar %{record}"
+
+#: lib/gettext/rails.rb:280
+msgid "There was a problem with the following field:"
+msgid_plural "There were problems with the following fields:"
+msgstr[0] "Hi ha problemes amb el següent camp:"
+msgstr[1] "Hi ha problemes amb els següents camps:"
+
+#: lib/gettext/rails.rb:367
+msgid "less than 5 seconds"
+msgstr "menys de 5 segons"
+
+#: lib/gettext/rails.rb:367
+msgid "less than 10 seconds"
+msgstr "menys de 10 segons"
+
+#: lib/gettext/rails.rb:367
+msgid "less than 20 seconds"
+msgstr "menys de 20 segons"
+
+#: lib/gettext/rails.rb:368
+msgid "half a minute"
+msgstr "mig minut"
+
+#: lib/gettext/rails.rb:368
+msgid "less than a minute"
+msgstr "menys d'un minut"
+
+#: lib/gettext/rails.rb:369
+msgid "1 minute"
+msgid_plural "%{num} minutes"
+msgstr[0] "1 minut"
+msgstr[1] "%{num} minuts"
+
+#: lib/gettext/rails.rb:370
+msgid "about 1 hour"
+msgid_plural "about %{num} hours"
+msgstr[0] "al voltant d'1 hora"
+msgstr[1] "al voltant de %{num} hores"
+
+#: lib/gettext/rails.rb:371
+msgid "1 day"
+msgid_plural "%{num} days"
+msgstr[0] "1 dia"
+msgstr[1] "%{num} dies"
+
+#: lib/gettext/active_record.rb:27
+msgid "Validation failed: %{error_messages}"
+msgstr "La validació ha fallat: %{error_messages}"
+
+#: lib/gettext/active_record.rb:195
+msgid "%{fn} is not included in the list"
+msgstr "%{fn} no pertany a la llista de possibles valors"
+
+#: lib/gettext/active_record.rb:196
+msgid "%{fn} is reserved"
+msgstr "%{fn} no està permès"
+
+#: lib/gettext/active_record.rb:197
+msgid "%{fn} is invalid"
+msgstr "%{fn} no és vàlid"
+
+#: lib/gettext/active_record.rb:198
+msgid "%{fn} doesn't match confirmation"
+msgstr "%{fn} no té el mateix valor que la confirmació"
+
+#: lib/gettext/active_record.rb:199
+msgid "%{fn} must be accepted"
+msgstr "%{fn} ha de ser acceptat"
+
+#: lib/gettext/active_record.rb:200
+msgid "%{fn} can't be empty"
+msgstr "%{fn} no pot ser buit"
+
+#: lib/gettext/active_record.rb:201
+msgid "%{fn} can't be blank"
+msgstr "%{fn} no pot estar en blanc"
+
+#: lib/gettext/active_record.rb:202
+msgid "%{fn} is too long (maximum is %d characters)"
+msgstr "%{fn} és massa llarg (màxim de %d caràcters)"
+
+#: lib/gettext/active_record.rb:203
+msgid "%{fn} is too short (minimum is %d characters)"
+msgstr "%{fn} és massa curt (mínim de %d caràcters)"
+
+#: lib/gettext/active_record.rb:204
+msgid "%{fn} is the wrong length (should be %d characters)"
+msgstr "%{fn} té una llargària incorrecta (hauria de tenir %d caràcters)"
+
+#: lib/gettext/active_record.rb:205
+msgid "%{fn} has already been taken"
+msgstr "%{fn} ja existent"
+
+#: lib/gettext/active_record.rb:206
+msgid "%{fn} is not a number"
+msgstr "%{fn} no és un número"

data/po/ca/rgettext.po

@@ -0,0 +1,130 @@
+#
+# 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.
+#
+# Ramon Salvadó <rsalvado at gnuine.com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ruby-gettext 1.9.0\n"
+"POT-Creation-Date: 2006-12-20 00:05+0900\n"
+"PO-Revision-Date: 2005-12-20 10:33+0900E\n"
+"Last-Translator: Ramon Salvadó <rsalvado at gnuine.com>\n"
+"Language-Team: Catalan\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/gettext/utils.rb:52
+msgid "Failed to merge with %{defpo} - skipping!"
+msgstr "Ha fallat al fer el merge amb %{defpo} - saltant!"
+
+#: lib/gettext/utils.rb:53
+msgid "Please check new .pot in %{failed_filename}"
+msgstr "Si us plau comprova el nou .pot a %{failed_filename}"
+
+#: lib/gettext/rmsgfmt.rb:31 lib/gettext/rgettext.rb:196
+msgid "no input files"
+msgstr "no hi ha fitxers d'entrada"
+
+#: lib/gettext/rmsgfmt.rb:47
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Ús: %s entrada.po [-o sortida.mo]"
+
+#: lib/gettext/rmsgfmt.rb:49
+msgid "Generate binary message catalog from textual translation description."
+msgstr ""
+"Genera un catàleg de missatges binaris a partir d'un fitxer de traducció "
+"textual."
+
+#: lib/gettext/rmsgfmt.rb:51 lib/gettext/rmsgmerge.rb:408
+#: lib/gettext/rgettext.rb:153
+msgid "Specific options:"
+msgstr "Opcions específiques:"
+
+#: lib/gettext/rmsgfmt.rb:53 lib/gettext/rmsgmerge.rb:410
+#: lib/gettext/rgettext.rb:155
+msgid "write output to specified file"
+msgstr "escriu la sortida en un fitxer especificat"
+
+#: lib/gettext/rmsgfmt.rb:57 lib/gettext/rmsgmerge.rb:421
+#: lib/gettext/rgettext.rb:172
+msgid "display version information and exit"
+msgstr "mostra informació de la versió i surt"
+
+#: lib/gettext/rmsgmerge.rb:403
+msgid "Usage: %s def.po ref.pot [-o output.pot]"
+msgstr "Ús: %s def.po ref.pot [-o sortida.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 ""
+"Combina dos fitxers .po d'estil Uniforum. El fitxer def.po és un fitxer PO "
+"existent amb traduccions. El fitxer ref.pot és l'últim fitxer PO amb "
+"referències actualitzades. Normalment qui ha creat ref.pot és rgettext"
+
+#: lib/gettext/rmsgmerge.rb:447
+msgid "definition po is not given."
+msgstr "no s'ha donat una definició po"
+
+#: lib/gettext/rmsgmerge.rb:449
+msgid "reference pot is not given."
+msgstr "no s'ha donat una referència pot"
+
+#: lib/gettext/rgettext.rb:43
+msgid "'%{klass}' is ignored."
+msgstr "'%{klass}' ignorat"
+
+#: lib/gettext/rgettext.rb:149
+msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
+msgstr "Ús: %s entrada.po [-r parser.rb] [-o sortida.pot]"
+
+#: lib/gettext/rgettext.rb:151
+msgid "Extract translatable strings from given input files."
+msgstr "Extreu les cadenes de paraules traduïbles dels fitxers d'entrada."
+
+#: lib/gettext/rgettext.rb:159
+msgid "File '%s' already exists."
+msgstr "El fitxer '%s' ja existeix"
+
+#: lib/gettext/rgettext.rb:164
+msgid "require the library before executing rgettext"
+msgstr "requereix la llibreia abans d'executar rgettext"
+
+#: lib/gettext/rgettext.rb:168
+msgid "run in debugging mode"
+msgstr "executa en mode debug"
+
+#: lib/gettext/parser/glade.rb:74
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "El fitxer `%{file}' no té el format glade-2.0."
+
+#: lib/gettext/parser/active_record.rb:39
+msgid "'%{file}' is not found."
+msgstr "El fitxer '%{file}' no s'ha trobat"
+
+#: lib/gettext/parser/active_record.rb:80
+msgid "Ignored '%{file}'. Solve dependencies first."
+msgstr "S'ignora el fitxer '%{file}'. Primer ha de resoldre les dependències."
+
+#: lib/gettext/parser/active_record.rb:104
+msgid "No database is available."
+msgstr "No hi ha una base de dades disponible."
+
+#: lib/gettext/parser/active_record.rb:137
+msgid "rubygems are not found."
+msgstr "no s'ha trobat rubygems"
+
+#: src/poparser.ry:26 src/poparser.ry:41
+msgid "Warning: fuzzy message was ignored.\n"
+msgstr "Avís: s'ha ignorat el missatge ambigu.\n"
+
+#: src/poparser.ry:125
+msgid "Warning: obsolete msgid exists.\n"
+msgstr "Avís: existeix un msgid obsolet.\n"