summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2002-05-28 21:22:15 +0000
committerivan <ivan>2002-05-28 21:22:15 +0000
commit97646ed2e0ad524f959f9dc2632fa2fea25f5010 (patch)
tree688be8ec31ea65a0e0b2061f30429bf189fb75c7
parentee1a01a4d001bf993b9cce54e59f119db20e49f0 (diff)
better error message for "Illegal password"
-rw-r--r--FS/FS/svc_acct.pm4
-rwxr-xr-xbin/populate-msgcat6
2 files changed, 8 insertions, 2 deletions
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 17ae41583..a43f97ab5 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -676,7 +676,9 @@ sub check {
$recref->{_password} = '!!';
} else {
#return "Illegal password";
- return gettext('illegal_password'). ": ". $recref->{_password};
+ return gettext('illegal_password'). "$passwordmin-$passwordmax".
+ FS::Msgcat::_gettext('illegal_password_characters').
+ ": ". $recref->{_password};
}
''; #no error
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index b50fc7ec3..166f83720 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -76,7 +76,11 @@ sub messages {
},
'illegal_password' => {
- 'en_US' => 'Illegal password',
+ 'en_US' => 'Illegal password (',
+ },
+
+ 'illeggal_password_characters' => {
+ 'en_US' => ' characters)',
},
'username_in_use' => {