gettext 1.92.0 → 1.93.0

data/lib/gettext/parser/ruby.rb

@@ -9,7 +9,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: ruby.rb,v 1.11 2008/07/26 06:59:35 mutoh Exp $
+  $Id: ruby.rb,v 1.12 2008/08/06 17:35:52 mutoh Exp $
 =end
 
 require 'irb/ruby-lex.rb'
@@ -64,6 +64,7 @@ module GetText
     ID = ['gettext', '_', 'N_', 'sgettext', 's_']
     PLURAL_ID = ['ngettext', 'n_', 'Nn_', 'ns_', 'nsgettext']
     MSGCTXT_ID = ['pgettext', 'p_']
+    MSGCTXT_PLURAL_ID = ['npgettext', 'np_']
 
     module_function
     def parse(file, targets = [])  # :nodoc:
@@ -92,6 +93,8 @@ module GetText
 	      target = :plural
 	    elsif MSGCTXT_ID.include?(tk.name)
 	      target = :msgctxt
+	    elsif MSGCTXT_PLURAL_ID.include?(tk.name)
+	      target = :msgctxt_plural
 	    else
 	      target = nil
 	    end
@@ -112,8 +115,12 @@ module GetText
 	        msgid += "\000"
 	      elsif target == :msgctxt
 	        msgid += "\004"
+	      elsif target == :msgctxt_plural
+	        msgid += "\004"
+		target = :plural
+	      else   
+       	        target = :normal
 	      end
-       	      target = :normal
 	    end
 	  else
 	    if msgid

data/lib/gettext/rails.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.79 2008/08/02 08:42:06 mutoh Exp $
+  $Id: rails.rb,v 1.81 2008/09/13 18:23:56 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -275,11 +275,16 @@ module ActionView #:nodoc:
     # instead of foo.html.erb. If the file isn't found, foo.html.erb is used.
     def render_file_with_gettext(template_path, use_full_path = true, local_assigns = {})
       locale = GetText.locale
-      [locale.to_general, locale.to_s, locale.language, Locale.default.language].uniq.each do |v|
-	localized_path = "#{template_path}_#{v}"
-        if (respond_to? :file_exists?) ? file_exists?(localized_path) : (finder.file_exists? localized_path)
-          return render_file_without_gettext(localized_path, use_full_path, local_assigns)
+      begin
+        [locale.to_general, locale.to_s, locale.language, Locale.default.language].uniq.each do |v|
+          localized_path = "#{template_path}_#{v}"
+          if (respond_to? :file_exists?) ? file_exists?(localized_path) : (finder.file_exists? localized_path)
+            return render_file_without_gettext(localized_path, use_full_path, local_assigns)
+          end
         end
+      rescue Exception
+        logger.debug($!)
+        logger.debug($!.backtrace)
       end
       render_file_without_gettext(template_path, use_full_path, local_assigns)
     end
@@ -506,7 +511,7 @@ module ActionController #:nodoc: all
       def expire_fragment_with_gettext(name, options = nil)
         return unless perform_caching
 
-        fc_store = (defined? :cache_store) ? cache_store : fragment_cache_store
+        fc_store = (respond_to? :cache_store) ? cache_store : fragment_cache_store
         key = name.is_a?(Regexp) ? name : fragment_cache_key_without_gettext(name)
         if key.is_a?(Regexp)
           self.class.benchmark "Expired fragments matching: #{key.source}" do

data/lib/gettext/rgettext.rb

@@ -25,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2008/07/26 06:59:34 $)[1]
+    DATE = %w($Date: 2008/08/06 17:35:52 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -109,19 +109,20 @@ msgstr ""
 	end
 	msgid.gsub!(/"/, '\"')
 	msgid.gsub!(/\r/, '')
+	if msgid.include?("\004")
+	  msgctxt, msgid = msgid.split(/\004/)
+	  str << "\nmsgctxt \"" << msgctxt << "\"\n"
+        else
+          str << "\n"
+	end	
 	if msgid.include?("\000")
 	  ids = msgid.split(/\000/)
-	  str << "\nmsgid \"" << ids[0] << "\"\n"
+	  str << "msgid \"" << ids[0] << "\"\n"
 	  str << "msgid_plural \"" << ids[1] << "\"\n"
 	  str << "msgstr[0] \"\"\n"
 	  str << "msgstr[1] \"\"\n"
-	elsif msgid.include?("\004")
-	  ids = msgid.split(/\004/)
-	  str << "\nmsgctxt \"" << ids[0] << "\"\n"
-	  str << "msgid \"" << ids[1] << "\"\n"
-	  str << "msgstr \"\"\n"
 	else
-	  str << "\nmsgid \"" << msgid << "\"\n"
+	  str << "msgid \"" << msgid << "\"\n"
 	  str << "msgstr \"\"\n"
 	end
       end

data/lib/gettext/utils.rb

@@ -21,8 +21,21 @@ require 'fileutils'
 module GetText
   bindtextdomain "rgettext"
 
+  BOM_UTF8 = [0xef, 0xbb, 0xbf].pack("c3")
+
   module_function
 
+  # Currently, GNU msgmerge doesn't accept BOM. 
+  # This mesthod remove the UTF-8 BOM from the po-file.
+  def remove_bom(path)  #:nodoc:
+    bom = IO.read(path, 3)
+    if bom == BOM_UTF8
+      data = IO.read(path)
+      File.open(path, "w") do |out|
+        out.write(data[3..-1])
+      end
+    end
+  end
 
   # Merges two Uniforum style .po files together. 
   #
@@ -45,15 +58,16 @@ module GetText
   # * app_version: the application information which appears "Project-Id-Version: #{app_version}" in the pot/po-files.
   # * Returns: self 
   def msgmerge(defpo, refpo, app_version) 
-    $stderr.puts defpo
+    $stderr.print defpo + " "
     cmd = ENV["MSGMERGE_PATH"] || "msgmerge"
 
     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.")
+      `#{cmd} --help`
+      unless $? && $?.success?
+        raise _("`%{cmd}' may not be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly.") % {:cmd => cmd}
       end
+      remove_bom(defpo)
       cont = `#{cmd} #{defpo} #{refpo}`
     else
       File.open(refpo) do |io| 

data/lib/gettext/version.rb

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

data/lib/locale/object.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: object.rb,v 1.3 2008/01/27 10:58:10 mutoh Exp $
+  $Id: object.rb,v 1.4 2008/08/19 16:22:34 mutoh Exp $
 =end
 
 
@@ -95,11 +95,15 @@ module Locale
     #  "de_DE@collation=phonebook,currency=DDM" => ["de", "DE", nil, nil, "collation=phonebook,currency=DDM"]
 
     def self.parse(locale_name)
-      lang_charset, modifier = locale_name.split(/@/)
-      lang, charset = lang_charset.split(/\./)
-      language, country, script, variant = lang.gsub(/_/, "-").split('-')
-      language = language ? language.downcase : nil
-      language = "en" if language == "c" || language == "posix"
+      if locale_name.nil? || locale_name.empty?
+        return ["en", nil, nil, nil, nil, nil]
+      else
+        lang_charset, modifier = locale_name.split(/@/)
+        lang, charset = lang_charset.split(/\./)
+        language, country, script, variant = lang.gsub(/_/, "-").split('-')
+        language = language ? language.downcase : nil
+        language = "en" if language == "c" || language == "posix"
+      end
       if country
 	if country =~ /\A[A-Z][a-z]+\Z/  #Latn => script
 	  tmp = script

data/lib/locale/posix.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: posix.rb,v 1.2 2007/11/08 16:44:22 mutoh Exp $
+  $Id: posix.rb,v 1.4 2008/09/15 16:32:39 mutoh Exp $
 =end
 
 require 'locale/base'
@@ -16,7 +16,21 @@ module Locale
   # This is a low-level class. Application shouldn't use this directly.
   module SystemPosix
     extend SystemBase
+
+    module_function
+    # Gets the charset of the locale.
+    # * locale: Locale::Object
+    # * Returns the charset of the locale
+    def get_charset(locale)
+      charset = `LANG=#{locale.to_str};locale charmap`.strip
+      unless $? && $?.success?
+        charset = "UTF-8"
+      end
+      charset
+    end  
   end
+
   @@locale_system_module = SystemPosix
+
 end
 

data/po/bg/rails.po

@@ -0,0 +1,169 @@
+#
+# 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.
+#
+# Georgi Stoimenov <georgistoimenov@abv.bg>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ruby-gettext 1.92.0\n"
+"POT-Creation-Date: 2008-09-14 01:48+0900\n"
+"PO-Revision-Date: 2008-07-11 11:35+0300\n"
+"Last-Translator: Sava Chankov <sava.chankov@gmail.com>\n"
+"Language-Team: Bulgarian <ruby-on-rails-bulgaria@googlegroups.com>\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:327
+msgid "%{num} error prohibited this %{record} from being saved"
+msgid_plural "%{num} errors prohibited this %{record} from being saved"
+msgstr[0] "Поради %{num} грешка %{record} не беше записан"
+msgstr[1] "Поради %{num} грешки %{record} не беше записан"
+
+#: lib/gettext/rails.rb:329
+msgid "There was a problem with the following field:"
+msgid_plural "There were problems with the following fields:"
+msgstr[0] "Проблемът се дължи на:"
+msgstr[1] "Проблемите се дължат на:"
+
+#: lib/gettext/rails.rb:435
+msgid "less than 5 seconds"
+msgstr "по-малко от 5 секунди"
+
+#: lib/gettext/rails.rb:435
+msgid "less than 10 seconds"
+msgstr "по-малко от 10 секунди"
+
+#: lib/gettext/rails.rb:435
+msgid "less than 20 seconds"
+msgstr "по-малко от 20 секунди"
+
+#: lib/gettext/rails.rb:436
+msgid "half a minute"
+msgstr "половин минута"
+
+#: lib/gettext/rails.rb:436
+msgid "less than a minute"
+msgstr "по-малко от минута"
+
+#: lib/gettext/rails.rb:436
+msgid "about 1 month"
+msgstr "около 1 месец"
+
+#: lib/gettext/rails.rb:437
+msgid "about 1 year"
+msgstr "около 1 година"
+
+#: lib/gettext/rails.rb:438
+msgid "1 minute"
+msgid_plural "%{num} minutes"
+msgstr[0] "1 минута"
+msgstr[1] "%{num} минути"
+
+#: lib/gettext/rails.rb:439
+msgid "about 1 hour"
+msgid_plural "about %{num} hours"
+msgstr[0] "около час"
+msgstr[1] "около %{num} часа"
+
+#: lib/gettext/rails.rb:440
+msgid "1 day"
+msgid_plural "%{num} days"
+msgstr[0] "1 ден"
+msgstr[1] "%{num} дни"
+
+#: lib/gettext/rails.rb:441
+msgid "1 month"
+msgid_plural "%{num} months"
+msgstr[0] "1 месец"
+msgstr[1] "%{num} месеци"
+
+#: lib/gettext/rails.rb:442
+msgid "over 1 year"
+msgid_plural "over %{num} years"
+msgstr[0] "повече от година"
+msgstr[1] "повече %{num} години"
+
+#: lib/gettext/active_record.rb:28
+msgid "Validation failed: %{error_messages}"
+msgstr "Неуспешна валидация: %{error_messages}"
+
+#: lib/gettext/active_record.rb:247
+msgid "%{fn} is not included in the list"
+msgstr "Полето „%{fn}“ не е в списъка"
+
+#: lib/gettext/active_record.rb:248
+msgid "%{fn} is reserved"
+msgstr "Полето „%{fn}“ е резервирано"
+
+#: lib/gettext/active_record.rb:249
+msgid "%{fn} is invalid"
+msgstr "Полето „%{fn}“ е невалидно"
+
+#: lib/gettext/active_record.rb:250
+msgid "%{fn} doesn't match confirmation"
+msgstr "%{fn} не съвпада"
+
+#: lib/gettext/active_record.rb:251
+msgid "%{fn} must be accepted"
+msgstr "Полето „%{fn}“ трябва бъде прието"
+
+#: lib/gettext/active_record.rb:252
+msgid "%{fn} can't be empty"
+msgstr "Полето „%{fn}“ не може да е празно"
+
+#: lib/gettext/active_record.rb:253
+msgid "%{fn} can't be blank"
+msgstr "Полето „%{fn}“ не може да е празно"
+
+#: lib/gettext/active_record.rb:254
+msgid "%{fn} is too long (maximum is %d characters)"
+msgstr "Полето „%{fn}“ е много дълго (максимумът е %d символа)"
+
+#: lib/gettext/active_record.rb:255
+msgid "%{fn} is too short (minimum is %d characters)"
+msgstr "Полето „%{fn}“ е много късо (минимумът е %d символа)"
+
+#: lib/gettext/active_record.rb:256
+msgid "%{fn} is the wrong length (should be %d characters)"
+msgstr "Полето „%{fn}“ е с неправилна дължина (трябва да е %d символа)"
+
+#: lib/gettext/active_record.rb:257
+msgid "%{fn} has already been taken"
+msgstr "Полето „%{fn}“ е вече заето"
+
+#: lib/gettext/active_record.rb:258
+msgid "%{fn} is not a number"
+msgstr "Полето „%{fn}“ не е число"
+
+#: lib/gettext/active_record.rb:259
+msgid "%{fn} must be greater than %d"
+msgstr "Полето „%{fn}“ трябва бъде по-голямо от %d"
+
+#: lib/gettext/active_record.rb:260
+msgid "%{fn} must be greater than or equal to %d"
+msgstr "Полето „%{fn}“ трябва бъде по-голямо или равно на %d"
+
+#: lib/gettext/active_record.rb:261
+msgid "%{fn} must be equal to %d"
+msgstr "Полето „%{fn}“ трябва бъде равно на %d"
+
+#: lib/gettext/active_record.rb:262
+msgid "%{fn} must be less than %d"
+msgstr "Полето „%{fn}“ трябва бъде по-малко от %d"
+
+#: lib/gettext/active_record.rb:263
+msgid "%{fn} must be less than or equal to %d"
+msgstr "Полето „%{fn}“ трябва бъде по-малко или равно на %d"
+
+#: lib/gettext/active_record.rb:264
+msgid "%{fn} must be odd"
+msgstr "Полето „%{fn}“ трябва бъде нечетно"
+
+#: lib/gettext/active_record.rb:265
+msgid "%{fn} must be even"
+msgstr "Полето „%{fn}“ трябва бъде четно"

data/po/bg/rgettext.po

@@ -0,0 +1,146 @@
+#
+# 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.
+#
+# Georgi Stoimenov <georgistoimenov@abv.bg>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ruby-gettext 1.92.0\n"
+"POT-Creation-Date: 2008-09-14 01:48+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Sava Chankov <sava.chankov@gmail.com>\n"
+"Language-Team: Bulgarian <ruby-on-rails-bulgaria@googlegroups.com>\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:68
+msgid ""
+"`%{cmd}' may not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgstr ""
+
+#: lib/gettext/utils.rb:80
+msgid "Failed to merge with %{defpo}"
+msgstr "Пропадна сливането с %{defpo}"
+
+#: lib/gettext/utils.rb:81
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "Новия .pot беше копиран като %{failed_filename}"
+
+#: lib/gettext/utils.rb:82
+msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+msgstr ""
+"Проверете тези po/pot файлове. Може да имат синтактични грешки или нещо "
+"друго."
+
+#: lib/gettext/rgettext.rb:43
+msgid "'%{klass}' is ignored."
+msgstr "'%{klass}' беше игнориран."
+
+#: lib/gettext/rgettext.rb:189
+msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
+msgstr "Употреба: %s input.rb [-r parser.rb] [-o output.pot] "
+
+#: lib/gettext/rgettext.rb:191
+msgid "Extract translatable strings from given input files."
+msgstr "Извличане на преводните низове от зададените файлове."
+
+#: lib/gettext/rgettext.rb:193 lib/gettext/rmsgfmt.rb:51
+#: lib/gettext/rmsgmerge.rb:408
+msgid "Specific options:"
+msgstr "Специфични опции:"
+
+#: lib/gettext/rgettext.rb:195 lib/gettext/rmsgfmt.rb:53
+#: lib/gettext/rmsgmerge.rb:410
+msgid "write output to specified file"
+msgstr "изходът беше записан в зададения файл"
+
+#: lib/gettext/rgettext.rb:199
+msgid "File '%s' already exists."
+msgstr "Файлът '%s' съществува."
+
+#: lib/gettext/rgettext.rb:204
+msgid "require the library before executing rgettext"
+msgstr "заредете библиотеката с require преди да изпълните rgettext"
+
+#: lib/gettext/rgettext.rb:208
+msgid "run in debugging mode"
+msgstr "изпълнение в режим на дебъгване"
+
+#: lib/gettext/rgettext.rb:212 lib/gettext/rmsgfmt.rb:57
+#: lib/gettext/rmsgmerge.rb:421
+msgid "display version information and exit"
+msgstr "показване на версията и изход"
+
+#: lib/gettext/rgettext.rb:236 lib/gettext/rmsgfmt.rb:31
+msgid "no input files"
+msgstr "няма зададени файлове"
+
+#: lib/gettext/rmsgfmt.rb:47
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Употреба: %s input.po [-o output.mo]"
+
+#: lib/gettext/rmsgfmt.rb:49
+msgid "Generate binary message catalog from textual translation description."
+msgstr "Генериране на двоични файлове с преводите от текстовите описания."
+
+#: lib/gettext/rmsgmerge.rb:403
+msgid "Usage: %s def.po ref.pot [-o output.pot]"
+msgstr "Употреба: %s def.po ref.pot [-o output.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 ""
+"Слива два Uniforum .pо файла. def.po е съществуващ PO файл с преводи. ref."
+"pot е пресен PO файл с актуални референции към кода. ref.pot обикновено е "
+"създаден от rgettext."
+
+#: lib/gettext/rmsgmerge.rb:447
+msgid "definition po is not given."
+msgstr "съществуващия po не е зададен."
+
+#: lib/gettext/rmsgmerge.rb:449
+msgid "reference pot is not given."
+msgstr "pot с референциите не е зададен."
+
+#: lib/gettext/parser/glade.rb:74
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "`%{file}' не е във формат glade-2.0."
+
+#: lib/gettext/parser/active_record.rb:39
+msgid "'%{file}' is not found."
+msgstr "'%{file}' не беше намерен."
+
+#: lib/gettext/parser/active_record.rb:80
+msgid "Ignored '%{file}'. Solve dependencies first."
+msgstr "'%{file}' беше игнориран. Първо оправете зависимостите."
+
+#: lib/gettext/parser/active_record.rb:104
+msgid "No database is available."
+msgstr "Базата данни я е хванала липса."
+
+#: lib/gettext/parser/active_record.rb:140
+msgid "rubygems are not found."
+msgstr "rubygems липсват."
+
+#: lib/gettext.rb:417
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr "Третият параметър е грешен: value = %{number}"
+
+#: src/poparser.ry:38 src/poparser.ry:55
+msgid "Warning: fuzzy message was ignored.\n"
+msgstr "Предупреждение: беше игнорирано неточно съобщение"
+
+#: src/poparser.ry:148
+msgid "Warning: obsolete msgid exists.\n"
+msgstr ""
+"Предупреждение: има несъществуващи вече msgid\n"
+"."