gettext 1.0.0-mswin32 → 1.1.0-mswin32

data/bin/rgettext

@@ -6,6 +6,8 @@
   
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
+
+  $Id: rgettext,v 1.4 2005/11/27 15:35:54 mutoh Exp $
 =end
 
 begin

data/bin/rmsgfmt

@@ -6,6 +6,8 @@
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
+
+  $Id: rmsgfmt,v 1.3 2005/11/27 15:35:54 mutoh Exp $
 =end
 
 begin

data/bin/rmsgmerge

@@ -0,0 +1,24 @@
+#! e:/ruby/bin/ruby
+=begin
+  rmsgmerge - ruby version of msgmerge
+
+  Copyright (C) 2005  Masao Mutoh
+ 
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: rmsgmerge,v 1.2 2005/11/27 15:35:54 mutoh Exp $
+=end
+
+begin
+  require 'gettext/rmsgmerge'
+rescue LoadError
+  begin
+    require 'rubygems'
+    require_gem 'gettext/rmsgmerge'
+  rescue LoadError
+    raise 'Ruby-GetText-Package are not installed.'
+  end
+end
+
+GetText.rmsgmerge

data/ext/gettext/gettext/_locale.BAK

@@ -0,0 +1,86 @@
+/* -*- c-file-style: "ruby"; tab-width: 4 -*-
+ *
+ * Copyright (C) 2002-2005 Masao Mutoh
+ * 
+ * You may redistribute it and/or modify it under the same
+ * license terms as Ruby.
+ * 
+ * $Id: _locale.c,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+ */
+
+#include "ruby.h"
+
+#if defined HAVE_WINDOWS_H
+# include <windows.h>
+#else
+# if defined HAVE_SETLOCALE
+#  include <locale.h>
+# endif
+# if defined HAVE_NL_LANGINFO
+#  include <langinfo.h>
+# endif
+#endif
+#ifndef StringValuePtr
+#define StringValuePtr(s) STR2CSTR(s)
+#endif
+
+#if defined HAVE_WINDOWS_H
+static VALUE
+gt_locale_id_win32(self)
+    VALUE self;
+{
+	int lcid, pri_id, sub_id;
+	lcid = GetUserDefaultLangID();
+	pri_id = lcid & 0x3ff;
+	sub_id = lcid >> 10;
+	return rb_assoc_new(INT2FIX(pri_id), INT2FIX(sub_id));
+}
+#endif
+static VALUE
+gt_setlocale(self, type, locale)
+    VALUE self, type, locale;
+{
+# if defined HAVE_SETLOCALE
+    char* ret = setlocale(NUM2INT(type), 
+			  NIL_P(locale) ? NULL : StringValuePtr(locale));
+    return ret == NULL ? rb_str_new2("C") : rb_str_new2(ret);
+# else
+    return rb_str_new2("C");
+# endif
+}
+
+static VALUE
+gt_codeset(self)
+	VALUE self;
+{
+#if defined HAVE_WINDOWS_H
+	char buf[2 + 10 + 1];
+	sprintf (buf, "CP%u", GetACP ());
+	return rb_str_new2(buf);
+#elif defined HAVE_NL_LANGINFO
+	return rb_str_new2(nl_langinfo(CODESET));
+#else
+	return rb_str_new2("UTF-8");
+#endif
+}
+
+void Init__locale()
+{
+    VALUE mLocale = rb_define_module("Locale");
+
+#if defined HAVE_WINDOWS_H
+    rb_define_module_function(mLocale, "__locale_id", gt_locale_id_win32, 0);
+#endif
+    rb_define_module_function(mLocale, "set", gt_setlocale, 2);
+    rb_define_module_function(mLocale, "codeset", gt_codeset, 0);
+# if defined HAVE_SETLOCALE
+    rb_define_const(mLocale, "ALL", INT2NUM(LC_ALL));
+    rb_define_const(mLocale, "COLLATE", INT2NUM(LC_COLLATE));
+    rb_define_const(mLocale, "CTYPE", INT2NUM(LC_CTYPE));
+    rb_define_const(mLocale, "MESSAGES", INT2NUM(LC_MESSAGES));
+    rb_define_const(mLocale, "MONETARY", INT2NUM(LC_MONETARY));
+    rb_define_const(mLocale, "NUMERIC", INT2NUM(LC_NUMERIC));
+    rb_define_const(mLocale, "TIME", INT2NUM(LC_TIME));
+#endif
+
+}

data/ext/gettext/gettext/_locale.c

@@ -73,7 +73,7 @@ void Init__locale()
 #endif
     rb_define_module_function(mLocale, "set", gt_setlocale, 2);
     rb_define_module_function(mLocale, "codeset", gt_codeset, 0);
-# if defined HAVE_SETLOCALE
+#if defined HAVE_SETLOCALE
     rb_define_const(mLocale, "ALL", INT2NUM(LC_ALL));
     rb_define_const(mLocale, "COLLATE", INT2NUM(LC_COLLATE));
     rb_define_const(mLocale, "CTYPE", INT2NUM(LC_CTYPE));

data/ext/gettext/gettext/mkmf.log

@@ -1,11 +1,11 @@
 have_header: checking for windows.h... -------------------- yes
 
-"cl -IC:/tmp/ruby-gettext-package-1.0.0/ext/gettext/gettext -Ie:/ruby/lib/ruby/1.8/i386-mswin32 -I. -I./.. -I./../missing -MD -Zi -O2b2xg- -G6  conftest.c -P"
-Microsoft(R) 32-bit C/C++ Standard Compiler Version 13.10.3077 for 80x86
+"cl -IE:/ruby-gettext-package-1.1.0/ext/gettext/gettext -Ie:/ruby/lib/ruby/1.8/i386-mswin32 -I. -I./.. -I./../missing -MD -Zi -O2b2xg- -G6  conftest.c -P"
+Microsoft (R) 32-bit C/C++ Standard Compiler Version 13.10.3077 for 80x86
 Copyright (C) Microsoft Corporation 1984-2002. All rights reserved.
 
-cl : �R�}���h ���C�� warning D4029 : �W���̕ҏW�R���p�C���ł͍œK���͎g�p�ł��܂���B
-cl : �R�}���h ���C�� warning D4002 : �F���s�”\�ȃI�v�V���� '-Og-' �𖳎����܂����B
+cl : Command line warning D4029 : optimization is not available in the standard edition compiler
+cl : Command line warning D4002 : ignoring unknown option '-Og-'
 conftest.c
 checked program was:
 /* begin */

data/lib/gettext.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+  $Id: gettext.rb,v 1.5 2005/11/30 17:59:14 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -18,6 +18,7 @@ require 'gettext/version'
 require 'gettext/mo'
 require 'gettext/locale'
 require 'gettext/textdomain'
+require 'gettext/string'
 
 module GetText
   class NoboundTextDomainError < RuntimeError
@@ -27,9 +28,15 @@ module GetText
   @@__textdomain_key = Hash.new
 
   @@output_charset = nil
+  @@locale = nil
 
   def bindtextdomain(domainname, path = nil, locale = nil, charset = nil)
-    locale ||= Locale.get
+    if @@locale
+      locale = @@locale
+      Locale.set(Locale::CTYPE, locale)
+    else
+      locale ||= Locale.get
+    end
     if @@output_charset
       charset = @@output_charset
     else
@@ -43,6 +50,7 @@ module GetText
       textdomain = @@__textdomain_key[domainname]
       @@__textdomain[src] = textdomain
     end
+
     if ! textdomain or ! textdomain.same_property?(domainname, path, locale, charset)
       textdomain = TextDomain.new(domainname, path, locale, charset)
       @@__textdomain_key[domainname] = textdomain
@@ -67,7 +75,7 @@ module GetText
   
   def ngettext(msgid, msgid_plural, n)
     textdomain = @@__textdomain[callersrc]
-    textdomain ? textdomain.ngettext(msgid, msgid_plural, n) : msgid
+    textdomain ? textdomain.ngettext(msgid, msgid_plural, n) : (n == 1 ? msgid : msgid_plural)
   end
   
   def N_(msgid)
@@ -94,6 +102,7 @@ module GetText
   end
 
   def locale=(locale)
+    @@locale = locale
     textdomain = @@__textdomain[callersrc]
     textdomain.set_locale(locale) if textdomain
     locale
@@ -107,6 +116,10 @@ module GetText
     @@output_charset
   end
 
+  def locale
+    @@locale
+  end
+
   def charset=(cs)
     textdomain = @@__textdomain[callersrc]
     textdomain.set_charset(cs) if textdomain
@@ -122,6 +135,6 @@ module GetText
   module_function :bindtextdomain, :textdomain, 
     :N_, :gettext, :_, :ngettext, :n_, 
     :sgettext, :s_, :callersrc,
-    :setlocale, :set_locale, :locale=, :charset=,
+    :setlocale, :set_locale, :locale=, :locale, :charset=,
     :set_output_charset, :output_charset=, :output_charset
 end

data/lib/gettext/cgi.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: cgi.rb,v 1.2 2005/08/27 18:52:20 mutoh Exp $
+  $Id: cgi.rb,v 1.4 2005/12/07 17:09:39 mutoh Exp $
 =end
 
 require 'cgi'
@@ -14,8 +14,10 @@ require 'gettext'
 
 module Locale
   alias :orig_get :get
+  alias :orig_set :set
 
   @@cgi = nil
+  @@locale_cgi = nil
 
   module_function
   def cgi=(cgi)
@@ -27,28 +29,40 @@ module Locale
     @@cgi
   end
 
-  def get
-    @@cgi = CGI.new unless @@cgi
-    if ret = @@cgi["lang"] and ret.size > 0
-      $stderr.print "query_string: lang = #{ret}\n" if $DEBUG
-    elsif ret = @@cgi.cookies["lang"][0]
-      print "cookie: lang = #{ret}\n" if $DEBUG
-    elsif lang = @@cgi.accept_language
-      $stderr.print "accept lanaugage: lang = #{lang}\n" if $DEBUG
- 
-      lang = lang.split(',').first.split('-') rescue []
-      language = lang[0]
-      dialect  = lang[1]
-      language = language ? language.downcase : 'en' # default is en
-      dialect  = dialect ? "_#{dialect.upcase}" : ""
-      ret = "#{language}#{dialect}"
-    else
-      ret = "en"
+  def normalize(lang)
+    lang = lang.split(',').first.gsub(/_/, "-").split('-') rescue []
+    language = lang[0]
+    dialect  = lang[1]
+    language = language ? language.downcase : 'en' # default is en
+    dialect  = dialect ? "_#{dialect.upcase}" : ""
+    ret = "#{language}#{dialect}" 
+  end
+
+  def get(lctype = Locale::CTYPE) #lctype doesn't used here.
+    ret = @@locale_cgi
+    unless ret
+      @@cgi = CGI.new unless @@cgi
+      if ret = @@cgi["lang"] and ret.size > 0
+	$stderr.print "query_string: lang = #{ret}\n" if $DEBUG
+      elsif ret = @@cgi.cookies["lang"][0]
+	$stderr.print "cookie: lang = #{ret}\n" if $DEBUG
+      elsif lang = @@cgi.accept_language
+	$stderr.print "accept lanaugage: lang = #{lang}\n" if $DEBUG
+	ret = normalize(lang)
+      else
+	ret = "en"
+      end
     end
     $stderr.print "Locale.get = #{ret}\n" if $DEBUG
     ret
   end
 
+  def set(lctype, loc)
+    # Override this method. Because the value from WWW browser doesn't
+    # match to the locale strings of POSIX setlocale.
+    @@locale_cgi = loc
+  end
+
   def codeset
     @@cgi = CGI.new unless @@cgi
     codesets = @@cgi.accept_charset
@@ -61,9 +75,10 @@ module Locale
   end
 
   alias :charset :codeset
+  alias :setlocale :set
   alias :set_cgi :cgi=
 
-  module_function :charset, :set_cgi
+  module_function :charset, :set_cgi, :set, :setlocale
 end
 
 module GetText

data/lib/gettext/locale.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale.rb,v 1.3 2005/08/22 16:56:33 mutoh Exp $
+  $Id: locale.rb,v 1.4 2005/09/04 17:47:54 mutoh Exp $
 =end
 
 begin
@@ -41,18 +41,8 @@ else
 end
 
 module Locale
-  def get
-    ret = __get
-    return ret if ret
-    
-    ret = nil
-    ["LC_ALL", "LC_MESSAGES", "LANG"].each do |env|
-      ret = ENV[env]
-      break if ret
-    end
-    
-    ret = "C" unless ret
-    ret
+  def get(lctype = Locale::CTYPE)
+    __get(lctype)
   end
   
   alias :setlocale :set

data/lib/gettext/locale_default.rb

@@ -6,14 +6,14 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_default.rb,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+  $Id: locale_default.rb,v 1.3 2005/09/04 17:47:54 mutoh Exp $
 =end
 
 module Locale
   @@locale_initialized = false
   alias :__set :set
   def __get(lctype = Locale::CTYPE)
-    # Initialize CTYPE first lazily. 
+    # Initialize lctype lazily. 
     # This isn't called when 'gettext/cgi' is required.
     unless @@locale_initialized
       Locale.set(lctype, "") 

data/lib/gettext/locale_win32.rb

@@ -6,19 +6,39 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_win32.rb,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+  $Id: locale_win32.rb,v 1.3 2005/09/04 17:47:54 mutoh Exp $
 =end
 
 require 'gettext/locale_table_win32'
 
 module Locale
-  def __get
-    pri_id, sub_id = __locale_id
-    lang = LocaleTable.assoc(pri_id)
-    if lang.size == 3
-      lang = lang[2].assoc(sub_id)
+  @@locale_win32 = {}
+  def __get(lctype = Locale::CTYPE)
+    ret = nil
+    if @@locale_win32[lctype] 
+      ret = @@locale_win32[lctype]
+    else
+      ["LC_ALL", "LC_MESSAGES", "LANG"].each do |env|
+	ret = ENV[env]
+	break if ret
+      end
+      unless ret
+	pri_id, sub_id = __locale_id
+	lang = LocaleTable.assoc(pri_id)
+	if lang.size == 3
+	  lang = lang[2].assoc(sub_id)
+	end
+	ret = lang ? lang[1] : "C"
+      end
+      @@locale_win32[lctype] = ret
+    end
+    ret
+  end
+
+  def set(lctype, loc)
+    if lctype == ALL
+      @@locale_win32[lctype] = loc
     end
-    lang ? lang[1] : nil
   end
 
   unless defined? CTYPE