From f9681bb76bf405b5b9ba5d8ca90b7d4ff6432c4c Mon Sep 17 00:00:00 2001
From: damian <damian.jozefowski@pcgacademia.pl>
Date: Fri, 21 Jul 2023 12:02:12 +0200
Subject: [PATCH 1/2] Reading localized license file.

---
 .../org/dspace/core/LicenseServiceImpl.java   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java b/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java
index 8324105a3085..f99b3c31e51c 100644
--- a/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java
+++ b/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,13 +104,14 @@ 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;
     }
 
@@ -115,9 +119,8 @@ public String getDefaultSubmissionLicense() {
      * 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,14 @@ protected void init() {
             }
         }
     }
+
+    private Context obtainContext() {
+        Request currentRequest = DSpaceServicesFactory.getInstance().getRequestService().getCurrentRequest();
+        if (currentRequest != null) {
+            HttpServletRequest request = currentRequest.getHttpServletRequest();
+            return ContextUtil.obtainContext(request);
+        } else {
+            return  new Context();
+        }
+    }
 }

From 0df490d4af2ef2fbb4b540b9a399147301fee65a Mon Sep 17 00:00:00 2001
From: damian <damian.jozefowski@pcgacademia.pl>
Date: Fri, 21 Jul 2023 12:02:12 +0200
Subject: [PATCH 2/2] Reading localized license file.

---
 .../org/dspace/core/LicenseServiceImpl.java   | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java b/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java
index 8324105a3085..5e42b04e7170 100644
--- a/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java
+++ b/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,13 +104,14 @@ 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;
     }
 
@@ -115,9 +119,8 @@ public String getDefaultSubmissionLicense() {
      * 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,17 @@ protected void init() {
             }
         }
     }
+
+    /**
+     * Obtaining current request context
+     */
+    private Context obtainContext() {
+        Request currentRequest = DSpaceServicesFactory.getInstance().getRequestService().getCurrentRequest();
+        if (currentRequest != null) {
+            HttpServletRequest request = currentRequest.getHttpServletRequest();
+            return ContextUtil.obtainContext(request);
+        } else {
+            return  new Context();
+        }
+    }
 }