oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed Utility test for base36, which no longer exists in WebGUI::Utility.pm

Browse source 
new i18n message for duplicate usernames.
This commit is contained in:
Colin Kuskie 2006-02-18 21:58:27 +00:00
parent e76ea86b52
commit 6fd7575eb9
5 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/6.x.x.txt
View file

@ -38,6 +38,7 @@
you can generate non-HTML navigations or take advantate of the Google
SiteMap feature.
- [ 1433525 ] 6.9: Compilation errors
- base36 removed from Utility.t because it no longer exists in WebGUI::Utility.pm
6.8.7
- fix [ 1431098 ] op=becomeUser can become non-existent userIds

2
lib/WebGUI/Auth.pm
View file

@ -58,7 +58,7 @@ sub _isDuplicateUsername {
my ($otherUser) = $self->session->db->quickArray("select count(*) from users where username=".$self->session->db->quote($username));
return 0 if !$otherUser;
my $i18n = WebGUI::International->new($self->session);
$self->error('<li>'.$i18n->get(77).' "'.$username.'too", "'.$username.'2", '.'"'.$username.'_'.$self->session->datetime->epochToHuman($self->session->datetime->time(),"%y").'"'.'</li>');
$self->error(sprintf($i18n->get(77), $username,$username,$username,$self->session->datetime->epochToHuman($self->session->datetime->time(),"%y")));
return 1;
}

3
lib/WebGUI/Operation/User.pm
View file

@ -450,7 +450,8 @@ sub www_editUserSave {
# Display an error telling them the username they are trying to use is not available and suggest alternatives
} else {
$error = '<ul><li>'.$i18n->get(77).' '.$session->form->process("username").'Too or '.$session->form->process("username").'02</li></ul>';
my $username = $session->form->process("username");
$error = '<ul>' . sprintf($i18n->get(77), $username, $username, $username, $session->datetime->epochToHuman($session->datetime->time(),"%y")).'</ul>';
}
if ($isSecondary) {
return _submenu($session,$i18n->get(978));

8
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -508,8 +508,12 @@ Be aware that any database links you create here will be available to all conten
},
'77' => {
message => q|That account name is already in use by another member of this site. Please try a different username. The following are some suggestions:|,
lastUpdated => 1031514049
message => q|<li>That account name is already in use by another member of this site. Please try a different username. The following are some suggestions:<br />
%sToo<br />
%s2<br />
%s_%d<br />
</li>|,
lastUpdated => 1140292461
},
'444' => {

3
t/Utility.t
View file

@ -20,9 +20,6 @@ use Test::More tests => 22; # increment this value for each test you create
my $session = WebGUI::Test->session;
# base 36
is(WebGUI::Utility::fromBase36(WebGUI::Utility::toBase36(1234567890)), 1234567890, "{to/from}Base36()");
# commify
is(WebGUI::Utility::commify(10), "10", 'commify() - no comma needed');
is(WebGUI::Utility::commify(1000), "1,000", 'commify() - single comma');