jcryptool/core#219 fix alphabet composite translation

jcryptool · Aug 4, 2020 · 8a9d111 · 8a9d111
1 parent 8a97f51
commit 8a9d111
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/org.jcryptool.crypto.ui/src/org/jcryptool/crypto/ui/alphabets/AlphabetSelectorComposite.java b/org.jcryptool.crypto.ui/src/org/jcryptool/crypto/ui/alphabets/AlphabetSelectorComposite.java
@@ -390,10 +390,10 @@ private void reloadAlphabetCombo() {
 
         comboAlphas.setEnabled(comboAlphas.getItemCount() >= 2);
 
-        hintOnlyThisSelectable = "";
+        hintOnlyThisSelectable = ""; //$NON-NLS-1$
         if (mode == Mode.COMBO_BOX_WITH_CUSTOM_ALPHABET_BUTTON || mode == Mode.SINGLE_COMBO_BOX_ONLY_EXISTING_ALPHABETS) {
         	if(comboAlphas.getItemCount() < 2) {
-        		hintOnlyThisSelectable = "(only one alphabet selectable here)";
+        		hintOnlyThisSelectable = Messages.getString("AlphabetSelectorComposite.3"); //$NON-NLS-1$
         	}
         }
 
@@ -413,7 +413,7 @@ private String makeAlphaStringForCombo(AbstractAlphabet alpha, boolean custom) {
 
     private String makeAlphaStringForBtn(AbstractAlphabet alpha) {
         return getCustomAlphabetLabel()
-                + Messages.getString("AlphabetSelectorComposite.current") + alpha.getName() + "; Zeichen: " + AbstractAlphabet.alphabetContentAsString(alpha.getCharacterSet()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+                + Messages.getString("AlphabetSelectorComposite.current") + alpha.getName() + "; Zeichen: " + AbstractAlphabet.alphabetContentAsString(alpha.getCharacterSet()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     private int getIndexForRegisteredAlphabet(AbstractAlphabet content) {
@@ -432,7 +432,7 @@ private void createInputObject() {
 
             @Override
             protected boolean canAutocorrect(InputVerificationResult result) {
-                if (result.getMessage().contains("cancelled")) {
+                if (result.getMessage().contains("cancelled")) { //$NON-NLS-1$
                     return true;
                 }
                 return super.canAutocorrect(result);
@@ -626,7 +626,7 @@ public void update(Observable o, Object arg) {
     }
 
     private String generateAlphaContentTip(AbstractAlphabet content) {
-        return "Content" + ": " + AbstractAlphabet.alphabetContentAsString(content.getCharacterSet());
+        return Messages.getString("AlphabetSelectorComposite.6") + ": " + AbstractAlphabet.alphabetContentAsString(content.getCharacterSet()); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**

diff --git a/org.jcryptool.crypto.ui/src/org/jcryptool/crypto/ui/alphabets/messages.properties b/org.jcryptool.crypto.ui/src/org/jcryptool/crypto/ui/alphabets/messages.properties
@@ -9,6 +9,8 @@ AddAlphabetWizardPage2.lblDefineThe.text=2) Define the alphabet characters\:
 AlphabetManualInputField.2=You can enter special characters like '\\n', '\\t', and enter any character by writing '{character-number}', like '{13}'.
 AlphabetSelectorComposite.0=Select alphabet\:
 AlphabetSelectorComposite.1=Custom alphabet...
+AlphabetSelectorComposite.3=(only one alphabet selectable here)
+AlphabetSelectorComposite.6=Content
 AlphabetSelectorComposite.current=\ (current\: 
 ComposeAlphabetComposite.1=Click on the alphabet blocks to compose a new alphabet\:
 ComposeAlphabetComposite.10=Result (composed alphabet)\:

diff --git a/org.jcryptool.crypto.ui/src/org/jcryptool/crypto/ui/alphabets/messages_de.properties b/org.jcryptool.crypto.ui/src/org/jcryptool/crypto/ui/alphabets/messages_de.properties
@@ -20,6 +20,8 @@ AlphabetManualInputField.2=Sie k
 AlphabetSelectorComposite.0=Alphabet auswählen:
 AlphabetSelectorComposite.1=Eigenes Alphabet erstellen
 AlphabetSelectorComposite.current=\ (derzeit: 
+AlphabetSelectorComposite.3=(nur ein Alphabet ist hier möglich)
+AlphabetSelectorComposite.6=Inhalt
 ComposeAlphabetComposite.1=Klicken Sie auf die Alphabetbausteine, um ein neues Alphabet zusammenzustellen:
 ComposeAlphabetComposite.10=Ergebnis (zusammengestelltes Alphabet):
 ComposeAlphabetComposite.11=Alphabetzeichen: