zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-137 fixed texts

Browse source
This commit is contained in:
anhefti 2021-06-21 10:58:55 +02:00
parent 5c30db29b9
commit b61166674c
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ch/ethz/seb/sebserver/gui/content/CertificateImportPopup.java
View file

@ -48,6 +48,7 @@ public class CertificateImportPopup {
private final static PageMessageException MISSING_PASSWORD = new PageMessageException( private final static PageMessageException MISSING_PASSWORD = new PageMessageException(
new LocTextKey("sebserver.certificate.action.import.missing-password")); new LocTextKey("sebserver.certificate.action.import.missing-password"));
private final static LocTextKey IMPORT_POPUP_TITLE = new LocTextKey("sebserver.certificate.action.import");
private final PageService pageService; private final PageService pageService;
@ -79,7 +80,7 @@ public class CertificateImportPopup {
context); context);
dialog.open( dialog.open(
SEBExamConfigForm.FORM_IMPORT_TEXT_KEY, IMPORT_POPUP_TITLE,
(Predicate<FormHandle<CertificateInfo>>) formHandle -> doImport( (Predicate<FormHandle<CertificateInfo>>) formHandle -> doImport(
formHandle, formHandle,
newConfig), newConfig),

4
src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java
View file

@ -78,8 +78,10 @@ public class SEBExamConfigForm implements TemplateComposer {
new LocTextKey("sebserver.examconfig.form.template"); new LocTextKey("sebserver.examconfig.form.template");
static final LocTextKey FORM_STATUS_TEXT_KEY = static final LocTextKey FORM_STATUS_TEXT_KEY =
new LocTextKey("sebserver.examconfig.form.status"); new LocTextKey("sebserver.examconfig.form.status");
static final LocTextKey FORM_IMPORT_TEXT_KEY = static final LocTextKey FORM_IMPORT_SETTINGS_TEXT_KEY =
new LocTextKey("sebserver.examconfig.action.import-settings"); new LocTextKey("sebserver.examconfig.action.import-settings");
static final LocTextKey FORM_IMPORT_CONFIG_TEXT_KEY =
new LocTextKey("sebserver.examconfig.action.import-config");
static final LocTextKey FORM_IMPORT_SELECT_TEXT_KEY = static final LocTextKey FORM_IMPORT_SELECT_TEXT_KEY =
new LocTextKey("sebserver.examconfig.action.import-file-select"); new LocTextKey("sebserver.examconfig.action.import-file-select");
static final LocTextKey FORM_IMPORT_PASSWORD_TEXT_KEY = static final LocTextKey FORM_IMPORT_PASSWORD_TEXT_KEY =

4
src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigImportPopup.java
View file

@ -110,7 +110,9 @@ public class SEBExamConfigImportPopup {
newConfig); newConfig);
dialog.open( dialog.open(
SEBExamConfigForm.FORM_IMPORT_TEXT_KEY, newConfig
? SEBExamConfigForm.FORM_IMPORT_CONFIG_TEXT_KEY
: SEBExamConfigForm.FORM_IMPORT_SETTINGS_TEXT_KEY,
(Predicate<FormHandle<ConfigurationNode>>) formHandle -> doImport( (Predicate<FormHandle<ConfigurationNode>>) formHandle -> doImport(
formHandle, formHandle,
newConfig), newConfig),