Merge branch 'master' into dependabot/github_actions/actions/stale-9

jenkinsci · Dec 20, 2023 · 3e9721f · 3e9721f
2 parents c8b0967 + 778ad6a
commit 3e9721f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/blueocean-i18n/src/main/java/io/jenkins/blueocean/i18n/BlueI18n.java b/blueocean-i18n/src/main/java/io/jenkins/blueocean/i18n/BlueI18n.java
@@ -140,7 +140,9 @@ private JSONObject getBundle(BundleParams bundleParams, Locale locale) {
         }
 
         try {
-            ResourceBundle resourceBundle = ResourceBundle.getBundle(bundleParams.bundleName, locale, plugin.classLoader);
+            // We don't want to fall back to the default locale.
+            var control = ResourceBundle.Control.getNoFallbackControl(ResourceBundle.Control.FORMAT_DEFAULT);
+            ResourceBundle resourceBundle = ResourceBundle.getBundle(bundleParams.bundleName, locale, plugin.classLoader, control);
             JSONObject bundleJSON = new JSONObject();
             for (String key : resourceBundle.keySet()) {
                 bundleJSON.put(key, resourceBundle.getString(key));

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.73</version>
+    <version>4.74</version>
     <relativePath />
   </parent>
 
@@ -35,7 +35,6 @@
     <jenkins.version>2.401.3</jenkins.version>
     <javadoc.exec.goal>javadoc-no-fork</javadoc.exec.goal> <!-- stop initialize phase plugins executing twice -->
     <byte-buddy.version>1.14.7</byte-buddy.version>
-    <frontend-version>1.12.0</frontend-version>
     <node.version>10.13.0</node.version>
     <npm.version>6.14.4</npm.version>
     <jacoco.haltOnFailure>false</jacoco.haltOnFailure>