Merge pull request DSpace#9138 from tdonohue/port_8966_to_dspace7x

[Port to dspace-7_x] Reading localized license file.

dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java

@@ -17,9 +17,12 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import javax.servlet.http.HttpServletRequest;
 
 import org.dspace.core.service.LicenseService;
 import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.services.model.Request;
+import org.dspace.web.ContextUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -101,23 +104,23 @@ public String getLicenseText(String licenseFile) {
     /**
      * Get the site-wide default license that submitters need to grant
      *
+     * Localized license requires: default_{{locale}}.license file.
+     * Locale also must be listed in webui.supported.locales setting.
+     *
      * @return the default license
      */
     @Override
     public String getDefaultSubmissionLicense() {
-        if (null == license) {
-            init();
-        }
+        init();
         return license;
     }
 
     /**
      * Load in the default license.
      */
     protected void init() {
-        File licenseFile = new File(
-            DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("dspace.dir")
-                + File.separator + "config" + File.separator + "default.license");
+        Context context = obtainContext();
+        File licenseFile = new File(I18nUtil.getDefaultLicense(context));
 
         FileInputStream fir = null;
         InputStreamReader ir = null;
@@ -169,4 +172,24 @@ protected void init() {
             }
         }
     }
+
+    /**
+     * Obtaining current request context.
+     * Return new context if getting one from current request failed.
+     *
+     * @return DSpace context object
+     */
+    private Context obtainContext() {
+        try {
+            Request currentRequest = DSpaceServicesFactory.getInstance().getRequestService().getCurrentRequest();
+            if (currentRequest != null) {
+                HttpServletRequest request = currentRequest.getHttpServletRequest();
+                return ContextUtil.obtainContext(request);
+            }
+        } catch (Exception e) {
+            log.error("Can't load current request context.");
+        }
+
+        return  new Context();
+    }
 }