[FIX JENKINS-35845] Internationalisation for Blue Ocean and JDL

core/src/main/java/hudson/util/HttpResponses.java

@@ -29,6 +29,7 @@
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
 import java.io.File;

core/src/main/java/jenkins/util/ResourceBundleUtil.java

@@ -27,12 +27,16 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import hudson.PluginWrapper;
+import java.util.logging.Logger;
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.util.concurrent.ConcurrentHashMap;
+import jenkins.model.Jenkins;
 
 /**
  * Simple {@link java.util.ResourceBundle} utility class.
@@ -42,6 +46,7 @@
 @Restricted(NoExternalUse.class)
 public class ResourceBundleUtil {
 
+    private static final Logger logger = Logger.getLogger("jenkins.util.ResourceBundle");
     private static final Map<String, JSONObject> bundles = new ConcurrentHashMap<>();
 
     private ResourceBundleUtil() {
@@ -72,14 +77,54 @@ private ResourceBundleUtil() {
             return bundleJSON;
         }
 
-        ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale);
+        ResourceBundle bundle = getBundle(baseName, locale, Jenkins.class.getClassLoader());
+        if (bundle == null) {
+            // Not in Jenkins core. Check the plugins.
+            Jenkins jenkins = Jenkins.getInstance(); // will never return null
+            if (jenkins != null) {
+                for (PluginWrapper plugin : jenkins.getPluginManager().getPlugins()) {
+                    bundle = getBundle(baseName, locale, plugin.classLoader);
+                    if (bundle != null) {
+                        break;
+                    }
+                }
+            }
+        }
+        if (bundle == null) {
+            throw new MissingResourceException("Can't find bundle for base name "
+                    + baseName + ", locale " + locale, baseName + "_" + locale, "");
+        }
 
         bundleJSON = toJSONObject(bundle);
         bundles.put(bundleKey, bundleJSON);
 
         return bundleJSON;
     }
 
+    /**
+     * Get a plugin bundle using the supplied Locale and classLoader
+     *
+     * @param baseName The bundle base name.
+     * @param locale The Locale.
+     * @param classLoader The classLoader
+     * @return The bundle JSON.
+     */
+    private static @CheckForNull ResourceBundle getBundle(@Nonnull String baseName, @Nonnull Locale locale, @Nonnull ClassLoader classLoader) {
+        try {
+            return ResourceBundle.getBundle(baseName, locale, classLoader);
+        } catch (MissingResourceException e) {
+            // fall through and return null.
+            logger.warning(e.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     * Create a JSON representation of a resource bundle
+     *
+     * @param bundle The resource bundle.
+     * @return The bundle JSON.
+     */
     private static JSONObject toJSONObject(@Nonnull ResourceBundle bundle) {
         JSONObject json = new JSONObject();
         for (String key : bundle.keySet()) {

test/src/test/java/jenkins/I18nTest.java

@@ -23,6 +23,7 @@
  */
 package jenkins;
 
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import net.sf.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -49,9 +50,21 @@ public void test_baseName_unspecified() throws IOException, SAXException {
 
     @Test
     public void test_baseName_unknown() throws IOException, SAXException {
-        JSONObject response = jenkinsRule.getJSON("i18n/resourceBundle?baseName=com.acme.XyzWhatever").getJSONObject();
-        Assert.assertEquals("error", response.getString("status"));
-        Assert.assertTrue(response.getString("message").contains("com.acme.XyzWhatever"));
+        try {
+            JSONObject response = jenkinsRule.getJSON("i18n/resourceBundle?baseName=com.acme.XyzWhatever").getJSONObject();
+        } catch (FailingHttpStatusCodeException e) {
+            Assert.assertNotNull(e);
+            Assert.assertTrue(e.getMessage().contains("com.acme.XyzWhatever"));
+        }
+    }
+
+    @Test
+    public void test_baseName_plugin() throws IOException, SAXException {
+        // ssh-slaves plugin is installed by default
+        JSONObject response = jenkinsRule.getJSON("i18n/resourceBundle?baseName=hudson.plugins.sshslaves.Messages").getJSONObject();
+        Assert.assertEquals("ok", response.getString("status"));
+        JSONObject data = response.getJSONObject("data");
+        Assert.assertEquals("The launch timeout must be a number.", data.getString("SSHConnector.LaunchTimeoutMustBeANumber"));
     }
 
     @Test