Manager: message tweaks

This commit is contained in:
David Anderson 2013-08-26 11:18:01 -07:00
parent bf0087bda2
commit 1429e8c3dc
1 changed files with 6 additions and 32 deletions

View File

@ -582,27 +582,9 @@ void CAccountInfoPage::OnPageChanging( wxWizardExEvent& event ) {
if (!m_pAccountUseExistingCtrl->GetValue()) { if (!m_pAccountUseExistingCtrl->GetValue()) {
if (!(m_pAccountPasswordCtrl->GetValue().Length() > 0)) { if (!(m_pAccountPasswordCtrl->GetValue().Length() > 0)) {
if (pc.uses_username) { if (pc.uses_username) {
if (IS_ATTACHTOPROJECTWIZARD()) { strMessage.Printf(_("Please enter a user name."));
strMessage.Printf(
_("The minimum username length for this project is 1. Please enter a different username.")
);
}
if (IS_ACCOUNTMANAGERWIZARD()) {
strMessage.Printf(
_("The minimum username length for this account manager is 1. Please enter a different username.")
);
}
} else { } else {
if (IS_ATTACHTOPROJECTWIZARD()) { strMessage.Printf(_("Please enter an email address."));
strMessage.Printf(
_("The minimum email address length for this project is 1. Please enter a different email address.")
);
}
if (IS_ACCOUNTMANAGERWIZARD()) {
strMessage.Printf(
_("The minimum email address length for this account manager is 1. Please enter a different email address.")
);
}
} }
bDisplayError = true; bDisplayError = true;
} }
@ -611,18 +593,10 @@ void CAccountInfoPage::OnPageChanging( wxWizardExEvent& event ) {
// Verify minimum password length // Verify minimum password length
if (!m_pAccountUseExistingCtrl->GetValue()) { if (!m_pAccountUseExistingCtrl->GetValue()) {
if (m_pAccountPasswordCtrl->GetValue().Length() < (size_t)pc.min_passwd_length) { if (m_pAccountPasswordCtrl->GetValue().Length() < (size_t)pc.min_passwd_length) {
if (IS_ATTACHTOPROJECTWIZARD()) { strMessage.Printf(
strMessage.Printf( _("Please enter a password of at least %d characters."),
_("The minimum password length for this project is %d. Please enter a different password."), pc.min_passwd_length
pc.min_passwd_length );
);
}
if (IS_ACCOUNTMANAGERWIZARD()) {
strMessage.Printf(
_("The minimum password length for this account manager is %d. Please enter a different password."),
pc.min_passwd_length
);
}
bDisplayError = true; bDisplayError = true;
} }