X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fi18n%2FI18n.java;h=fe7293d128f6bbadf8ef3cf229742319e8b8aa00;hb=250630a5fb1ff745f05788210a6efd976533fb55;hp=38a6916be80761235fd692d9488e129fd90e6381;hpb=6f1a8216cfba28add0ef365b46a08d16d4eb87fe;p=jSite.git

diff --git a/src/de/todesbaum/jsite/i18n/I18n.java b/src/de/todesbaum/jsite/i18n/I18n.java
index 38a6916..fe7293d 100644
--- a/src/de/todesbaum/jsite/i18n/I18n.java
+++ b/src/de/todesbaum/jsite/i18n/I18n.java
@@ -20,19 +20,21 @@
 package de.todesbaum.jsite.i18n;
 
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 /**
- * @author David Roden <droden@gmail.com>
- * @version $Id: I18n.java 355 2006-03-24 15:04:11Z bombe $
+ * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  */
 public class I18n {
 
+	private static Locale defaultLocale = new Locale("en");
 	private static Locale currentLocale;
 
 	public static Locale getLocale() {
-		if (currentLocale == null)
+		if (currentLocale == null) {
 			currentLocale = Locale.getDefault();
+		}
 		return currentLocale;
 	}
 
@@ -50,7 +52,15 @@ public class I18n {
 	}
 
 	public static String getMessage(String key) {
-		return getResourceBundle().getString(key);
+		try {
+			return getResourceBundle().getString(key);
+		} catch (MissingResourceException mre1) {
+			try {
+				return getResourceBundle(defaultLocale).getString(key);
+			} catch (MissingResourceException mre2) {
+				return key;
+			}
+		}
 	}
 
 }