#433 fix(missing lang properties)

Author: qifeng-bai

grails-app/conf/application.yml

@@ -22,6 +22,8 @@ grails:
         upload:
             maxFileSize: 10000000
             maxRequestSize: 10000000
+i18n:
+  region: 'default'
 
 layersService:
     url: 'https://spatial.ala.org.au/ws'

grails-app/controllers/au/org/ala/spatial/portal/PortalController.groovy

@@ -151,7 +151,11 @@ class PortalController {
                     config.spApp.each { k, v ->
                         spApp.put(k, v.class.newInstance(params.get(k, v)))
                     }
-                    config.spApp = spApp
+                    if (params.get("lang")) {
+                        config.i18n?.currentRegion = params.get("lang")
+                    } else {
+                        config.i18n?.currentRegion = config.i18n?.region
+                    }
 
                     render(view: 'index',
                             model: [config     : config,

grails-app/services/au/org/ala/spatial/portal/PropertiesService.groovy

@@ -16,6 +16,7 @@
 package au.org.ala.spatial.portal
 
 import org.apache.commons.io.FileUtils
+import org.apache.logging.log4j.util.Strings
 
 /**
  * Helper class for invoking other ALA web services.
@@ -29,6 +30,10 @@ class PropertiesService {
         def defaultFile = "${name}.properties";
         def properties = new Properties()
 
+        //Load default English properties
+        def defaultProperties = new Properties()
+        defaultProperties.load(new StringReader(PortalController.classLoader.getResourceAsStream("messages.properties")?.text))
+
         def text = PortalController.classLoader.getResourceAsStream("$defaultFile")?.text
         if (text) {
             properties.load(new StringReader(text))
@@ -54,6 +59,12 @@ class PropertiesService {
         if (file.exists()) {
             properties.load(new FileReader(file))
         }
+        //Use default English properties if the required lang is not available
+        defaultProperties.each{
+            if (!properties.getProperty(it.key)){
+                properties.setProperty(it.key, it.value)
+            }
+        }
 
         if (properties.size() == 0 && type != 'messages') {
             get('messages')

grails-app/views/portal/index.gsp

@@ -144,7 +144,7 @@
             , '${config.doiService.url}/**'
             </g:if>
         ],
-        i18n: '${config.i18n?.region?:"default"}',
+        i18n: '${config.i18n?.currentRegion?:"default"}',
         editable: ${params.edit?:'false'},
         wmsIntersect: ${config.wms.intersect},
         projections: ${(config.projections as grails.converters.JSON).toString().encodeAsRaw()},