resutructure/enhance charset definitions:

${category}_default_charset and ${category}_charset_{ja,en,...}

9 files changed, 106 insertions, 42 deletions

diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 1aee3a6b..0e5db44f 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -621,7 +621,7 @@ template_file_charset	=	euc-jp
 #      History:
 #        Value:
 #     Examples:
-default_message_subject	=	fml system message ($ml_name ML)
+message_default_subject	=	fml system message ($ml_name ML)
 
 
 # Descriptions:
@@ -1696,19 +1696,19 @@ ml_admin_cgi_base_dir	=	$cgi_base_dir/ml-admin/$ml_name
 #      History:
 #        Value:
 #     Examples:
-default_cgi_charset	=	us-ascii
+cgi_default_charset	=	us-ascii
 
 # Descriptions: cgi charset
 #      History:
 #        Value:
 #     Examples:
-cgi_charset		=	$default_cgi_charset
+cgi_charset		=	$cgi_default_charset
 
 # Descriptions: language mode of CGI (!= charset) 
 #      History:
 #        Value:
 #     Examples:
-default_cgi_language   =       english
+cgi_default_language   =       english
 
 # Descriptions: available language mode in CGI
 #      History:
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index c0cd40cc..2c2a3bca 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -66,11 +66,6 @@
 maintainer	=
 
 
-=head2	言語
-
-default_charset		=	iso-2022-jp
-
-
 =head2	default modes
 
 
@@ -617,20 +612,50 @@ digest_sequence_file	= $ml_home_dir/seq-digest
 #      History:
 #        Value:
 #     Examples:
-reply_message_charset	=	$default_charset
+reply_message_default_charset	=	$reply_message_charset_ja
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-template_file_charset	=	euc-jp
+reply_message_charset_ja	=	iso-2022-jp
 
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+reply_message_charset_en	=	us-ascii
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_default_charset	=	$template_file_charset_ja
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_message_subject	=	fml system message ($ml_name ML)
+template_file_charset_ja	=	euc-jp
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_charset_en	=	us-ascii
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_charset_list	=	euc-jp	
+					us-ascii
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+message_default_subject	=	fml system message ($ml_name ML)
 
 
 # Descriptions:
@@ -1454,7 +1479,7 @@ privileged_command_prefix	=	admin
 #      History: /usr/local/fml/listinfo/
 #        Value: directory
 #     Examples: /usr/local/share/fml/$fml_version/listinfo/$language
-listinfo_template_dir	= $fml_share_dir/listinfo/$template_file_charset
+listinfo_template_dir	= $fml_share_dir/listinfo/$template_file_default_charset
 
 
 # Descriptions: information をおくディレクトリ (ＭＬごと)
@@ -1748,24 +1773,32 @@ admin_cgi_base_dir	=	$cgi_base_dir/admin
 ml_admin_cgi_base_dir	=	$cgi_base_dir/ml-admin/$ml_name
 
 
-# Descriptions: デフォルトの CHARSET
+# Descriptions: CGI の表示の CHARSET
+#      History:
+#        Value:
+#     Examples:
+cgi_default_charset	=	$cgi_charset_ja
+
+
+# Descriptions: CGI の表示の CHARSET
 #      History:
 #        Value:
 #     Examples:
-default_cgi_charset	=	euc-jp
+cgi_charset_ja	=	euc-jp
+
 
 # Descriptions: CGI の表示の CHARSET
 #      History:
 #        Value:
 #     Examples:
-cgi_charset		=	$default_cgi_charset
+cgi_charset_en	=	us-ascii
 
 
 # Descriptions: CGI の言語モード (!= charset) 
 #      History:
 #        Value:
 #     Examples:
-default_cgi_language	=	japanese
+cgi_default_language	=	japanese
 
 
 # Descriptions: CGI で利用可能な言語モード (!= charset) 
diff --git a/fml/etc/src/config.cf.en/cgi.cf b/fml/etc/src/config.cf.en/cgi.cf
index c930ebf2..7d183d86 100644
--- a/fml/etc/src/config.cf.en/cgi.cf
+++ b/fml/etc/src/config.cf.en/cgi.cf
@@ -28,19 +28,19 @@ ml_admin_cgi_base_dir	=	$cgi_base_dir/ml-admin/$ml_name
 #      History:
 #        Value:
 #     Examples:
-default_cgi_charset	=	us-ascii
+cgi_default_charset	=	us-ascii
 
 # Descriptions: cgi charset
 #      History:
 #        Value:
 #     Examples:
-cgi_charset		=	$default_cgi_charset
+cgi_charset		=	$cgi_default_charset
 
 # Descriptions: language mode of CGI (!= charset) 
 #      History:
 #        Value:
 #     Examples:
-default_cgi_language   =       english
+cgi_default_language   =       english
 
 # Descriptions: available language mode in CGI
 #      History:
diff --git a/fml/etc/src/config.cf.en/messages.cf b/fml/etc/src/config.cf.en/messages.cf
index 78fdde53..18290464 100644
--- a/fml/etc/src/config.cf.en/messages.cf
+++ b/fml/etc/src/config.cf.en/messages.cf
@@ -19,7 +19,7 @@ template_file_charset	=	euc-jp
 #      History:
 #        Value:
 #     Examples:
-default_message_subject	=	fml system message ($ml_name ML)
+message_default_subject	=	fml system message ($ml_name ML)
 
 
 # Descriptions:
diff --git a/fml/etc/src/config.cf.ja/basic.cf b/fml/etc/src/config.cf.ja/basic.cf
index 2b68dd44..510dd7ae 100644
--- a/fml/etc/src/config.cf.ja/basic.cf
+++ b/fml/etc/src/config.cf.ja/basic.cf
@@ -9,11 +9,6 @@
 maintainer	=
 
 
-=head2	言語
-
-default_charset		=	iso-2022-jp
-
-
 =head2	default modes
 
 
diff --git a/fml/etc/src/config.cf.ja/cgi.cf b/fml/etc/src/config.cf.ja/cgi.cf
index e46e99f6..7b53151c 100644
--- a/fml/etc/src/config.cf.ja/cgi.cf
+++ b/fml/etc/src/config.cf.ja/cgi.cf
@@ -25,24 +25,32 @@ admin_cgi_base_dir	=	$cgi_base_dir/admin
 ml_admin_cgi_base_dir	=	$cgi_base_dir/ml-admin/$ml_name
 
 
-# Descriptions: デフォルトの CHARSET
+# Descriptions: CGI の表示の CHARSET
+#      History:
+#        Value:
+#     Examples:
+cgi_default_charset	=	$cgi_charset_ja
+
+
+# Descriptions: CGI の表示の CHARSET
 #      History:
 #        Value:
 #     Examples:
-default_cgi_charset	=	euc-jp
+cgi_charset_ja	=	euc-jp
+
 
 # Descriptions: CGI の表示の CHARSET
 #      History:
 #        Value:
 #     Examples:
-cgi_charset		=	$default_cgi_charset
+cgi_charset_en	=	us-ascii
 
 
 # Descriptions: CGI の言語モード (!= charset) 
 #      History:
 #        Value:
 #     Examples:
-default_cgi_language	=	japanese
+cgi_default_language	=	japanese
 
 
 # Descriptions: CGI で利用可能な言語モード (!= charset) 
diff --git a/fml/etc/src/config.cf.ja/command.cf b/fml/etc/src/config.cf.ja/command.cf
index 4689c2c9..ef5c2875 100644
--- a/fml/etc/src/config.cf.ja/command.cf
+++ b/fml/etc/src/config.cf.ja/command.cf
@@ -277,7 +277,7 @@ privileged_command_prefix	=	admin
 #      History: /usr/local/fml/listinfo/
 #        Value: directory
 #     Examples: /usr/local/share/fml/$fml_version/listinfo/$language
-listinfo_template_dir	= $fml_share_dir/listinfo/$template_file_charset
+listinfo_template_dir	= $fml_share_dir/listinfo/$template_file_default_charset
 
 
 # Descriptions: information をおくディレクトリ (ＭＬごと)
diff --git a/fml/etc/src/config.cf.ja/messages.cf b/fml/etc/src/config.cf.ja/messages.cf
index 62cab59c..c59f753b 100644
--- a/fml/etc/src/config.cf.ja/messages.cf
+++ b/fml/etc/src/config.cf.ja/messages.cf
@@ -6,20 +6,50 @@
 #      History:
 #        Value:
 #     Examples:
-reply_message_charset	=	$default_charset
+reply_message_default_charset	=	$reply_message_charset_ja
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-template_file_charset	=	euc-jp
+reply_message_charset_ja	=	iso-2022-jp
 
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+reply_message_charset_en	=	us-ascii
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_default_charset	=	$template_file_charset_ja
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_charset_ja	=	euc-jp
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_charset_en	=	us-ascii
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_charset_list	=	euc-jp	
+					us-ascii
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_message_subject	=	fml system message ($ml_name ML)
+message_default_subject	=	fml system message ($ml_name ML)
 
 
 # Descriptions:
diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm
index 200e183b..6bfbdf11 100644
--- a/fml/lib/FML/Process/Utils.pm
+++ b/fml/lib/FML/Process/Utils.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Utils.pm,v 1.86 2003/10/15 08:43:12 fukachan Exp $
+# $FML: Utils.pm,v 1.87 2003/10/16 01:56:22 fukachan Exp $
 #
 
 package FML::Process::Utils;
@@ -1396,7 +1396,8 @@ sub get_charset
     my ($curproc, $category) = @_;
     my $config  = $curproc->config();
     my $pcb     = $curproc->pcb();
-    my $default = $config->{ "${category}_charset" } || 'us-ascii';
+    my $keyword = sprintf("%s_default_charset", $category);
+    my $default = $config->{ $keyword } || 'us-ascii';
     my $charset = $default;
 
     # if overwritten by some module, we use it always.
@@ -1413,12 +1414,9 @@ sub get_charset
 	if (@$acpt_lang_list) {
 	  ACCEPT_LANGUAGE:
 	    for my $a (@$acpt_lang_list) {
-		if ($a eq 'ja') {
-		    $charset = $config->{ "${category}_charset" } || 'euc-jp';
-		    last ACCEPT_LANGUAGE;
-		}
-		elsif ($a eq 'en') {
-		    $charset = 'us-ascii';
+		if ($a eq 'ja' || $a eq 'en') {
+		    my $key  = sprintf("%s_charset_%s", $category, $a);
+		    $charset = $config->{ $key };
 		    last ACCEPT_LANGUAGE;
 		}
 		elsif ($a eq '*') { # any charset is o.k.