Merged in bugfix/SHIBUI-894 (pull request #206)

SHIBUI-894 Removing mock i18n testing file

Approved-by: Bill Smith <wsmith@unicon.net>
Approved-by: Ryan Mathis <rmathis@unicon.net>

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/InternationalizationConfiguration.java

@@ -12,14 +12,22 @@ public class InternationalizationConfiguration {
     public LocaleResolver localeResolver() {
         // TODO if we want to control the order, we can implement our own locale resolver instead of using the SessionLocaleResolver.
         SessionLocaleResolver sessionLocaleResolver = new SessionLocaleResolver();
+
+        // NOTE: If we set a default here, Locale.getDefault's behavior will be consistent, but then Accept-Language
+        // is not honored (only ?lang=). If we do not set a default, the default is determined at runtime by the JVM.
+        // This may break unit tests if the system does not determine the default to be English.
+        // sessionLocaleResolver.setDefaultLocale(new Locale("en"));
+
         return sessionLocaleResolver;
     }
 
     @Bean
     public MappedResourceBundleMessageSource messageSource() {
         MappedResourceBundleMessageSource source = new MappedResourceBundleMessageSource();
         source.setBasenames("i18n/messages");
-        source.setUseCodeAsDefaultMessage(true);
+        source.setUseCodeAsDefaultMessage(false); //TODO Why was this true?
+        source.setFallbackToSystemLocale(false); // allows us to return messages.properties instead of
+                                                 // messages_en.properties for unsupported languages.
         return source;
     }
 }