From a9a0750bdf02f052b11e0c3bfadc3d3a94c99936 Mon Sep 17 00:00:00 2001
From: Nick dos Remedios <nick.dosremedios@csiro.au>
Date: Tue, 22 Feb 2022 08:45:58 +1100
Subject: [PATCH 01/12] Version 3.0.10-SNAPSHOT

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ef50c376..cd93246e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 }
 
-version "3.0.9"
+version "3.0.10-SNAPSHOT"
 group "au.org.ala.plugins.grails"
 
 apply plugin:"eclipse"

From 22a31c601eab1473c7c1d36381b1bee797ba1cb3 Mon Sep 17 00:00:00 2001
From: Nick dos Remedios <nick.dosremedios@csiro.au>
Date: Thu, 24 Feb 2022 08:36:03 +1100
Subject: [PATCH 02/12] #392 API buttons did not match across pages

Changed search page to match record page.
---
 grails-app/views/occurrence/list.gsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grails-app/views/occurrence/list.gsp b/grails-app/views/occurrence/list.gsp
index d512e46d..923c79b6 100644
--- a/grails-app/views/occurrence/list.gsp
+++ b/grails-app/views/occurrence/list.gsp
@@ -292,7 +292,7 @@
                                 &nbsp;&nbsp;<g:message code="list.downloads.navigator" default="Download"/>
                             </alatag:download>
                         </div>
-                        <a href="#CopyLink" data-toggle="modal" role="button" class="tooltips btn copyLink" title="${g.message(code:"list.copylinks.dlg.copybutton.title")}"><i class="fa fa-files-o" aria-hidden="true"></i>&nbsp;&nbsp;<g:message code="list.copylinks" default="API"/></a>
+                        <a href="#CopyLink" data-toggle="modal" role="button" class="tooltips btn copyLink" title="${g.message(code:"list.copylinks.dlg.copybutton.title")}"><i class="fa fa-file-code-o" aria-hidden="true"></i>&nbsp;&nbsp;<g:message code="list.copylinks" default="API"/></a>
                         <div id="CopyLink" class="modal fade" role="dialog" tabindex="-1">
                             <div class="modal-dialog" role="document">
                                 <div class="modal-content">

From fffc8207f224cb2acceadce3d0f5b5989ab3bc9c Mon Sep 17 00:00:00 2001
From: Nick dos Remedios <nick.dosremedios@csiro.au>
Date: Fri, 25 Feb 2022 11:30:04 +1100
Subject: [PATCH 03/12] #533 Fix for NPE when config not set

---
 .../au/org/ala/biocache/hubs/OccurrenceController.groovy        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grails-app/controllers/au/org/ala/biocache/hubs/OccurrenceController.groovy b/grails-app/controllers/au/org/ala/biocache/hubs/OccurrenceController.groovy
index 36156b53..d55cde4e 100644
--- a/grails-app/controllers/au/org/ala/biocache/hubs/OccurrenceController.groovy
+++ b/grails-app/controllers/au/org/ala/biocache/hubs/OccurrenceController.groovy
@@ -396,7 +396,7 @@ class OccurrenceController {
                 Boolean userHasRoleAdmin = false
 
                 // Check (optionally comma-separated) list of authorise.roles - if we get `true` then stop checking
-                grailsApplication.config.getProperty('authorise.roles', String).tokenize(',').each {
+                grailsApplication.config.getProperty('authorise.roles', String, "").tokenize(',').each {
                     !userHasRoleAdmin ? userHasRoleAdmin = authService?.userInRole( it ) : null
                 }
 

From 7646b90861801fcda46ab12a419afbde5c106f71 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Tue, 1 Mar 2022 08:31:32 +0100
Subject: [PATCH 04/12] Facets tooltip with field names for humans

---
 .../taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy     | 2 +-
 grails-app/views/occurrence/_facets.gsp                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy b/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
index 66c0df01..baa8fa49 100644
--- a/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
+++ b/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
@@ -265,7 +265,7 @@ class OccurrenceTagLib {
         def facetResult = attrs.facetResult
         def queryParam = attrs.queryParam
         def mb = new MarkupBuilder(out)
-        def linkTitle = "${alatag.message(code:"alatag.filter.results.by")} ${attrs.fieldDisplayName ?: facetResult.fieldName}"
+        def linkTitle = "${alatag.message(code:"alatag.filter.results.by")} ${attrs.fieldDisplayName ? attrs.fieldDisplayName.uncapitalize(): facetResult.fieldName}"
 
         def addCounts = { count ->
             mb.span(class:"facetCount") {
diff --git a/grails-app/views/occurrence/_facets.gsp b/grails-app/views/occurrence/_facets.gsp
index 293d4472..8470e25a 100644
--- a/grails-app/views/occurrence/_facets.gsp
+++ b/grails-app/views/occurrence/_facets.gsp
@@ -93,7 +93,7 @@
                         <g:set var="fieldDisplayName" value="${alatag.formatDynamicFacetName(fieldName:"${facetResult.fieldName}")}"/>
                         <h4><span class="FieldName">${fieldDisplayName?:facetResult.fieldName}</span></h4>
                         <div class="subnavlist nano" style="clear:left">
-                            <alatag:facetLinkList facetResult="${facetResult}" queryParam="${queryParam}"/>
+                            <alatag:facetLinkList facetResult="${facetResult}" queryParam="${queryParam}" fieldDisplayName="${fieldDisplayName}"/>
                         </div>
                         %{--<div class="fadeout"></div>--}%
                         <g:if test="${facetResult.fieldResult.length() > 1}">

From b3be55267bbc27e20915b3cade4682058e1f1f04 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Tue, 1 Mar 2022 17:21:12 +0100
Subject: [PATCH 05/12] Extra i18n of dq and other minor not internationalized
 messages

---
 grails-app/assets/javascripts/search.js                      | 4 +++-
 grails-app/i18n/messages_en.properties                       | 5 +++++
 .../taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy  | 2 +-
 grails-app/views/occurrence/list.gsp                         | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/grails-app/assets/javascripts/search.js b/grails-app/assets/javascripts/search.js
index 76213eed..e877ed78 100644
--- a/grails-app/assets/javascripts/search.js
+++ b/grails-app/assets/javascripts/search.js
@@ -234,7 +234,9 @@ $(document).ready(function() {
         $.getJSON(jsonUri, function(data) {
             // use HTML template, see http://stackoverflow.com/a/1091493/249327
             var speciesPageUri = BC_CONF.bieWebappUrl + "/species/" + lsid;
-            var speciesPageLink = "<a href='" + speciesPageUri + "' title='Species page' target='BIE'>view species page</a>";
+            var speciesPageLinkTitle = jQuery.i18n.prop("search.species.view.title");
+            var speciesPageLinkDesc = jQuery.i18n.prop("search.species.view.desc");
+            var speciesPageLink = "<a href='" + speciesPageUri + "' title='" + speciesPageLinkTitle + "' target='BIE'>" + speciesPageLinkDesc + "</a>";
             $clone.find('a.btn').text(nameString).attr("href", speciesPageUri);
             $clone.find('.nameString').text(nameString);
             $clone.find('.speciesPageLink').html(speciesPageLink);
diff --git a/grails-app/i18n/messages_en.properties b/grails-app/i18n/messages_en.properties
index 43a90872..9b95bc1c 100644
--- a/grails-app/i18n/messages_en.properties
+++ b/grails-app/i18n/messages_en.properties
@@ -1188,11 +1188,14 @@ dq.view.excluded = View excluded records
 dq.excluded.count = records are excluded by this category
 dq.warning.dataprofile.title = Results filtering with data profiles
 dq.warning.dataprofile.content.line1 = Search results are now filtered by default to exclude lower quality records according to the ALA General data profile. Data profiles may be disabled or other data profiles are available via the data profile drop down.
+dq.warning.dataprofile.content.line2 = Information on the data profiles and the filters used in each data profile is available via the <a><i class='fa fa-info-circle'></i></a> icons.
 dq.warning.dataprofile.buttonleft.text = Learn More
 dq.warning.dataprofile.buttonright.text = Got it
 dq.userpref.defaultprofile = -- Select a profile --
 dq.data.profiles.disabled = Data profiles have been disabled for this search
 dq.warning.failedtosave = Failed to save user preferences. Please try again
+dq.disabled = Disabled
+quality.filters.excludeCount = records excluded
 record.compare_table.heading = You are indicating that
 record.compare_table.source_record.heading = This record
 record.compare_table.target_record.heading = This record ID provided
@@ -1218,3 +1221,5 @@ home.index.taxaupload.batchMode.matched=Matched name (via the ALA taxonomy)
 home.index.taxaupload.batchMode.provided=Supplied name (note: is case-sensitive so genus should be capitalised)
 advanced.taxon.tooltip.matched=Input names will be matched to their accepted scientific name in the ALA taxonomy. Results will include records for known synonyms
 advanced.taxon.tooltip.supplied=Input names will only match the scientific name supplied in the original occurrence record. Results will NOT include records for known synonyms. Note: searching is case sensitive.
+search.species.view.title = Species page
+search.species.view.desc = view species page
\ No newline at end of file
diff --git a/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy b/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
index 66c0df01..84e10bd7 100644
--- a/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
+++ b/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
@@ -497,7 +497,7 @@ class OccurrenceTagLib {
                     mb.tr() {
                         if (i == 0) {
                             td(class:"noStripe", rowspan:"${group.value.length()}") {
-                                b(group.key)
+                                b(g.message(code: "facet.group.${group.key}", default: "${group.key}"))
                             }
                         }
                         td(alatag.databaseFieldName(text: field.name))
diff --git a/grails-app/views/occurrence/list.gsp b/grails-app/views/occurrence/list.gsp
index 923c79b6..549f69da 100644
--- a/grails-app/views/occurrence/list.gsp
+++ b/grails-app/views/occurrence/list.gsp
@@ -341,7 +341,7 @@
                                                 <alatag:message code="dq.warning.dataprofile.content.line1" default="Search results are now filtered by default to exclude lower quality records according to the ALA General data profile. Data profiles may be disabled or other data profiles are available via the data profile drop down."></alatag:message>
                                             </p>
                                             <p>
-                                                Information on the data profiles and the filters used in each data profile is available via the <a><i class='fa fa-info-circle'></i></a> icons.
+                                                <alatag:message code="dq.warning.dataprofile.content.line2"></alatag:message>
                                             </p>
                                         </div>
                                         <div class="modal-footer">
@@ -361,7 +361,7 @@
                             <g:if test="${qualityProfiles.size() >= 1}">
                                 <span class="dropdown">
                                     <button id="profile-dropdown" type="button" class="btn btn-default btn-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Click to switch profiles">
-                                        <span id="active-profile-name">${searchRequestParams.disableAllQualityFilters ? 'Disabled' : activeProfile.name}</span>
+                                        <span id="active-profile-name">${searchRequestParams.disableAllQualityFilters ? g.message(code: 'dq.disabled', default: 'Disabled') : activeProfile.name}</span>
                                         <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu" id="profiles-selection" aria-labelledby="profile-dropdown">

From 00f263640edd802d10a071f5d09d146eaa24af34 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Mon, 7 Mar 2022 21:21:14 +0100
Subject: [PATCH 06/12] More i18n work related with dq (#536)

---
 grails-app/i18n/messages_en.properties  | 3 +++
 grails-app/views/occurrence/_facets.gsp | 2 +-
 grails-app/views/occurrence/list.gsp    | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/grails-app/i18n/messages_en.properties b/grails-app/i18n/messages_en.properties
index 9b95bc1c..a920da29 100644
--- a/grails-app/i18n/messages_en.properties
+++ b/grails-app/i18n/messages_en.properties
@@ -1195,6 +1195,9 @@ dq.userpref.defaultprofile = -- Select a profile --
 dq.data.profiles.disabled = Data profiles have been disabled for this search
 dq.warning.failedtosave = Failed to save user preferences. Please try again
 dq.disabled = Disabled
+dq.click.to.switch.profiles=Click to switch profile
+dq.click.to.disable.data.profiles = Click to disable all data profiles
+dq.click.to.enable.the.profile.quality.filter = Click to enable the {0} quality filters
 quality.filters.excludeCount = records excluded
 record.compare_table.heading = You are indicating that
 record.compare_table.source_record.heading = This record
diff --git a/grails-app/views/occurrence/_facets.gsp b/grails-app/views/occurrence/_facets.gsp
index 8470e25a..299bf5f3 100644
--- a/grails-app/views/occurrence/_facets.gsp
+++ b/grails-app/views/occurrence/_facets.gsp
@@ -41,7 +41,7 @@
                 </div>
                 <div class="facetsGroup" id="group_data_quality" style="display:none;">
 
-                    <h4><span class="FieldName">Categories</span></h4>
+                    <h4><span class="FieldName"><alatag:message code="dq.selectmultiple.categorytable.header.categories" default="Categories" /></span></h4>
                     <div class="subnavlist nano" style="clear:left">
                         <ul class="facets nano-content dq-categories">
                             <g:each var="qualityCategory" in="${qualityCategories}">
diff --git a/grails-app/views/occurrence/list.gsp b/grails-app/views/occurrence/list.gsp
index 549f69da..fb0cba3d 100644
--- a/grails-app/views/occurrence/list.gsp
+++ b/grails-app/views/occurrence/list.gsp
@@ -360,15 +360,15 @@
                             </span>
                             <g:if test="${qualityProfiles.size() >= 1}">
                                 <span class="dropdown">
-                                    <button id="profile-dropdown" type="button" class="btn btn-default btn-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Click to switch profiles">
+                                    <button id="profile-dropdown" type="button" class="btn btn-default btn-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="${message(code:"dq.click.to.switch.profiles")}">
                                         <span id="active-profile-name">${searchRequestParams.disableAllQualityFilters ? g.message(code: 'dq.disabled', default: 'Disabled') : activeProfile.name}</span>
                                         <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu" id="profiles-selection" aria-labelledby="profile-dropdown">
                                         <g:each in="${qualityProfiles}" var="profile">
-                                            <li><g:link action="${actionName}" params="${params.clone().with { if (profile.isDefault) it.remove('qualityProfile') else it.qualityProfile = profile.shortName ; it.remove('disableAllQualityFilters'); it } }" title="Click to enable the ${profile.name} quality filters">${profile.name}<g:if test="${profile.isDefault}"> (Default)</g:if></g:link></li>
+                                            <li><g:link action="${actionName}" params="${params.clone().with { if (profile.isDefault) it.remove('qualityProfile') else it.qualityProfile = profile.shortName ; it.remove('disableAllQualityFilters'); it } }" title="${g.message(code: "dq.click.to.enable.the.profile.quality.filter", default: "Click to enable the {0} quality filters", args: [profile.name])} ">${profile.name}<g:if test="${profile.isDefault}"> (Default)</g:if></g:link></li>
                                         </g:each>
-                                        <li><g:link action="${actionName}" params="${params.clone().with { it.disableAllQualityFilters = true; it } }" title="Click to disable all data profiles"><alatag:message code="dq.buttontext.disableall" default="Disable data profiles"/></g:link></li>
+                                        <li><g:link action="${actionName}" params="${params.clone().with { it.disableAllQualityFilters = true; it } }" title="${message(code:"dq.click.to.disable.data.profiles")}"><alatag:message code="dq.buttontext.disableall" default="Disable data profiles"/></g:link></li>
                                     </ul>
                                 </span>
                             </g:if>

From 45bb2ef6c53d3a2a75249834dc92fe64747656e2 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Tue, 8 Mar 2022 21:37:36 +0100
Subject: [PATCH 07/12] Fix for i18n minor issues #538

---
 grails-app/i18n/messages_en.properties    | 23 +++++++++++++++--------
 grails-app/views/home/_advanced.gsp       |  4 ++--
 grails-app/views/home/index.gsp           |  5 +++--
 grails-app/views/occurrence/_download.gsp |  3 ++-
 grails-app/views/occurrence/_map.gsp      |  7 ++++---
 grails-app/views/occurrence/list.gsp      |  3 ++-
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/grails-app/i18n/messages_en.properties b/grails-app/i18n/messages_en.properties
index a920da29..7ae31697 100644
--- a/grails-app/i18n/messages_en.properties
+++ b/grails-app/i18n/messages_en.properties
@@ -88,6 +88,7 @@ advancedsearch.table10col02.des = (YYYY-MM-DD) leave blank for most recent recor
 advancedsearch.dataset.col.label = Data Resource
 advancedsearch.dataset.select.default = -- select a Data Resource --
 advancedsearch.button.submit = Search
+advancedsearch.button.clear.all=Clear all
 home.index.taxaupload.des01 = Enter a list of taxon names/scientific names, one name per line (common names not currently supported).
 home.index.taxaupload.button01 = Search
 home.index.catalogupload.des01 = Enter a list of catalogue numbers (one number per line).
@@ -335,7 +336,10 @@ list.sandbox.reloadData.label=Reload data
 list.sandbox.reloadData.tooltip=Reload data for temporary data resource
 
 eya.title01 = Explore Your Area
-eya.title02 = Atlas of Living Australia
+# Commented because is not used now and to avoid confusion
+# eya.title02 = Atlas of Living Australia
+# See:
+# https://github.com/search?q=org%3AAtlasOfLivingAustralia+eya.title02&type=Code
 eya.breadcrumb.navigator01 = Home
 eya.breadcrumb.navigator02 = Locations
 eya.breadcrumb.navigator03 = Your Area
@@ -363,7 +367,7 @@ eya.maptips.01 = Tips
 eya.maptips.02 = you can fine-tune the location of the area by dragging the blue marker icon
 
 download.download.title = Downloads
-download.termsofusedownload.01 = By downloading this content you are agreeing to use it in accordance with the Atlas of Living Australia
+download.termsofusedownload.01.param = By downloading this content you are agreeing to use it in accordance with the {0}
 download.termsofusedownload.02 = Terms of Use
 download.termsofusedownload.03 = and any Data Provider Terms associated with the data download.
 download.termsofusedownload.04 = Please provide the following details before downloading (* required)
@@ -430,7 +434,7 @@ recordcore.div.addtionalproperties.title = Additional properties
 recordcore.occurenceevent.title = Event
 
 map.spatialportal.btn.label = View in spatial portal
-map.spatialportal.btn.title = Continue analysis in ALA Spatial Portal
+map.spatialportal.btn.title.param = Continue analysis in {0} Spatial Portal
 map.spatialportal.redirect.title = Warning
 map.spatialportal.redirect.content = Please be aware that Data Quality filters will not be applied when records are viewed in Spatial Portal.
 map.spatialportal.redirect.btn.cancel.label = Cancel
@@ -514,7 +518,10 @@ generic.navbar02.li01 = Home
 generic.navbar02.li02 = About
 generic.navbar02.li03 = Contact
 generic.footer.link01 = This site is licensed under a
-generic.footer.link02 = Creative Commons Attribution 3.0 Australia License
+# Commented because is not used now and to avoid confusion
+# generic.footer.link02 = Creative Commons Attribution 3.0 Australia License
+# See:
+# https://github.com/search?q=org%3AAtlasOfLivingAustralia+generic.footer.link02&type=code
 generic.footer.link03 = Provider content may be covered by other
 generic.footer.link04 = Terms of Use
 
@@ -1187,7 +1194,7 @@ dq.selectmultiple.form.submit = Apply
 dq.view.excluded = View excluded records
 dq.excluded.count = records are excluded by this category
 dq.warning.dataprofile.title = Results filtering with data profiles
-dq.warning.dataprofile.content.line1 = Search results are now filtered by default to exclude lower quality records according to the ALA General data profile. Data profiles may be disabled or other data profiles are available via the data profile drop down.
+dq.warning.dataprofile.content.line1.param = Search results are now filtered by default to exclude lower quality records according to the {0} General data profile. Data profiles may be disabled or other data profiles are available via the data profile drop down.
 dq.warning.dataprofile.content.line2 = Information on the data profiles and the filters used in each data profile is available via the <a><i class='fa fa-info-circle'></i></a> icons.
 dq.warning.dataprofile.buttonleft.text = Learn More
 dq.warning.dataprofile.buttonright.text = Got it
@@ -1220,9 +1227,9 @@ related.record.reason.explanation.sameoccurrence=This record is a duplicate occu
 related.record.reason.explanation.tissuesample=This record is a tissue sample of this record:
 related.record.reason.explanation.splitspecimen=This record is a split specimen of this record:
 home.index.taxaupload.batchRadioPrefix=Search on:
-home.index.taxaupload.batchMode.matched=Matched name (via the ALA taxonomy)
+home.index.taxaupload.batchMode.matched.param=Matched name (via the {0} taxonomy)
 home.index.taxaupload.batchMode.provided=Supplied name (note: is case-sensitive so genus should be capitalised)
-advanced.taxon.tooltip.matched=Input names will be matched to their accepted scientific name in the ALA taxonomy. Results will include records for known synonyms
+advanced.taxon.tooltip.matched.param=Input names will be matched to their accepted scientific name in the {0} taxonomy. Results will include records for known synonyms
 advanced.taxon.tooltip.supplied=Input names will only match the scientific name supplied in the original occurrence record. Results will NOT include records for known synonyms. Note: searching is case sensitive.
 search.species.view.title = Species page
-search.species.view.desc = view species page
\ No newline at end of file
+search.species.view.desc = view species page
diff --git a/grails-app/views/home/_advanced.gsp b/grails-app/views/home/_advanced.gsp
index 7873ea4c..a208db51 100644
--- a/grails-app/views/home/_advanced.gsp
+++ b/grails-app/views/home/_advanced.gsp
@@ -218,9 +218,9 @@
         </div>
     </div>
 
-    <input type="submit" value=<g:message code="advancedsearch.button.submit" default="Search"/> class="btn btn-primary" />
+    <input type="submit" value="<g:message code="advancedsearch.button.submit" default="Search"/>" class="btn btn-primary" />
     &nbsp;&nbsp;
-    <input type="reset" value="Clear all" id="clearAll" class="btn btn-default" onclick="$('input#solrQuery').val(''); $('input.clear_taxon').click(); return true;"/>
+    <input type="reset" value="<g:message code="advancedsearch.button.clear.all" default="Clear all"/>" id="clearAll" class="btn btn-default" onclick="$('input#solrQuery').val(''); $('input.clear_taxon').click(); return true;"/>
 </form>
 <asset:script type="text/javascript">
     $(document).ready(function() {
diff --git a/grails-app/views/home/index.gsp b/grails-app/views/home/index.gsp
index 187871b4..879b4b71 100644
--- a/grails-app/views/home/index.gsp
+++ b/grails-app/views/home/index.gsp
@@ -10,6 +10,7 @@
 <g:set var="biocacheServiceUrl" value="${grailsApplication.config.biocache.baseUrl}"/>
 <g:set var="serverName" value="${grailsApplication.config.serverName ?: grailsApplication.config.biocache.baseUrl}"/>
 <g:set var="biocacheServiceUrl" value="${alatag.getBiocacheAjaxUrl()}"/>
+<g:set var="shortName" value="${grailsApplication.config.skin.orgNameShort}"/>
 <!DOCTYPE html>
 <html>
 <head>
@@ -368,13 +369,13 @@
                                                 <g:message code="home.index.taxaupload.batchRadioPrefix" default="Search on:"/>
                                             </div>
                                         </div>
-                                        <g:set var="matchedTaxonTooltip" value="${g.message(code:"advanced.taxon.tooltip.matched",default:"N/A")}"/>
+                                        <g:set var="matchedTaxonTooltip" value="${g.message(code:"advanced.taxon.tooltip.matched.param",default:"N/A", args:[shortName])}" />
                                         <g:set var="suppliedTaxonTooltip" value="${g.message(code:"advanced.taxon.tooltip.supplied",default:"N/A")}"/>
                                         <div class="col-sm-10">
                                             <div class="radio ">
                                                 <label>
                                                     <input type="radio" name="field" id="batchModeMatched" value="taxa" checked>
-                                                    <g:message code="home.index.taxaupload.batchMode.matched" default="Matched name"/>
+                                                    <g:message code="home.index.taxaupload.batchMode.matched.param" default="Matched name" args="${[shortName]}" />
                                                 </label>
                                                 <a href="#" data-toggle="tooltip" data-placement="right" title="${matchedTaxonTooltip}"><i class="glyphicon glyphicon-question-sign"></i></a>
                                             </div>
diff --git a/grails-app/views/occurrence/_download.gsp b/grails-app/views/occurrence/_download.gsp
index 168c8b96..7fb3a203 100644
--- a/grails-app/views/occurrence/_download.gsp
+++ b/grails-app/views/occurrence/_download.gsp
@@ -5,6 +5,7 @@
 --%>
 <!-- download modal form - used for old style downloads -->
 <g:set var="biocacheServiceUrl" value="${alatag.getBiocacheAjaxUrl()}"/>
+<g:set var="orgNameLong" value="${grailsApplication.config.skin.orgNameLong}"/>
 
 <div id="downloadModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="downloadModalLabel">
     <div class="modal-dialog" role="document">
@@ -16,7 +17,7 @@
                 </div>
                 <div class="modal-body">
                     <p id="termsOfUseDownload">
-                        <g:message code="download.termsofusedownload.01" default="By downloading this content you are agreeing to use it in accordance with the Atlas of Living Australia"/>
+                        <g:message code="download.termsofusedownload.01.param" args="${[orgNameLong]}" default="By downloading this content you are agreeing to use it in accordance with the {0}"/>
                         <a href="http://www.ala.org.au/about/terms-of-use/#TOUusingcontent"><g:message code="download.termsofusedownload.02" default="Terms of Use"/></a>
                         <g:message code="download.termsofusedownload.03" default="and any Data Provider Terms associated with the data download."/>
                         <br/><br/>
diff --git a/grails-app/views/occurrence/_map.gsp b/grails-app/views/occurrence/_map.gsp
index d5aa9c5f..1b4f203b 100644
--- a/grails-app/views/occurrence/_map.gsp
+++ b/grails-app/views/occurrence/_map.gsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <asset:stylesheet src="map.css"/>
+<g:set var="shortName" value="${grailsApplication.config.skin.orgNameShort}"/>
 <div style="margin-bottom: 10px">
     <g:if test="${grailsApplication.config.skin.useAlaSpatialPortal?.toBoolean()}">
         <g:set var='spatialPortalLink' value="${sr.urlParameters}"/>
@@ -7,11 +8,11 @@
         <g:set var='spatialEnableQualityWarning' value="${grailsApplication.config.getProperty('spatial.enableQualityWarning', Boolean, false)}" />
         <g:if test="${!spatialEnableQualityWarning || searchRequestParams.disableAllQualityFilters || qualityFiltersByLabel.isEmpty()}">
             <a id="spatialPortalLink" class="btn btn-default btn-sm tooltips"
-               href="${grailsApplication.config.spatial.baseUrl}${spatialPortalLink}${spatialPortalUrlParams}" title="<g:message code="map.spatialportal.btn.title"/>">
+               href="${grailsApplication.config.spatial.baseUrl}${spatialPortalLink}${spatialPortalUrlParams}" title="<g:message code="map.spatialportal.btn.title.param" args="${[shortName]}"/>">
                 <i class="fa fa-map-marker"></i>&nbsp;&nbsp;<g:message code="map.spatialportal.btn.label" default="View in spatial portal"/></a>
         </g:if>
         <g:else>
-            <a href="#gotoSpatial" role="button" data-toggle="modal" class="btn btn-default btn-sm tooltips" title="<g:message code="map.spatialportal.btn.title"/>">
+            <a href="#gotoSpatial" role="button" data-toggle="modal" class="btn btn-default btn-sm tooltips" title="<g:message code="map.spatialportal.btn.title.param" args="${[shortName]}"/>">
                 <i class="fa fa-map-marker"></i>&nbsp;&nbsp;<g:message code="map.spatialportal.btn.label" default="View in spatial portal"/></a>
         </g:else>
     </g:if>
@@ -745,7 +746,7 @@
             </div>
             <div class="modal-footer">
                 <button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><g:message code="map.spatialportal.redirect.btn.cancel.label" default="Cancel"/></button>
-                <a class="btn btn-primary" href="${grailsApplication.config.spatial.baseUrl}${spatialPortalLink}${spatialPortalUrlParams}" title="<g:message code="map.spatialportal.btn.title"/>"><g:message code="map.spatialportal.redirect.btn.ok.label" default="Go to Spatial Portal"/></a>
+                <a class="btn btn-primary" href="${grailsApplication.config.spatial.baseUrl}${spatialPortalLink}${spatialPortalUrlParams}" title="<g:message code="map.spatialportal.btn.title.param" args="${[shortName]}"/>"><g:message code="map.spatialportal.redirect.btn.ok.label" default="Go to Spatial Portal"/></a>
             </div>
         </div>
     </div>
diff --git a/grails-app/views/occurrence/list.gsp b/grails-app/views/occurrence/list.gsp
index fb0cba3d..5401e80b 100644
--- a/grails-app/views/occurrence/list.gsp
+++ b/grails-app/views/occurrence/list.gsp
@@ -9,6 +9,7 @@
 <g:set var="startPageTime" value="${System.currentTimeMillis()}"/>
 <g:set var="queryDisplay" value="${sr?.queryTitle ?: searchRequestParams?.displayString ?: ''}"/>
 <g:set var="authService" bean="authService"></g:set>
+<g:set var="orgNameShort" value="${grailsApplication.config.skin.orgNameShort}"/>
 <!DOCTYPE html>
 <html>
 <head>
@@ -338,7 +339,7 @@
                                         </div>
                                         <div class="modal-body">
                                             <p>
-                                                <alatag:message code="dq.warning.dataprofile.content.line1" default="Search results are now filtered by default to exclude lower quality records according to the ALA General data profile. Data profiles may be disabled or other data profiles are available via the data profile drop down."></alatag:message>
+                                                <g:message code="dq.warning.dataprofile.content.line1.param" args="${[orgNameShort]}" default="Search results are now filtered by default to exclude lower quality records according to the {0} General data profile. Data profiles may be disabled or other data profiles are available via the data profile drop down."></g:message>
                                             </p>
                                             <p>
                                                 <alatag:message code="dq.warning.dataprofile.content.line2"></alatag:message>

From 8b7a07c7e6b419ddd618ba93a5804ed25d5c3f55 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Wed, 9 Mar 2022 11:50:02 +0100
Subject: [PATCH 08/12] Facet items translations fix for some groups like
 taxonomic_issue

---
 .../taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy b/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
index 672c9e1c..85449c42 100644
--- a/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
+++ b/grails-app/taglib/au/org/ala/biocache/hubs/OccurrenceTagLib.groovy
@@ -299,7 +299,11 @@ class OccurrenceTagLib {
                                     mkp.yieldUnescaped("&nbsp;")
                                 }
                                 span(class: "facet-item") {
-                                    if (fieldResult.i18nCode) {
+                                    // If we have a translation, we use it, if not we try to use the label translation
+                                    // and if not, directly use the label. If the label is missing, use "unknown"
+                                    // In search.js this is done a bit differently:
+                                    // https://github.com/AtlasOfLivingAustralia/biocache-hubs/blob/00f263640edd802d10a071f5d09d146eaa24af34/grails-app/assets/javascripts/search.js#L1946
+                                    if (fieldResult.i18nCode && alatag.message(code: fieldResult.i18nCode) != fieldResult.i18nCode ) {
                                         mkp.yield(alatag.message(code: fieldResult.i18nCode, default: fieldResult.label))
                                     } else {
                                         mkp.yield(alatag.message(code: fieldResult.label ?: 'unknown', default: fieldResult.label))

From 82a801101605a47f18d691f565a52ca78e7d7f75 Mon Sep 17 00:00:00 2001
From: brucehyslop <bruce.hyslop@csiro.au>
Date: Thu, 24 Mar 2022 15:19:23 +1100
Subject: [PATCH 09/12] Update .travis.yml

bumped jdk version to 11
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d9b8d811..858ea075 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: groovy
 jdk:
-- openjdk8
+- openjdk11
 sudo: false
 branches:
   only:

From 645ea2af87591641be0898d6d3c7119a6a801fdf Mon Sep 17 00:00:00 2001
From: brucehyslop <bruce.hyslop@csiro.au>
Date: Thu, 24 Mar 2022 15:46:25 +1100
Subject: [PATCH 10/12] Update .travis.yml

revert jdk update (wrong branch)
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 858ea075..d9b8d811 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: groovy
 jdk:
-- openjdk11
+- openjdk8
 sudo: false
 branches:
   only:

From abec3f0538cd03e9eaea5a96ada6b762cdbec538 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Thu, 31 Mar 2022 13:26:59 +0200
Subject: [PATCH 11/12] Update charts plugin with i18n support (#542)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index cd93246e..f79fff41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,7 +88,7 @@ dependencies {
 
     if(!inplace) {
         compile "au.org.ala.plugins.grails:images-client-plugin:1.2", noCache
-        compile "au.org.ala.plugins.grails:ala-charts-plugin:2.0.1", noCache
+        compile "au.org.ala.plugins.grails:ala-charts-plugin:2.1.2", noCache
     }
 
 }

From 05b393ba5a5c6a8b070749cd0011a1baaa21e73c Mon Sep 17 00:00:00 2001
From: Nick dos Remedios <nick.dosremedios@csiro.au>
Date: Fri, 1 Apr 2022 16:28:34 +1100
Subject: [PATCH 12/12] Version 3.0.10

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f79fff41..201c9b61 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 }
 
-version "3.0.10-SNAPSHOT"
+version "3.0.10"
 group "au.org.ala.plugins.grails"
 
 apply plugin:"eclipse"