Merge pull request #434 from AtlasOfLivingAustralia/433_i18n

#433 i18n fix

Author: qifeng-bai

grails-app/assets/javascripts/spApp/service/toolExportSampleService.js

@@ -23,7 +23,7 @@
                         "input": [
                             {
                                 "name": "area",
-                                "description": $i18n(382,"Select area."),
+                                "description": $i18n(420,"Select area."),
                                 "type": "area",
                                 "constraints": {
                                     "min": 1,

grails-app/assets/stylesheets/application.css

@@ -21,4 +21,5 @@
 *= require commonui-bs3-2019/css/ala-styles.css
 *= require spatial-hub.css
 *= require commonui-bs3-2019.css
+*= require flag-icons-master/css/flag-icon.css
 */

grails-app/assets/stylesheets/spatial-hub.css

@@ -1116,3 +1116,9 @@ ul.errors {
     padding-top: 20px;
     font-style: italic;
 }
+
+#lang {
+    color: #FFFFFF;
+    background-color: #000000;
+    border-width: 0;
+}

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,12 @@ 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 = null;
+                    }
+
 
                     render(view: 'index',
                             model: [config     : config,

grails-app/i18n/messages_de.properties

@@ -400,6 +400,10 @@ typeMismatch.java.math.BigInteger=Die Eigenschaft {0} muss eine gültige Zahl se
 354=Gebiet
 355=Die Befehl konnte nicht gefunden werden
 356=Wissenschaftliche Verbreitung
+357=JournalMap articles
+358=Checklist species distributions
+359=Checklist areas
+360=Gazetteer Points
 361=Sehenswürdigkeiten
 362=https\://www.ala.org.au/spatial-portal-help/note-area-sq-km/
 363=Info
@@ -432,7 +436,9 @@ typeMismatch.java.math.BigInteger=Die Eigenschaft {0} muss eine gültige Zahl se
 390=Oktober
 391=November
 392=Dezember
+393=expert distribution(s)
 394=Checkliste(n)
+395=track(s)
 396=gefunden
 397=Metadaten-URL
 398=Sammlung von Flächen aus Layer
@@ -461,6 +467,7 @@ typeMismatch.java.math.BigInteger=Die Eigenschaft {0} muss eine gültige Zahl se
 421=Dateityp.
 422=Flächen zum Exportieren auswählen.
 423=Dateityp auswählen.
+424=Number of groups and Shapefile generation
 425=Flächen exportieren.
 426=Eine Artenliste exportieren.
 427=Endemisch
@@ -470,4 +477,85 @@ typeMismatch.java.math.BigInteger=Die Eigenschaft {0} muss eine gültige Zahl se
 431=Datum
 432=Aktionstyp
 433=Daten
-434=Anzahl der Aktionen
+434=Anzahl der Aktionen
+435=Suche im ALA DOI-Dienst nach Datensätzen für Arten
+436=Nach Lizenz
+450=(ausgewählt)
+451=Slider help
+452=Use the slider to select facet classes. All facet classes falling in between the range selector are selected. Selections falling outside the range are cleared.
+453=Diagramme
+454=view in larger window
+455=Diagramm
+456=Tabelle
+457=Facet classes for 
+458=Aktualisieren
+459=My workflow
+460=Workflow Saved
+461=Aus DOI hinzufügen
+462=Kein Datensatz ausgewählt
+463=Search returned with no results
+464=Metadaten anzeigen
+465=DOI
+466=Arten
+467=Datenanzahl
+468=Department
+469=Modeller
+470=Datum
+471=SDM available
+472=No data was able to be extracted from the selected DOI
+473=Select by clicking label or bar
+474=Nicht angegeben
+475=No occurrences mapped for this layer and applied filters.
+476=Die hochgeladene Datei ist zu groß. Maximale Dateigröße\:
+477=Upload fehlgeschlagen.
+478=Failed to register query. Try again later.
+479=Ungültiger WKT
+480=Display facet class in
+481=Auswahl löschen
+482=Search CSDM dataset by species, department or modeller
+483=Absenden
+484=Workflow Name
+485=ist privat
+486=Id
+487=Ist privat
+488=bearbeiten
+489=Anhand eines Zeitraums begrenzen
+490=Zeitraum
+491=TO
+492=Listentyp\:
+493=Radius (km) 
+494=Draw polyline with buffer
+495=Datenprovider\:
+496=Add occurrences to adhoc
+497=Artenmerkmale mit einschließen (falls verfügbar)
+498=Annotating your workflow will allow other users to assess the suitability of the dataset for their purposes and make it reusable.
+499=User
+500=Organsation
+501=General annotation of the dataset
+502=Workflow annotation
+503=Search facets...
+504=--- Aktive Filter ---
+505=Facet begins with (case sensitive)\:
+506=Available Workflows
+507=Laden
+508=Bearbeitung läuft...
+509=Speichern
+510=Ausführen
+511=Kartenprojektion
+512=Filter entfernen
+513=Räumlich-unbekannte Daten berücksichtigen
+514=Abwesenheiten (Absences) berücksichtigen
+515=Verlauf
+516=Actions
+517=Sessions
+518=Zoom to Localities
+519=Select Facet
+520=Filter löschen
+521=Aktiviert
+522=Kategorie
+523=facets selected
+524=Weiter
+525=Räumlich-undefinierte Daten berücksichtigen
+526=(kann Artenmerkmale enthalten)
+527=Keine weiteren Arten
+528=Lebensform

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.
@@ -25,10 +26,14 @@ class PropertiesService {
     def grailsApplication
 
     def get(type) {
-        def name = "messages" + (type == "default" ? "" : "_" + type)
+        def name = "messages" + (type == "default" ? "" : "_" + type.toLowerCase())
         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/layouts/portal.gsp

@@ -311,6 +311,7 @@
                             </li>
                         </ul>
                     </div>
+
                     <button class="search-trigger hidden-xs hidden-sm collapsed collapse-trigger-button"
                             data-toggle="collapse"
                             data-target="#autocompleteSearchALA" onclick="focusOnClickSearchButton()">
@@ -360,8 +361,11 @@
                 </form>
             </div>
         </div>
+
     </nav><!-- .site-navigation -->
 
+
+
 </div>
 <script type="text/html" id="autoCompleteTemplate">
 <li class="autocomplete-item striped">
@@ -405,6 +409,5 @@
     </script>
 </g:if>
 <!-- End Google Analytics -->
-
 </body>
 </html>

grails-app/views/portal/index.gsp

@@ -74,6 +74,10 @@
         baseLayers: ${(config.startup.baselayers as grails.converters.JSON).toString().encodeAsRaw()},
         defaultBaseLayer: '${config.startup.baselayer.default}',
 
+        <g:if test="${config.i18n?.currentRegion}">
+        i18n: '${config.i18n?.currentRegion}',
+        </g:if>
+
         <g:if test="${config.flickr.url}">
         flickrUrl: '${config.flickr.url}',
         flickrLicensesData: ${(config.flickr.licensesData as grails.converters.JSON).toString().encodeAsRaw()},
@@ -94,6 +98,8 @@
         presetWMSServers: ${(config.presetWMSServers as grails.converters.JSON).toString().encodeAsRaw()},
         getMapExamples: ${(config.getMapExamples as grails.converters.JSON).toString().encodeAsRaw()},
 
+
+
         <g:if test="${config.doiService?.url}">
         doiServiceUrl: '${config.doiService.url}',
         </g:if>
@@ -144,7 +150,7 @@
             , '${config.doiService.url}/**'
             </g:if>
         ],
-        i18n: '${config.i18n?.region?:"default"}',
+
         editable: ${params.edit?:'false'},
         wmsIntersect: ${config.wms.intersect},
         projections: ${(config.projections as grails.converters.JSON).toString().encodeAsRaw()},
@@ -212,6 +218,17 @@
         , maxUploadSize: ${config.grails.controllers.upload.maxFileSize}
     };
 
+    if (!$SH.i18n) {
+        if (( navigator.language || navigator.browserLanguage).startsWith('en')) {
+            $SH.i18n = 'default';
+        } else if ((navigator.language || navigator.browserLanguage).startsWith('de')) {
+            $SH.i18n = 'de';
+        } else {
+            $SH.i18n = navigator.language || navigator.browserLanguage;
+        }
+    }
+
+
     BIE_VARS = {
         autocompleteUrl: '${config.autocompleteUrl}'
     };

src/integration-test/groovy/ToolTabulateSpec.groovy

@@ -62,7 +62,7 @@ class ToolTabulateSpec extends GebSpec {
         modalModule.getSizeOfCSVTable() > 2
         modalModule.getCellByName("layer",1) ==  "Koppen Climate Classification (Major Classes)"
 
-        Float.parseFloat(modalModule.getCellByName("Temperate",2)) >= 1600
+        Float.parseFloat(modalModule.getCellByName("Temperate",2)) >= 1500
 
         Thread.sleep(pause)
     }