[dcm4che-commits] SF.net SVN: dcm4che:[18971] dcm4chee/dcm4chee-web-common/branches/ DCM4CHEE_WEB_3_0_4-RC/src/main/java/org/dcm4chee/web/common/base/ ExternalWebApplications.java

[<jav...@us...>]

Revision: 18971
          http://sourceforge.net/p/dcm4che/svn/18971
Author:   javawilli
Date:     2021-03-22 18:22:34 +0000 (Mon, 22 Mar 2021)
Log Message:
-----------
french translation

Modified Paths:
--------------
    dcm4chee/dcm4chee-web-common/branches/DCM4CHEE_WEB_3_0_4-RC/src/main/java/org/dcm4chee/web/common/base/ExternalWebApplications.java

Modified: dcm4chee/dcm4chee-web-common/branches/DCM4CHEE_WEB_3_0_4-RC/src/main/java/org/dcm4chee/web/common/base/ExternalWebApplications.java
===================================================================
--- dcm4chee/dcm4chee-web-common/branches/DCM4CHEE_WEB_3_0_4-RC/src/main/java/org/dcm4chee/web/common/base/ExternalWebApplications.java	2021-03-22 18:21:36 UTC (rev 18970)
+++ dcm4chee/dcm4chee-web-common/branches/DCM4CHEE_WEB_3_0_4-RC/src/main/java/org/dcm4chee/web/common/base/ExternalWebApplications.java	2021-03-22 18:22:34 UTC (rev 18971)
@@ -64,7 +64,8 @@
 public class ExternalWebApplications implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    private static final String CFG_FILE_NAME = "external_webapps.cfg";
+    private static final String CFG_FILE_NAME = "external_webapps";
+    private static final String CFG_FILE_NAME_EXT = ".cfg";
     
     private List<String> jaasRoles;
     private List<ExternalWebApp> applications = new ArrayList<ExternalWebApp>();
@@ -75,9 +76,13 @@
         jaasRoles = LoginContextSecurityHelper.getJaasRoles();
     }
     
-    public List<ExternalWebApp> getExternalWebAppPanels() {
+    public List<ExternalWebApp> getExternalWebAppPanels(String language) {
         File cfgPath = FileUtils.resolve(new File(BaseCfgDelegate.getInstance().getWebConfigPath()));
-        File cfgFile = new File(cfgPath, CFG_FILE_NAME);
+        File cfgFile = new File(cfgPath, CFG_FILE_NAME+"_"+language+CFG_FILE_NAME_EXT);
+        if (!cfgFile.isFile()) {
+        	log.debug("Config file for external web-pages for specific language missing, use default! "+cfgFile);
+        	cfgFile = new File(cfgPath, CFG_FILE_NAME+CFG_FILE_NAME_EXT);
+        }
         if (cfgFile.isFile()) {
             BufferedReader br = null;
             try {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.