Fixed a bundle loading misplacement for the translation

ldiogoz · Aug 30, 2016 · ac4520f · ac4520f
1 parent d90f91f
commit ac4520f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /aCCinaPDF/nbproject/private/
-/aCCinaPDF/build/
+/aCCinaPDF/build/
+/aCCinaPDF/dist/
diff --git a/aCCinaPDF/aCCinaPDF.cfg b/aCCinaPDF/aCCinaPDF.cfg
diff --git a/aCCinaPDF/keystore/aCCinaPDF_cacerts b/aCCinaPDF/keystore/aCCinaPDF_cacerts
diff --git a/aCCinaPDF/src/model/CCSignatureSettings.java b/aCCinaPDF/src/model/CCSignatureSettings.java
@@ -95,6 +95,17 @@ public CCSignatureSettings(boolean forceCreateConfigFile) {
                 return;
             }
 
+            switch (languageStr) {
+                case "en-US":
+                    Bundle.getBundle().setCurrentLocale(Bundle.Locales.English);
+                    break;
+                case "pt-PT":
+                    Bundle.getBundle().setCurrentLocale(Bundle.Locales.Portugues);
+                    break;
+                default:
+                    Bundle.getBundle().setCurrentLocale(Bundle.Locales.English);
+            }
+
             String keystoreStr = getConfigParameter("keystore");
             if (keystoreStr == null) {
                 CCInstance.getInstance().setKeystore(CCInstance.getInstance().getDefaultKeystore());
@@ -123,16 +134,6 @@ public CCSignatureSettings(boolean forceCreateConfigFile) {
                     Settings.getSettings().setKeystorePath(keystoreStr);
                 }
             }
-            switch (languageStr) {
-                case "en-US":
-                    Bundle.getBundle().setCurrentLocale(Bundle.Locales.English);
-                    break;
-                case "pt-PT":
-                    Bundle.getBundle().setCurrentLocale(Bundle.Locales.Portugues);
-                    break;
-                default:
-                    Bundle.getBundle().setCurrentLocale(Bundle.Locales.English);
-            }
             Settings.getSettings().setPdfVersion(pdfVersionStr);
             Settings.getSettings().setRenderImageQuality(Integer.valueOf(renderQualityStr));
             setPrefix(prefixStr);