Enable German translations. Fix dictionary swapping problems so it is

reliable.
biddster · Apr 21, 2014 · cdcf07a · cdcf07a
1 parent 4c45526
commit cdcf07a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>uk.co.biddell</groupId>
 	<artifactId>DiceWare</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<name>DiceWare</name>
 	<url>http://maven.apache.org</url>
 

diff --git a/src/main/java/uk/co/biddell/diceware/dictionaries/DiceWare.java b/src/main/java/uk/co/biddell/diceware/dictionaries/DiceWare.java
@@ -63,8 +63,7 @@ public LengthType getLengthType() {
     public DiceWare() throws IOException, NoSuchAlgorithmException {
         dictionaries.add(new Dictionary("DiceWare - United Kingdon", "/beale.txt"));
         dictionaries.add(new Dictionary("DiceWare - United States", "/diceware.txt"));
-        // dictionaries.add(new Dictionary("DiceWare - German",
-        // "/diceware_german.txt"));
+        dictionaries.add(new Dictionary("DiceWare - German", "/diceware_german.txt"));
         dictionaries.add(new Dictionary("DiceWare - Spanish", "/DW-Espanol-1.txt"));
         dictionaries.add(new Dictionary("DiceWare - Japanese", "/diceware_jp.txt"));
         dictionaries.add(new Dictionary("DiceWare - Dutch", "/DicewareDutch.txt"));

diff --git a/src/main/java/uk/co/biddell/diceware/ui/DiceWarePanel.java b/src/main/java/uk/co/biddell/diceware/ui/DiceWarePanel.java
@@ -170,15 +170,13 @@ public final void stateChanged(final ChangeEvent changeEvent) {
 
     @Override
     public final void actionPerformed(final ActionEvent actionEvent) {
-        if (actionEvent.getSource() == dictionaryCombo || actionEvent.getSource() == typeCombo) {
-            create();
-        } else if (actionEvent.getSource() == nextButton) {
+        if (actionEvent.getSource() == typeCombo || actionEvent.getSource() == nextButton) {
             create();
         } else if (actionEvent.getSource() == copyButton) {
             clipboard.setContents(new StringSelection(diceWords.toString()), this);
         } else if (actionEvent.getSource() == dictionaryCombo) {
             diceWare.setDictionary((Dictionary) dictionaryCombo.getSelectedItem());
-            nextButton.doClick();
+            create();
         }
     }
 

diff --git a/src/main/resources/diceware_german.txt b/src/main/resources/diceware_german.txt