Merge pull request #76 from daniel-beck/fix-resources

Fix webapp resource lookup
jenkinsci · May 10, 2019 · db1a37c · db1a37c
2 parents a6a3f53 + 2da0d1f
commit db1a37c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -146,7 +146,6 @@
       </resource>
       <resource>
         <directory>core/src/main/webapp</directory>
-        <targetPath>webapp</targetPath>
       </resource>
       <resource>
         <directory>src/main/resources</directory>

diff --git a/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java b/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java
@@ -13,12 +13,15 @@ public class LocalizationContributorImpl extends LocalizationContributor {
     @CheckForNull
     @Override
     public URL getResource(@Nonnull String s) {
+        if (s.startsWith("/")) {
+            s = s.substring(1);
+        }
         return getClass().getClassLoader().getResource(s);
     }
 
     @CheckForNull
     @Override
     public URL getPluginResource(@Nonnull String s, @Nonnull PluginWrapper pluginWrapper) {
-        return getClass().getClassLoader().getResource("/webapp/" + s);
+        return getClass().getClassLoader().getResource("webapp/" + s);
     }
 }