Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve: GUI messages for signing algorithm in CA creation form #773

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −11
Open

Improve: GUI messages for signing algorithm in CA creation form #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cab6a9
Noticket: Improve GUI messages for signing algorithm
dcarella Jan 15, 2025
22471ae
Noticket: Improve GUI messages for signing algorithm (red color)
dcarella Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/admin-gui/resources/ca/editcas/editcapage.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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>

Expand Down
8 changes: 5 additions & 3 deletions modules/admin-gui/resources/languages/languagefile.en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down Expand Up @@ -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

Expand Down
10 changes: 6 additions & 4 deletions modules/admin-gui/resources/languages/languagefile.fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down