380e1b674c12b0ae2252de57f30886f41c72274e
java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java
| ... | ... | @@ -11,7 +11,7 @@ import java.util.regex.Pattern; |
| 11 | 11 | import com.sap.sse.i18n.ResourceBundleStringMessages; |
| 12 | 12 | |
| 13 | 13 | public class ResourceBundleStringMessagesImpl implements ResourceBundleStringMessages { |
| 14 | - |
|
| 14 | + private static final Locale DEFAULT_LOCALE = Locale.ENGLISH; |
|
| 15 | 15 | private final String resourceBaseName; |
| 16 | 16 | private final ClassLoader resourceClassLoader; |
| 17 | 17 | private String encoding; |
| ... | ... | @@ -36,7 +36,14 @@ public class ResourceBundleStringMessagesImpl implements ResourceBundleStringMes |
| 36 | 36 | |
| 37 | 37 | @Override |
| 38 | 38 | public String get(Locale locale, String messageKey, String... parameters) { |
| 39 | - final String message = getResourceBundle(locale).getString(messageKey); |
|
| 39 | + final ResourceBundle bundle = getResourceBundle(locale) == null ? getResourceBundle(DEFAULT_LOCALE) |
|
| 40 | + : getResourceBundle(locale); |
|
| 41 | + String message; |
|
| 42 | + try { |
|
| 43 | + message = bundle.getString(messageKey); |
|
| 44 | + } catch (MissingResourceException e) { |
|
| 45 | + message = getResourceBundle(DEFAULT_LOCALE).getString(messageKey); |
|
| 46 | + } |
|
| 40 | 47 | return get(message, parameters); |
| 41 | 48 | } |
| 42 | 49 |