From 62db75f575d6d808d483bd9e60065c72bf964761 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Wed, 10 Apr 2013 19:17:43 +0000
Subject: + Signature block language configuration

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@242 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
---
 .../main/java/at/asit/pdfover/gui/Messages.java    | 31 ++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java')

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java
index 0c6101b9..77e2f764 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java
@@ -54,23 +54,23 @@ public class Messages {
 		currentLocale = locale;
 	}
 	
-	private static ResourceBundle getBundle() {
-		if(!bundles.containsKey(currentLocale)) {
+	private static ResourceBundle getBundle(Locale locale) {
+		if(!bundles.containsKey(locale)) {
 			ResourceBundle tmp = null;
 			try {
-				tmp = ResourceBundle.getBundle(BUNDLE_NAME, currentLocale);
+				tmp = ResourceBundle.getBundle(BUNDLE_NAME, locale);
 			} catch(Exception e) {
-				log.error("NO RESOURCE BUNDLE FOR " + currentLocale.toString(), e); //$NON-NLS-1$
+				log.error("NO RESOURCE BUNDLE FOR " + locale.toString(), e); //$NON-NLS-1$
 				tmp = ResourceBundle.getBundle(BUNDLE_NAME);
 			}
 			if(tmp == null) {
-				log.error("NO RESOURCE BUNDLE FOR " + currentLocale.toString()); //$NON-NLS-1$
+				log.error("NO RESOURCE BUNDLE FOR " + locale.toString()); //$NON-NLS-1$
 				tmp = ResourceBundle.getBundle(BUNDLE_NAME);
 			}
-			bundles.put(currentLocale, tmp);
+			bundles.put(locale, tmp);
 			return tmp;
 		}
-		return bundles.get(currentLocale);
+		return bundles.get(locale);
 	}
 	
 	/**
@@ -80,7 +80,22 @@ public class Messages {
 	 */
 	public static String getString(String key) {
 		try {
-			return getBundle().getString(key);
+			return getBundle(currentLocale).getString(key);
+			//return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Gets the localized message
+	 * @param key the key
+	 * @param locale the locale to use
+	 * @return the localized message
+	 */
+	public static String getString(String key, Locale locale) {
+		try {
+			return getBundle(locale).getString(key);
 			//return RESOURCE_BUNDLE.getString(key);
 		} catch (MissingResourceException e) {
 			return '!' + key + '!';
-- 
cgit v1.2.3