Merge pull request #312 from charvolant/develop

Bump development version

README.md

@@ -1,4 +1,4 @@
-# bie-index [![Build Status](https://travis-ci.org/AtlasOfLivingAustralia/bie-index.svg?branch=master)](https://travis-ci.org/AtlasOfLivingAustralia/bie-index)
+# bie-index [![Build Status](https://travis-ci.com/AtlasOfLivingAustralia/bie-index.svg?branch=master)](https://travis-ci.com/AtlasOfLivingAustralia/bie-index)
 
 bie-index is a grails web application that indexes taxonomic content in DwC-A and provides search web services for this content.
 This includes:

build.gradle

@@ -11,7 +11,7 @@ buildscript {
     }
 }
 
-version "1.4.12-SNAPSHOT"
+version "1.4.13-SNAPSHOT"
 group "au.org.ala"
 
 apply plugin:"eclipse"
@@ -72,8 +72,8 @@ dependencies {
     compile "org.jsoup:jsoup:1.8.3"
     compile 'org.grails.plugins:external-config:1.1.1'
 
-    compile group: 'org.grails.plugins', name: 'ala-bootstrap3', version: '3.0.6'
-    compile(group: 'org.grails.plugins', name: 'ala-auth', version:'3.1.0') {
+    compile group: 'org.grails.plugins', name: 'ala-bootstrap3', version: '3.2.3'
+    compile(group: 'org.grails.plugins', name: 'ala-auth', version:'3.1.3') {
         exclude group: 'javax.servlet', module: 'servlet-api'
     }
     compile group: 'org.grails.plugins', name: 'ala-admin-plugin', version: '2.1'

doc/nameology/apni.md

@@ -42,10 +42,8 @@ The names file contains the following:
 Some names in APNI have not yet been placed in the APC.
 These orphan names are treated as inferred accepted taxa and placed under Plantae; 
 we at least know which kingdom they come from.
-Names that have been placed in the APC are given a different dataset identifier to those names
-that are only in APNI.
-
-It is theoretically possible to use the higher taxonomy in the names data to provide placement
-for APNI-only names and allow [merging](merging.md) to correctly link these names to parent taxa.
-This is not currently done.
+These are produced as a separate DwCA with a slightly different structure, containing
+kingdom, phylum, class, order, family and genus names.
+The name information generally contains genus and family.
+[Merging](merging.md) can use this structural information to partially place the resulting names.
 

grails-app/i18n/messages.properties

@@ -76,7 +76,7 @@ download.rk_order=order
 download.rk_superorder=superorder
 download.rk_subclass=subclass
 download.rk_class=class
-download.rk_superclass=suprclass
+download.rk_superclass=superclass
 download.rk_subphylum=subphylum
 download.rk_phylum=phylum
 download.rk_subkingdom=subkingdom

grails-app/i18n/messages_ca.properties

@@ -76,7 +76,7 @@ download.rk_order=ordre
 download.rk_superorder=superordre
 download.rk_subclass=subclasse
 download.rk_class=classe
-download.rk_superclass=suprclass
+download.rk_superclass=superclass
 download.rk_subphylum=subfílum
 download.rk_phylum=fílum
 download.rk_subkingdom=subregne

grails-app/init/bie/index/BootStrap.groovy

@@ -1,8 +1,15 @@
 package bie.index
 
 class BootStrap {
+    def messageSource
 
     def init = { servletContext ->
+        messageSource.setBasenames(
+                "file:///var/opt/atlas/i18n/bie-index/messages",
+                "file:///opt/atlas/i18n/bie-index/messages",
+                "WEB-INF/grails-app/i18n/messages",
+                "classpath:messages"
+        )
     }
     def destroy = {
     }