зеркало из https://github.com/mozilla/pjs.git
Bug 511320 - When FIPS mode change fails, inform the user. r=kaie
This commit is contained in:
Родитель
bd1ab3db86
Коммит
63423c7d31
|
@ -151,6 +151,7 @@ devinfo_stat_ready=Ready
|
||||||
enable_fips=Enable FIPS
|
enable_fips=Enable FIPS
|
||||||
disable_fips=Disable FIPS
|
disable_fips=Disable FIPS
|
||||||
fips_nonempty_password_required=FIPS mode requires that you have a Master Password set for each security device. Please set the password before trying to enable FIPS mode.
|
fips_nonempty_password_required=FIPS mode requires that you have a Master Password set for each security device. Please set the password before trying to enable FIPS mode.
|
||||||
|
unable_to_toggle_fips=Unable to change the FIPS mode for the security device. It is recommended that you exit and restart this application.
|
||||||
|
|
||||||
# CRL next update.
|
# CRL next update.
|
||||||
crlNextUpdateMsg1=%S cannot establish an encrypted connection with "%S".
|
crlNextUpdateMsg1=%S cannot establish an encrypted connection with "%S".
|
||||||
|
|
|
@ -386,8 +386,7 @@ function doLogin()
|
||||||
bundle.GetStringFromName("devinfo_stat_notloggedin"));
|
bundle.GetStringFromName("devinfo_stat_notloggedin"));
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
var alertStr = bundle.GetStringFromName("login_failed");
|
doPrompt(bundle.GetStringFromName("login_failed"));
|
||||||
doPrompt(alertStr);
|
|
||||||
}
|
}
|
||||||
enableButtons();
|
enableButtons();
|
||||||
}
|
}
|
||||||
|
@ -541,8 +540,15 @@ function toggleFIPS()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
secmoddb.toggleFIPSMode();
|
try {
|
||||||
|
secmoddb.toggleFIPSMode();
|
||||||
|
}
|
||||||
|
catch (e) {
|
||||||
|
doPrompt(bundle.GetStringFromName("unable_to_toggle_FIPS"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
//Remove the existing listed modules so that re-fresh doesn't
|
//Remove the existing listed modules so that re-fresh doesn't
|
||||||
//display the module that just changed.
|
//display the module that just changed.
|
||||||
ClearDeviceList();
|
ClearDeviceList();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче