summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2002-07-17 09:28:33 +0000
committerfukachan <fukachan>2002-07-17 09:28:33 +0000
commite776610c8040255c5cf7cba601f4735731ea2365 (patch)
tree6f390aa92bfa2dc21debea437c1943bcb7ccad00
parent3a0f187d4b1d0c894f4288df180babe2f2d643a9 (diff)
downloadfml8-e776610c8040255c5cf7cba601f4735731ea2365.tar.gz
fml8-e776610c8040255c5cf7cba601f4735731ea2365.tar.bz2
fml8-e776610c8040255c5cf7cba601f4735731ea2365.zip
add more error messages
-rw-r--r--fml/lib/FML/Command/User/confirm.pm11
-rw-r--r--fml/share/message/euc-jp/error/expired1
-rw-r--r--fml/share/message/euc-jp/error/no_such_confirmation3
-rw-r--r--fml/share/message/euc-jp/error/no_such_confirmation_for_command3
4 files changed, 16 insertions, 2 deletions
diff --git a/fml/lib/FML/Command/User/confirm.pm b/fml/lib/FML/Command/User/confirm.pm
index a5b28fee..e32b9aa1 100644
--- a/fml/lib/FML/Command/User/confirm.pm
+++ b/fml/lib/FML/Command/User/confirm.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: confirm.pm,v 1.10 2002/04/11 15:39:42 tmu Exp $
+# $FML: confirm.pm,v 1.11 2002/07/14 15:15:28 fukachan Exp $
#
package FML::Command::User::confirm;
@@ -107,11 +107,15 @@ sub process
$self->_switch_command($class, $address, $curproc, $command_args);
}
else { # if req is expired
+ $curproc->reply_message_nl('error.expired', "request expired");
LogError("request expired");
croak("request is expired");
}
}
else {
+ $curproc->reply_message_nl('error.no_such_confirmation',
+ "no such confirmatoin request id=$id",
+ { _arg_id => $id });
LogError("no such confirmation request id=$id");
croak("no such confirmation request id=$id");
}
@@ -144,7 +148,10 @@ sub _switch_command
$obj->$class($curproc, $command_args);
}
else {
- LogError("no such rule confirm -> class");
+ LogError("no such rule confirm for '$class' command");
+ $curproc->reply_message_nl('error.no_such_confirmation_for_command',
+ "no such confirmation for command $class",
+ { _arg_command => $class });
croak("no such rule");
}
}
diff --git a/fml/share/message/euc-jp/error/expired b/fml/share/message/euc-jp/error/expired
new file mode 100644
index 00000000..2f6157b6
--- /dev/null
+++ b/fml/share/message/euc-jp/error/expired
@@ -0,0 +1 @@
+リクエストは古過ぎて無効になりました( expire しました )。
diff --git a/fml/share/message/euc-jp/error/no_such_confirmation b/fml/share/message/euc-jp/error/no_such_confirmation
new file mode 100644
index 00000000..afa9fc4a
--- /dev/null
+++ b/fml/share/message/euc-jp/error/no_such_confirmation
@@ -0,0 +1,3 @@
+ID $_arg_id は不正な confirmation です。
+
+
diff --git a/fml/share/message/euc-jp/error/no_such_confirmation_for_command b/fml/share/message/euc-jp/error/no_such_confirmation_for_command
new file mode 100644
index 00000000..c440781b
--- /dev/null
+++ b/fml/share/message/euc-jp/error/no_such_confirmation_for_command
@@ -0,0 +1,3 @@
+$_arg_command というコマンドに対する confirmation は未定義です。
+
+