From b61166674c11afe1c033727ca730b6fd711dbcac Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Mon, 21 Jun 2021 10:58:55 +0200
Subject: [PATCH] SEBSERV-137 fixed texts

---
 .../seb/sebserver/gui/content/CertificateImportPopup.java     | 3 ++-
 .../ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java  | 4 +++-
 .../seb/sebserver/gui/content/SEBExamConfigImportPopup.java   | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/CertificateImportPopup.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/CertificateImportPopup.java
index 75e84e46..b380f98b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/CertificateImportPopup.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/CertificateImportPopup.java
@@ -48,6 +48,7 @@ public class CertificateImportPopup {
 
     private final static PageMessageException MISSING_PASSWORD = new PageMessageException(
             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;
 
@@ -79,7 +80,7 @@ public class CertificateImportPopup {
                     context);
 
             dialog.open(
-                    SEBExamConfigForm.FORM_IMPORT_TEXT_KEY,
+                    IMPORT_POPUP_TITLE,
                     (Predicate<FormHandle<CertificateInfo>>) formHandle -> doImport(
                             formHandle,
                             newConfig),
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java
index 513510ad..53c24baa 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java
@@ -78,8 +78,10 @@ public class SEBExamConfigForm implements TemplateComposer {
             new LocTextKey("sebserver.examconfig.form.template");
     static final LocTextKey FORM_STATUS_TEXT_KEY =
             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");
+    static final LocTextKey FORM_IMPORT_CONFIG_TEXT_KEY =
+            new LocTextKey("sebserver.examconfig.action.import-config");
     static final LocTextKey FORM_IMPORT_SELECT_TEXT_KEY =
             new LocTextKey("sebserver.examconfig.action.import-file-select");
     static final LocTextKey FORM_IMPORT_PASSWORD_TEXT_KEY =
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigImportPopup.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigImportPopup.java
index 4d75ba9b..04e882bc 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigImportPopup.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigImportPopup.java
@@ -110,7 +110,9 @@ public class SEBExamConfigImportPopup {
                     newConfig);
 
             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(
                             formHandle,
                             newConfig),