When there's no language plugin, load core bundle

2 files changed, 28 insertions, 11 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java b/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java
index b987061e18e..4bf009a9a42 100644
--- a/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java
+++ b/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java
@@ -84,21 +84,29 @@ public class DefaultI18n implements I18n, ServerExtension, BatchExtension, Start
   void doStart(ClassLoader classloader) {
     this.classloader = classloader;
     propertyToBundles = Maps.newHashMap();
-    for (PluginMetadata plugin : pluginRepository.getMetadata()) {
-      try {
-        String bundleKey = BUNDLE_PACKAGE + plugin.getKey();
-        ResourceBundle bundle = ResourceBundle.getBundle(bundleKey, Locale.ENGLISH, this.classloader, control);
-        Enumeration<String> keys = bundle.getKeys();
-        while (keys.hasMoreElements()) {
-          String key = keys.nextElement();
-          propertyToBundles.put(key, bundleKey);
-        }
-      } catch (MissingResourceException e) {
-        // ignore
+    Collection<PluginMetadata> metadata = pluginRepository.getMetadata();
+    if (metadata.isEmpty()) {
+      addPlugin("core");
+    } else {
+      for (PluginMetadata plugin : pluginRepository.getMetadata()) {
+        addPlugin(plugin.getKey());
       }
     }
     LOG.debug(String.format("Loaded %d properties from l10n bundles", propertyToBundles.size()));
   }
+  private void addPlugin(String pluginKey){
+    try {
+      String bundleKey = BUNDLE_PACKAGE + pluginKey;
+      ResourceBundle bundle = ResourceBundle.getBundle(bundleKey, Locale.ENGLISH, this.classloader, control);
+      Enumeration<String> keys = bundle.getKeys();
+      while (keys.hasMoreElements()) {
+        String key = keys.nextElement();
+        propertyToBundles.put(key, bundleKey);
+      }
+    } catch (MissingResourceException e) {
+      // ignore
+    }
+  }
 
   @Override
   public void stop() {
diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
index f9fc70b0960..7fd150b3608 100644
--- a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
@@ -58,6 +58,15 @@ public class DefaultI18nTest {
   }
 
   @Test
+  public void load_core_bundle_when_no_plugin() {
+    DefaultI18n manager = new DefaultI18n(mock(PluginRepository.class), system2);
+    manager.doStart(getClass().getClassLoader());
+
+    assertThat(manager.getPropertyKeys().contains("any")).isTrue();
+    assertThat(manager.getPropertyKeys().contains("assignee")).isTrue();
+  }
+
+  @Test
   public void introspect_all_available_properties() {
     assertThat(manager.getPropertyKeys().contains("any")).isTrue();
     // Only in english