From 5cab6a98972d3cf4fb747e81242eb7f15afeea26 Mon Sep 17 00:00:00 2001
From: David CARELLA <david.carella@gmail.com>
Date: Wed, 15 Jan 2025 11:31:23 +0100
Subject: [PATCH 1/2] Noticket: Improve GUI messages for signing algorithm

---
 .../admin-gui/resources/ca/editcas/editcapage.xhtml    |  4 ++--
 .../resources/languages/languagefile.en.properties     |  8 +++++---
 .../resources/languages/languagefile.fr.properties     | 10 ++++++----
 .../src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java    |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/modules/admin-gui/resources/ca/editcas/editcapage.xhtml b/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
index 962315bf8b..38b74ee979 100644
--- a/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
+++ b/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
@@ -213,7 +213,7 @@
 					<h:panelGroup
 						rendered="#{editCAsMBean.editCANotUninitializedNotExternal and not editCAsMBean.renderCvcAvailable}">
 						<h:outputLabel for="getAlternativeSigningAlgorithm"
-							value="#{web.text.ALTERNATIVESIGNINGALGORITHM}"
+							value="#{web.text.SIGNINGALGORITHM_ALTERNATIVE}"
 							style="font-weight: bold;" />
 					</h:panelGroup>
 					<h:panelGroup
@@ -225,7 +225,7 @@
 
 					<h:panelGroup
 						rendered="#{not editCAsMBean.editCANotUninitializedNotExternal and not editCAsMBean.caExternal and not editCAsMBean.renderCvcAvailable}">
-						<h:outputLabel value="#{web.text.ALTERNATIVESIGNINGALGORITHM}"
+						<h:outputLabel value="#{web.text.SIGNINGALGORITHM_ALTERNATIVE}"
 							style="font-weight: bold;" />
 					</h:panelGroup>
 					<h:panelGroup
diff --git a/modules/admin-gui/resources/languages/languagefile.en.properties b/modules/admin-gui/resources/languages/languagefile.en.properties
index cda47f25da..f018337985 100644
--- a/modules/admin-gui/resources/languages/languagefile.en.properties
+++ b/modules/admin-gui/resources/languages/languagefile.en.properties
@@ -1894,8 +1894,6 @@ ALLOWBACKDATEDREVOCATION  = Allow Backdated Revocation
 
 ALPHANUMERIC              = alphanumeric [0-9][A-Z]
 
-ALTERNATIVESIGNINGALGORITHM = Alternative Signing Algorithm
-
 ANYCA                     = Any CA
 
 AREYOUSUREACTIVATECA      = Are you sure you want to activate the CA?
@@ -2629,7 +2627,11 @@ SIGNINGALGORITHM          = Signing Algorithm
 
 SIGNINGALGORITHM_FILTERED = Signing Algorithms supported by the keys present in the selected crypto token
 
-SIGNINGALGORITHM_ALTERNATIVE_FILTERED = Alternative signing algorithm if a hybrid certificate is desired. 
+SIGNINGALGORITHM_ALTERNATIVE = Alternative Signing Algorithm
+
+SIGNINGALGORITHM_ALTERNATIVE_FILTERED = Select an alternative signing algorithm to activate hybrid certificates
+
+SIGNINGALGORITHM_ALTERNATIVE_NONE = - None alternative signature
 
 SIGNREQUEST               = Sign Certificate Request
 
diff --git a/modules/admin-gui/resources/languages/languagefile.fr.properties b/modules/admin-gui/resources/languages/languagefile.fr.properties
index f998236668..fb013f36ed 100644
--- a/modules/admin-gui/resources/languages/languagefile.fr.properties
+++ b/modules/admin-gui/resources/languages/languagefile.fr.properties
@@ -1897,8 +1897,6 @@ ALLOWBACKDATEDREVOCATION  = Autoriser la révocation antidatée
 
 ALPHANUMERIC              = Alpha-numérique [0-9][A-Z]
 
-ALTERNATIVESIGNINGALGORITHM = Algorithme de signature alternative
-
 ANYCA                     = Toutes les AC
 
 AREYOUSUREACTIVATECA      = Êtes-vous sûr de vouloir activer cette AC ?
@@ -2630,9 +2628,13 @@ SIGNEDBYEXTERNALCA        = Signé par une AC externe
 
 SIGNINGALGORITHM          = Algorithme de signature
 
-SIGNINGALGORITHM_FILTERED = Algorithmes de signature supportés par les clés présentes dans le conteneur (Crypto Token) sélectionné
+SIGNINGALGORITHM_FILTERED = Algorithmes de signature supportés par les clés présentes dans le conteneur de clés sélectionné
+
+SIGNINGALGORITHM_ALTERNATIVE = Algorithme de signature alternative
+
+SIGNINGALGORITHM_ALTERNATIVE_FILTERED = Sélectionner un algorithme de signature alternative pour activer les certificats hybrides
 
-SIGNINGALGORITHM_ALTERNATIVE_FILTERED = Algorithme de signature alternative, pour un certificat hybride
+SIGNINGALGORITHM_ALTERNATIVE_NONE = – Aucune signature alternative
 
 SIGNREQUEST               = Signer une requête de certificat
 
diff --git a/modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java b/modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java
index 55c19f8886..b3b08601f0 100644
--- a/modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java
+++ b/modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java
@@ -1104,7 +1104,7 @@ public List<SelectItem> getAvailableSigningAlgList() {
     
     public List<SelectItem> getAvailableSigningAlgListNoneOption() {
         final List<SelectItem> resultList = getAvailableSigningAlgList();
-        resultList.add(0, new SelectItem(null, "Select an algorithm to activate hybrid certificates."));
+        resultList.add(0, new SelectItem(null, getEjbcaWebBean().getText("SIGNINGALGORITHM_ALTERNATIVE_NONE")));
         return resultList;
     }
 

From 22471ae0abaedb15b68341eb39c517c970b33841 Mon Sep 17 00:00:00 2001
From: David CARELLA <david.carella@gmail.com>
Date: Sat, 1 Feb 2025 02:07:07 +0100
Subject: [PATCH 2/2] Noticket: Improve GUI messages for signing algorithm (red
 color)

---
 modules/admin-gui/resources/ca/editcas/editcapage.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/admin-gui/resources/ca/editcas/editcapage.xhtml b/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
index 38b74ee979..27448e1193 100644
--- a/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
+++ b/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
@@ -237,7 +237,7 @@
 							<f:ajax event="change" render="editcapage" />
 						</h:selectOneMenu>
 						<br />
-						<h:outputLabel styleClass="smallHelp"
+						<h:outputLabel styleClass="warning"
 							value="#{web.text.SIGNINGALGORITHM_ALTERNATIVE_FILTERED}" />
 					</h:panelGroup>