diff options
32 files changed, 95 insertions, 45 deletions
diff --git a/fml/lib/FML/CGI/List.pm b/fml/lib/FML/CGI/List.pm index d834c73e..a2b00abd 100644 --- a/fml/lib/FML/CGI/List.pm +++ b/fml/lib/FML/CGI/List.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: List.pm,v 1.3 2003/09/27 04:06:53 fukachan Exp $ +# $FML: List.pm,v 1.4 2003/09/27 04:30:56 fukachan Exp $ # package FML::CGI::List; @@ -37,6 +37,7 @@ sub new sub cgi_menu { my ($self, $curproc, $args, $command_args) = @_; + my $config = $curproc->config(); my $target = $curproc->cgi_var_frame_target(); my $action = $curproc->cgi_var_action(); my $map_default = $curproc->cgi_var_address_map(); @@ -54,19 +55,25 @@ sub cgi_menu croak("invalid map: $map_default"); } + # natural language-ed name + my $name_ml_name = $curproc->message_nl('term.ml_name', 'ml_name'); + my $name_map = $curproc->message_nl('term.map', 'map'); + my $name_show = $curproc->message_nl('term.show', 'show'); + my $name_reset = $curproc->message_nl('term.reset', 'reset'); + print start_form(-action=>$action, -target=>$target); print hidden(-name => 'command', -default => 'list'); print table( { -border => undef }, Tr( undef, td([ - "ML:", + $name_ml_name, textfield(-name => 'ml_name', -default => $ml_name), ]) ), Tr( undef, td([ - "map", + $name_map, scrolling_list(-name => 'map', -values => $map_list, -default => $map_default, @@ -75,8 +82,8 @@ sub cgi_menu ) ); - print submit(-name => 'show'); - print reset(-name => 'reset'); + print submit(-name => $name_show); + print reset(-name => $name_reset); print end_form; } diff --git a/fml/lib/FML/CGI/Menu.pm b/fml/lib/FML/CGI/Menu.pm index a303cfc9..e8261f68 100644 --- a/fml/lib/FML/CGI/Menu.pm +++ b/fml/lib/FML/CGI/Menu.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: Menu.pm,v 1.26 2003/08/29 15:33:56 fukachan Exp $ +# $FML: Menu.pm,v 1.1 2003/09/25 11:40:57 fukachan Exp $ # package FML::CGI::Menu; @@ -121,7 +121,7 @@ sub run_cgi_main # specified command, we need to identify # the command specifined in the cgi_navigation and cgi_mein. my $navi_command = $curproc->safe_param_navi_command() || ''; - my $command = $curproc->safe_param_command() || ''; + my $command = $curproc->safe_param_command() || ''; # updat config: $ml_name is found now (get $ml_name from CGI). $config->set('ml_name', $ml_name); @@ -211,19 +211,24 @@ sub run_cgi_main sub run_cgi_navigator { my ($curproc, $args) = @_; - my $config = $curproc->config(); - my $action = $curproc->safe_cgi_action_name(); - my $target = '_top'; + my $target = $curproc->cgi_var_frame_target(); + my $action = $curproc->cgi_var_action(); + + # natural language-ed name + my $name_ml_name = $curproc->message_nl('term.ml_name', 'ml_name'); + my $name_command = $curproc->message_nl('term.command', 'command'); + my $name_change = $curproc->message_nl('term.change', 'change'); + my $name_reset = $curproc->message_nl('term.reset', 'reset'); # 1. ML my $ml_name = $curproc->cgi_var_ml_name(); my $ml_list = $curproc->cgi_var_ml_name_list(); - my $fml_url = '<A HREF="http://www.fml.org/software/fml-devel/">fml</A>'; - print "<B>$fml_url admin menu</B>\n<BR>\n"; + my $title = $curproc->cgi_var_navigator_title(); + print $title, "\n"; print start_form(-action=>$action, -target=>$target); - print "mailing list:\n"; + print $name_ml_name, ":\n"; print scrolling_list(-name => 'ml_name', -values => $ml_list, -default => [ $ml_name ], @@ -236,7 +241,7 @@ sub run_cgi_navigator my $command_default = $navi_command || $command; my $command_list = $curproc->cgi_var_available_command_list(); - print " command:\n"; + print $name_command, ":\n"; print scrolling_list(-name => 'navi_command', -values => $command_list, -default => [ $command_default ], @@ -245,8 +250,8 @@ sub run_cgi_navigator # 3. submit - print submit(-name => 'submit'); - print reset(-name => 'reset'); + print submit(-name => $name_change); + print reset(-name => $name_reset); print end_form; } diff --git a/fml/lib/FML/CGI/User.pm b/fml/lib/FML/CGI/User.pm index 99466f43..a657846c 100644 --- a/fml/lib/FML/CGI/User.pm +++ b/fml/lib/FML/CGI/User.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: User.pm,v 1.2 2003/09/27 03:44:05 fukachan Exp $ +# $FML: User.pm,v 1.3 2003/09/27 04:08:14 fukachan Exp $ # package FML::CGI::User; @@ -77,13 +77,19 @@ sub cgi_menu croak("not allowed command"); } + # natural language-ed name + my $name_ml_name = $curproc->message_nl('term.ml_name', 'ml_name'); + my $name_command = $curproc->message_nl('term.command', 'command'); + my $name_submit = $curproc->message_nl('term.submit', 'submit'); + my $name_reset = $curproc->message_nl('term.reset', 'reset'); + # create <FORM ... > ... by (start_form() ... end_form()) print start_form(-action=>$action, -target=>$target); print table( { -border => undef }, Tr( undef, td([ - "ML: ", + $name_ml_name, textfield(-name => 'ml_name', -default => $ml_name, -size => 32) @@ -91,7 +97,7 @@ sub cgi_menu ), Tr( undef, td([ - "command: ", + $name_command, textfield(-name => 'command', -default => $comname, -size => 32) @@ -119,8 +125,8 @@ sub cgi_menu ); - print submit(-name => 'submit'); - print reset(-name => 'reset'); + print submit(-name => $name_submit); + print reset(-name => $name_reset); print end_form; } diff --git a/fml/lib/FML/Process/CGI/Kernel.pm b/fml/lib/FML/Process/CGI/Kernel.pm index f2b15559..57109990 100644 --- a/fml/lib/FML/Process/CGI/Kernel.pm +++ b/fml/lib/FML/Process/CGI/Kernel.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: Kernel.pm,v 1.54 2003/09/25 11:40:58 fukachan Exp $ +# $FML: Kernel.pm,v 1.55 2003/09/25 14:58:17 fukachan Exp $ # package FML::Process::CGI::Kernel; @@ -468,13 +468,24 @@ sub run_cgi_command_help my $navi_command = $curproc->safe_param_navi_command(); my $command = $curproc->safe_param_command(); + # natural language-ed name + my $name_usage = $curproc->message_nl('term.usage', 'usage'); + my $name_submit = $curproc->message_nl('term.submit', 'submit'); + my $name_show = $curproc->message_nl('term.show', 'show'); + my $name_map = $curproc->message_nl('term.map', 'map'); + my $msg_args = { + _arg_button_submit => $name_submit, + _arg_button_show => $name_show, + _arg_scroll_map => $name_map, + }; + if ($navi_command) { - print "[Usage]<br> <b> $navi_command </b> <br>\n"; - $buf = $curproc->message_nl("cgi.$navi_command"); + print "[$name_usage]<br> <b> $navi_command </b> <br>\n"; + $buf = $curproc->message_nl("cgi.$navi_command", '', $msg_args); } elsif ($command) { - print "[Usage]<br> <b> $command </b> <br>\n"; - $buf = $curproc->message_nl("cgi.$command"); + print "[$name_usage]<br> <b> $command </b> <br>\n"; + $buf = $curproc->message_nl("cgi.$command", '', $msg_args); } print $buf; @@ -556,18 +567,25 @@ sub run_cgi_options my $domain = $curproc->cgi_var_ml_domain(); my $action = $curproc->safe_cgi_action_name(); - print "<P> <B> options </B>\n"; + # natural language-ed name + my $name_options = $curproc->message_nl('term.options', 'options'); + my $name_lang = $curproc->message_nl('term.language', 'language'); + my $name_change = $curproc->message_nl('term.change', 'change'); + my $name_reset = $curproc->message_nl('term.reset', 'reset'); + + print "<P> <B> $name_options </B>\n"; print start_form(-action=>$action); # XXX-TODO: $langlist is hard-coded. - print "Language:\n"; + print $name_lang, ":\n"; my $langlist = [ 'Japanese', 'English' ]; print scrolling_list(-name => 'language', -values => $langlist, -size => 1); - print submit(-name => 'change'); + print submit(-name => $name_change); + print reset(-name => $name_reset); print end_form; } diff --git a/fml/share/message/euc-jp/cgi/addadmin b/fml/share/message/euc-jp/cgi/addadmin index 4d0b2a5e..fd00bd60 100644 --- a/fml/share/message/euc-jp/cgi/addadmin +++ b/fml/share/message/euc-jp/cgi/addadmin @@ -1,2 +1,2 @@ 追加するリモート管理者のアドレスを入力し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/adduser b/fml/share/message/euc-jp/cgi/adduser index 64cddba8..ae1f2b11 100644 --- a/fml/share/message/euc-jp/cgi/adduser +++ b/fml/share/message/euc-jp/cgi/adduser @@ -1,3 +1,3 @@ 追加するメンバーのアドレスを入力し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/admin/top b/fml/share/message/euc-jp/cgi/admin/top index 36dba01b..770e24d4 100644 --- a/fml/share/message/euc-jp/cgi/admin/top +++ b/fml/share/message/euc-jp/cgi/admin/top @@ -1,6 +1,6 @@ 左のナビゲーションバーから、 ＭＬ(mailing list)とコマンド(command)を選択し、 -submit ボタンを押して下さい。 +$_arg_button_submit ボタンを押して下さい。 <table> <tr> diff --git a/fml/share/message/euc-jp/cgi/byeadmin b/fml/share/message/euc-jp/cgi/byeadmin index bb1b82e8..99b26e4f 100644 --- a/fml/share/message/euc-jp/cgi/byeadmin +++ b/fml/share/message/euc-jp/cgi/byeadmin @@ -1,3 +1,3 @@ 削除するリモート管理者のアドレスを入力するか、 スクロールリストから選択し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/deladmin b/fml/share/message/euc-jp/cgi/deladmin index bb1b82e8..99b26e4f 100644 --- a/fml/share/message/euc-jp/cgi/deladmin +++ b/fml/share/message/euc-jp/cgi/deladmin @@ -1,3 +1,3 @@ 削除するリモート管理者のアドレスを入力するか、 スクロールリストから選択し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/deluser b/fml/share/message/euc-jp/cgi/deluser index 0e695493..ecc20008 100644 --- a/fml/share/message/euc-jp/cgi/deluser +++ b/fml/share/message/euc-jp/cgi/deluser @@ -1,4 +1,4 @@ 削除するメンバーのアドレスを入力するか、 スクロールリストから選択し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/digetstoff b/fml/share/message/euc-jp/cgi/digetstoff index 0aaccc53..dcac6912 100644 --- a/fml/share/message/euc-jp/cgi/digetstoff +++ b/fml/share/message/euc-jp/cgi/digetstoff @@ -1,3 +1,3 @@ まとめおくりモードから通常配送へ移行したいメンバーのアドレスを入力するか、 スクロールリストから選択し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/digetston b/fml/share/message/euc-jp/cgi/digetston index ab1d4bcd..42557871 100644 --- a/fml/share/message/euc-jp/cgi/digetston +++ b/fml/share/message/euc-jp/cgi/digetston @@ -1,3 +1,3 @@ まとめおくりモードへ移行したいメンバーのアドレスを入力するか、 スクロールリストから選択し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/list b/fml/share/message/euc-jp/cgi/list index 021de82c..6a16533e 100644 --- a/fml/share/message/euc-jp/cgi/list +++ b/fml/share/message/euc-jp/cgi/list @@ -1,8 +1,8 @@ アドレスリストを表示します。 デフォルトで表示しているのは、メンバーリストですが、 -表示したいリストは map のスクロールで変更できます。 -map で選択後、show ボタンを押して下さい。 -選択できる map は +表示したいリストは $_arg_scroll_map のスクロールで変更できます。 +$_arg_scroll_map で選択後、$_arg_button_show ボタンを押して下さい。 +選択できる $_arg_scroll_map は ＭＬのメンバーリスト(member) ＭＬの受信者リスト(recipient)、 ＭＬのリモート管理者リスト(admin_member) diff --git a/fml/share/message/euc-jp/cgi/ml-admin/top b/fml/share/message/euc-jp/cgi/ml-admin/top index 9a766383..e0f30495 100644 --- a/fml/share/message/euc-jp/cgi/ml-admin/top +++ b/fml/share/message/euc-jp/cgi/ml-admin/top @@ -1,6 +1,6 @@ 左のナビゲーションバーから、 ＭＬ(mailing list)とコマンド(command)を選択し、 -submit ボタンを押して下さい。 +$_arg_button_submit ボタンを押して下さい。 <table> <tr> diff --git a/fml/share/message/euc-jp/cgi/newml b/fml/share/message/euc-jp/cgi/newml index 0001a7f2..dfa5c2ae 100644 --- a/fml/share/message/euc-jp/cgi/newml +++ b/fml/share/message/euc-jp/cgi/newml @@ -1,4 +1,4 @@ ＭＬ名を入力し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/rmml b/fml/share/message/euc-jp/cgi/rmml index 86e49c47..646d58b6 100644 --- a/fml/share/message/euc-jp/cgi/rmml +++ b/fml/share/message/euc-jp/cgi/rmml @@ -1,3 +1,3 @@ ＭＬ名を入力するか、 スクロールリストから選択し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/subscribe b/fml/share/message/euc-jp/cgi/subscribe index 64cddba8..ae1f2b11 100644 --- a/fml/share/message/euc-jp/cgi/subscribe +++ b/fml/share/message/euc-jp/cgi/subscribe @@ -1,3 +1,3 @@ 追加するメンバーのアドレスを入力し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/cgi/unsubscribe b/fml/share/message/euc-jp/cgi/unsubscribe index 0e695493..ecc20008 100644 --- a/fml/share/message/euc-jp/cgi/unsubscribe +++ b/fml/share/message/euc-jp/cgi/unsubscribe @@ -1,4 +1,4 @@ 削除するメンバーのアドレスを入力するか、 スクロールリストから選択し、 -中央下の submit ボタンを押して下さい。 +中央下の $_arg_button_submit ボタンを押して下さい。 diff --git a/fml/share/message/euc-jp/term/address b/fml/share/message/euc-jp/term/address new file mode 100644 index 00000000..462c6512 --- /dev/null +++ b/fml/share/message/euc-jp/term/address @@ -0,0 +1 @@ +アドレス diff --git a/fml/share/message/euc-jp/term/change b/fml/share/message/euc-jp/term/change new file mode 100644 index 00000000..9eed9f4f --- /dev/null +++ b/fml/share/message/euc-jp/term/change @@ -0,0 +1 @@ +変更 diff --git a/fml/share/message/euc-jp/term/command b/fml/share/message/euc-jp/term/command new file mode 100644 index 00000000..ab550515 --- /dev/null +++ b/fml/share/message/euc-jp/term/command @@ -0,0 +1 @@ +コマンド diff --git a/fml/share/message/euc-jp/term/lang b/fml/share/message/euc-jp/term/lang new file mode 100644 index 00000000..e335ec57 --- /dev/null +++ b/fml/share/message/euc-jp/term/lang @@ -0,0 +1 @@ +言語 diff --git a/fml/share/message/euc-jp/term/language b/fml/share/message/euc-jp/term/language new file mode 100644 index 00000000..e335ec57 --- /dev/null +++ b/fml/share/message/euc-jp/term/language @@ -0,0 +1 @@ +言語 diff --git a/fml/share/message/euc-jp/term/map b/fml/share/message/euc-jp/term/map new file mode 100644 index 00000000..ca24a767 --- /dev/null +++ b/fml/share/message/euc-jp/term/map @@ -0,0 +1 @@ +マップ diff --git a/fml/share/message/euc-jp/term/ml_domain b/fml/share/message/euc-jp/term/ml_domain new file mode 100644 index 00000000..4539a3e1 --- /dev/null +++ b/fml/share/message/euc-jp/term/ml_domain @@ -0,0 +1 @@ +ドメイン diff --git a/fml/share/message/euc-jp/term/ml_name b/fml/share/message/euc-jp/term/ml_name new file mode 100644 index 00000000..711577f5 --- /dev/null +++ b/fml/share/message/euc-jp/term/ml_name @@ -0,0 +1 @@ +ＭＬ名 diff --git a/fml/share/message/euc-jp/term/option b/fml/share/message/euc-jp/term/option new file mode 100644 index 00000000..e04c3265 --- /dev/null +++ b/fml/share/message/euc-jp/term/option @@ -0,0 +1 @@ +オプション diff --git a/fml/share/message/euc-jp/term/options b/fml/share/message/euc-jp/term/options new file mode 100644 index 00000000..e04c3265 --- /dev/null +++ b/fml/share/message/euc-jp/term/options @@ -0,0 +1 @@ +オプション diff --git a/fml/share/message/euc-jp/term/reset b/fml/share/message/euc-jp/term/reset new file mode 100644 index 00000000..0039de7d --- /dev/null +++ b/fml/share/message/euc-jp/term/reset @@ -0,0 +1 @@ +リセット diff --git a/fml/share/message/euc-jp/term/show b/fml/share/message/euc-jp/term/show new file mode 100644 index 00000000..ee8e3e76 --- /dev/null +++ b/fml/share/message/euc-jp/term/show @@ -0,0 +1 @@ +表示する diff --git a/fml/share/message/euc-jp/term/submit b/fml/share/message/euc-jp/term/submit new file mode 100644 index 00000000..633a8826 --- /dev/null +++ b/fml/share/message/euc-jp/term/submit @@ -0,0 +1 @@ +更新 diff --git a/fml/share/message/euc-jp/term/usage b/fml/share/message/euc-jp/term/usage new file mode 100644 index 00000000..e5be8d19 --- /dev/null +++ b/fml/share/message/euc-jp/term/usage @@ -0,0 +1 @@ +使い方 |