fix: broken js on page prevents working developer panel

* Update version numbers in pom.xmls

* Restore -SNAPSHOT

.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: Build
+
+on: [ push, pull_request, workflow_dispatch ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    env:
+      MAVEN_OPTS: -Xmx1024M
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Maven Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-cache-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-cache-m2-
+
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Maven Build
+        run: mvn clean install

.travis.yml

@@ -1,22 +0,0 @@
-language: java
-dist: trusty
-sudo: false
-
-jdk:
-  - openjdk8
-  - oraclejdk8
-
-env:
-  # Give Maven 1GB of memory to work with
-  - MAVEN_OPTS=-Xmx1024M
-
-cache:
-  directories:
-  - .autoconf
-  - $HOME/.m2
-
-install:
-  - "echo 'Skipping install stage, dependencies will be downloaded during build and test stages.'"
-
-script:
-  - "mvn clean package -Dmaven.test.skip=false"

README.md

@@ -1,6 +1,6 @@
 # What is Vitro?
 
-[![Build Status](https://travis-ci.org/vivo-project/Vitro.png?branch=develop)](https://travis-ci.org/vivo-project/Vitro)
+[![Build](https://github.com/vivo-project/Vitro/workflows/Build/badge.svg)](https://github.com/vivo-project/Vitro/actions?query=workflow%3ABuild)
 
 Vitro is a general-purpose web-based ontology and instance editor with customizable public browsing. 
 

api/pom.xml

@@ -7,13 +7,13 @@
 
     <groupId>org.vivoweb</groupId>
     <artifactId>vitro-api</artifactId>
-    <version>1.11.2-SNAPSHOT</version>
+    <version>1.12.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.vivoweb</groupId>
         <artifactId>vitro-project</artifactId>
-        <version>1.11.2-SNAPSHOT</version>
+        <version>1.12.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.vivoweb</groupId>
             <artifactId>vitro-dependencies</artifactId>
-            <version>1.11.2-SNAPSHOT</version>
+            <version>1.12.0-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
         <dependency>

api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationSetup.java

@@ -62,6 +62,7 @@ public class ApplicationSetup implements ServletContextListener {
 
 	private void locateApplicationConfigFile() {
 		Path path = this.vitroHomeDir.getPath().resolve(APPLICATION_SETUP_PATH);
+
 		if (!Files.exists(path)) {
 			throw new IllegalStateException("'" + path + "' does not exist.");
 		}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java

@@ -37,7 +37,14 @@ public class RootUserPolicy implements PolicyIface {
 	private static final Log log = LogFactory.getLog(RootUserPolicy.class);
 
 	private static final String PROPERTY_ROOT_USER_EMAIL = "rootUser.emailAddress";
+	/*
+	 * UQAM Add-Feature For parameterization of rootUser
+	 */
+	private static final String PROPERTY_ROOT_USER_PASSWORD = "rootUser.password";
+	private static final String PROPERTY_ROOT_USER_PASSWORD_CHANGE_REQUIRED = "rootUser.passwordChangeRequired";
+
 	private static final String ROOT_USER_INITIAL_PASSWORD = "rootPassword";
+	private static final String ROOT_USER_INITIAL_PASSWORD_CHANGE_REQUIRED = "true";
 
 	/**
 	 * This is the entire policy. If you are a root user, you are authorized.
@@ -150,10 +157,12 @@ public class RootUserPolicy implements PolicyIface {
 			ua.setEmailAddress(configuredRootUser);
 			ua.setFirstName("root");
 			ua.setLastName("user");
+			// UQAM Add-Feature using getRootPasswordFromConfig()
 			ua.setArgon2Password(Authenticator.applyArgon2iEncoding(
-					ROOT_USER_INITIAL_PASSWORD));
+					getRootPasswordFromConfig()));
 			ua.setMd5Password("");
-			ua.setPasswordChangeRequired(true);
+			// UQAM Add-Feature using getRootPasswdChangeRequiredFromConfig()
+			ua.setPasswordChangeRequired(getRootPasswdChangeRequiredFromConfig().booleanValue());
 			ua.setStatus(Status.ACTIVE);
 			ua.setRootUser(true);
 
@@ -191,7 +200,31 @@ public class RootUserPolicy implements PolicyIface {
 			ss.warning(this, "For security, "
 					+ "it is best to delete unneeded root user accounts.");
 		}
+		/*
+		 * UQAM Add-Feature
+		 * Add for getting rootUser.password property value from runtime.properties
+		 */
+		private String getRootPasswordFromConfig() {
+			String passwd = ConfigurationProperties.getBean(ctx).getProperty(
+					PROPERTY_ROOT_USER_PASSWORD);
+			if (passwd == null) {
+				passwd = ROOT_USER_INITIAL_PASSWORD;
+			}
+			return passwd;
+		}
 
+		/*
+		 * UQAM Add-Feature
+		 * Add for getting rootUser.passwordChangeRequired  property value  from runtime.properties
+		 */
+		private Boolean getRootPasswdChangeRequiredFromConfig() {
+			String passwdCR = ConfigurationProperties.getBean(ctx).getProperty(
+					PROPERTY_ROOT_USER_PASSWORD_CHANGE_REQUIRED);
+			if (passwdCR == null) {
+				passwdCR = ROOT_USER_INITIAL_PASSWORD_CHANGE_REQUIRED;
+			}
+			return new Boolean(passwdCR);
+		}
 		@Override
 		public void contextDestroyed(ServletContextEvent sce) {
 			// Nothing to destroy

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java

@@ -20,6 +20,7 @@ public class ApplicationBean {
     public final static int      VIVO_SEARCHBOX_SIZE         = 20;
 
     private final static String  DEFAULT_APPLICATION_NAME     = "Vitro";
+    private final static String  DEFAULT_APPLICATION_AVAILABLE_LANGS_FILE = "available-langs";
     private final static String  DEFAULT_ROOT_LOGOTYPE_IMAGE  = "";
     private final static int     DEFAULT_ROOT_LOGOTYPE_WIDTH  = 0;
     private final static int     DEFAULT_ROOT_LOGOTYPE_HEIGHT = 0;
@@ -33,6 +34,7 @@ public class ApplicationBean {
     private boolean   initialized             = false;
     private String    sessionIdStr            = null;
     private String    applicationName         = DEFAULT_APPLICATION_NAME;
+    private String    availableLangsFile      = DEFAULT_APPLICATION_AVAILABLE_LANGS_FILE;
 
     private String    rootLogotypeImage       = DEFAULT_ROOT_LOGOTYPE_IMAGE;
     private int       rootLogotypeWidth       = DEFAULT_ROOT_LOGOTYPE_WIDTH;
@@ -52,6 +54,7 @@ public class ApplicationBean {
         output += "  initialized from DB:    [" + initialized             + "]\n";
         output += "  session id:             [" + sessionIdStr            + "]\n";
         output += "  application name:       [" + applicationName         + "]\n";
+        output += "  available langs file:   [" + availableLangsFile      + "]\n";
         output += "  root logotype image:    [" + rootLogotypeImage       + "]\n";
         output += "  root logotype width:    [" + rootLogotypeWidth       + "]\n";
         output += "  root logotype height:   [" + rootLogotypeHeight      + "]\n";
@@ -177,6 +180,10 @@ public class ApplicationBean {
     	return "";
     }
 
+    public String getAvailableLangsFile() {
+        return availableLangsFile;
+    }
+
     /**
      * Directory to find the images.  Subdirectories include css, jsp and site_icons.
      * Example: "themes/enhanced/"

api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java

@@ -109,7 +109,7 @@ public abstract class ConfigurationProperties {
 			throw new NullPointerException("bean may not be null.");
 		}
 		context.setAttribute(ATTRIBUTE_NAME, bean);
-		log.info(bean);
+		log.debug(bean);
 	}
 
 	/** Package access, so unit tests can call it. */

api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSetup.java

@@ -73,7 +73,7 @@ public class ConfigurationPropertiesSetup implements ServletContextListener {
 						vitroHomeDir, vitroHomeDirConfig);
 
 				File runtimePropertiesFile = locateRuntimePropertiesFile(
-						vitroHomeDir, vitroHomeDirConfig, ss);
+					vitroHomeDir, vitroHomeDirConfig, ss);
 				stream = new FileInputStream(runtimePropertiesFile);
 
 				Map<String, String> preempts = createPreemptiveProperties(
@@ -118,7 +118,6 @@ public class ConfigurationPropertiesSetup implements ServletContextListener {
 		}
 	}
 
-
 	private File locateRuntimePropertiesFile(File vitroHomeDir,
 			File vitroHomeDirConfig, StartupStatus ss) {
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java

@@ -17,6 +17,8 @@ import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -75,8 +77,8 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
 	private static final String[] SAMPLE_QUERY = { //
 			"", //
 			"#", //
-			"# This example query gets 20 geographic locations", //
+			"i18n:sparql_query_description_0", //
-			"# and (if available) their labels", //
+			"i18n:sparql_query_description_1", //
 			"#", //
 			"SELECT ?geoLocation ?label", //
 			"WHERE", //
@@ -193,9 +195,11 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
 
 	@Override
 	protected ResponseValues processRequest(VitroRequest vreq) throws Exception {
+		I18nBundle i18n = I18n.bundle(vreq);
+
 		Map<String, Object> bodyMap = new HashMap<>();
-		bodyMap.put("sampleQuery", buildSampleQuery(buildPrefixList(vreq)));
+		bodyMap.put("sampleQuery", buildSampleQuery(i18n, buildPrefixList(vreq)));
-		bodyMap.put("title", "SPARQL Query");
+		bodyMap.put("title", i18n.text("sparql_query_title"));
 		bodyMap.put("submitUrl", UrlBuilder.getUrl("admin/sparqlquery"));
 		return new TemplateResponseValues(TEMPLATE_NAME, bodyMap);
 	}
@@ -222,7 +226,7 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
 		return prefixList;
 	}
 
-	private String buildSampleQuery(List<Prefix> prefixList) {
+	private String buildSampleQuery(I18nBundle i18n, List<Prefix> prefixList) {
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
 
@@ -230,6 +234,10 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
 			writer.println(p);
 		}
 		for (String line : SAMPLE_QUERY) {
+			if (line.startsWith("i18n:")) {
+			    // Get i18n translation
+				line =  i18n.text(line.substring("i18n:".length()));
+			}
 			writer.println(line);
 		}
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java

@@ -108,7 +108,9 @@ public class LoginRedirector {
 			throws IOException {
 		try {
 			DisplayMessage.setMessage(request, assembleWelcomeMessage());
-			response.sendRedirect(getRedirectionUriForLoggedInUser());
+			String redirectUrl = getRedirectionUriForLoggedInUser();
+			log.debug("Sending redirect to path: " + redirectUrl);
+			response.sendRedirect(redirectUrl);
 		} catch (IOException e) {
 			log.debug("Problem with re-direction", e);
 			response.sendRedirect(getApplicationHomePageUrl());
@@ -175,21 +177,13 @@ public class LoginRedirector {
 		}
 	}
 
-	/**
-	 * The application home page can be overridden by an attribute in the
-	 * ServletContext. Further, it can either be an absolute URL, or it can be
-	 * relative to the application. Weird.
-	 */
 	private String getApplicationHomePageUrl() {
-		String contextRedirect = (String) session.getServletContext()
+		String contextPath = request.getContextPath();
-				.getAttribute("postLoginRequest");
+		if (contextPath.equals("")) {
-		if (contextRedirect != null) {
+			return "/";
-			if (contextRedirect.indexOf(":") == -1) {
+		}
-				return request.getContextPath() + contextRedirect;
+		else {
-			} else {
+			return contextPath;
-				return contextRedirect;
-			}
 		}
-		return request.getContextPath();
 	}
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java

@@ -43,7 +43,7 @@ public class Classes2ClassesRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        VClassDao vcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getVClassDao();
+        VClassDao vcDao = ModelAccess.on(request).getWebappDaoFactory().getVClassDao();
         epo.setDataAccessObject(vcDao);
         Classes2Classes objectForEditing = new Classes2Classes();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java

@@ -51,8 +51,7 @@ public class ClassgroupRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        VClassGroupDao cgDao = ModelAccess.on(
+        VClassGroupDao cgDao = ModelAccess.on(request).getWebappDaoFactory().getVClassGroupDao();
-                getServletContext()).getWebappDaoFactory().getVClassGroupDao();
 
         epo.setDataAccessObject(cgDao);
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java

@@ -50,11 +50,12 @@ public class DatapropRetryController extends BaseEditController {
 
         //create an EditProcessObject for this and put it in the session
         EditProcessObject epo = super.createEpo(request);
+        epo.setImplementationClass(DataProperty.class);
         epo.setBeanClass(DataProperty.class);
 
         VitroRequest vreq = new VitroRequest(request);
 
-        WebappDaoFactory wadf = ModelAccess.on(getServletContext()).getWebappDaoFactory();
+        WebappDaoFactory wadf = ModelAccess.on(vreq).getWebappDaoFactory();
 
         DatatypeDao dDao = wadf.getDatatypeDao();
         DataPropertyDao dpDao = wadf.getDataPropertyDao();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java

@@ -106,7 +106,7 @@ public class FauxPropertyRetryController extends BaseEditController {
 
 			this.epo = epo;
 
-			this.fpDao = ModelAccess.on(ctx).getWebappDaoFactory()
+			this.fpDao = ModelAccess.on(req).getWebappDaoFactory()
 					.getFauxPropertyDao();
 
 		}
@@ -114,6 +114,8 @@ public class FauxPropertyRetryController extends BaseEditController {
 		void populate() {
 			epo.setDataAccessObject(fpDao);
 			epo.setAction(determineAction());
+			epo.setImplementationClass(FauxProperty.class);
+			epo.setBeanClass(FauxProperty.class);
 
 			if (epo.getUseRecycledBean()) {
 				beanForEditing = (FauxProperty) epo.getNewBean();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java

@@ -71,7 +71,7 @@ public class NamespacePrefixOperationController extends BaseEditController {
 
         if (request.getParameter("_cancel") == null) {
 
-    		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
+    		OntModel ontModel = ModelAccess.on(req).getOntModel();
         	String namespaceStr = request.getParameter("namespace");
         	String prefixStr = request.getParameter("prefix");
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java

@@ -51,7 +51,7 @@ public class PropertyGroupRetryController extends BaseEditController {
         }
 
         PropertyGroupDao pgDao = ModelAccess.on(
-                getServletContext()).getWebappDaoFactory().getPropertyGroupDao();
+                req).getWebappDaoFactory().getPropertyGroupDao();
 
         epo.setDataAccessObject(pgDao);
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java

@@ -53,6 +53,7 @@ public class PropertyRetryController extends BaseEditController {
 
         /*for testing*/
         ObjectProperty testMask = new ObjectProperty();
+        epo.setImplementationClass(ObjectProperty.class);
         epo.setBeanClass(ObjectProperty.class);
         epo.setBeanMask(testMask);
 
@@ -64,7 +65,7 @@ public class PropertyRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        ObjectPropertyDao propDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getObjectPropertyDao();
+        ObjectPropertyDao propDao = ModelAccess.on(req).getWebappDaoFactory().getObjectPropertyDao();
         epo.setDataAccessObject(propDao);
         OntologyDao ontDao = request.getUnfilteredWebappDaoFactory().getOntologyDao();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java

@@ -48,7 +48,7 @@ public class RestrictionOperationController extends BaseEditController {
 		String defaultLandingPage = getDefaultLandingPage(request);
 
 	    try {
-			OntModel ontModel = ModelAccess.on(getServletContext())
+			OntModel ontModel = ModelAccess.on(req)
 					.getOntModel(TBOX_ASSERTIONS);
 
             HashMap epoHash = null;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java

@@ -48,7 +48,7 @@ public class VclassEditController extends BaseEditController {
         EditProcessObject epo = super.createEpo(request, FORCE_NEW);
         request.setAttribute("epoKey", epo.getKey());
 
-        VClassDao vcwDao = ModelAccess.on(getServletContext()).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
+        VClassDao vcwDao = ModelAccess.on(req).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
         VClass vcl = (VClass)vcwDao.getVClassByURI(request.getParameter("uri"));
 
         if (vcl == null) {
@@ -152,8 +152,8 @@ public class VclassEditController extends BaseEditController {
         request.setAttribute("formSelect",formSelect);
 
         // if supported, we want to show only the asserted superclasses and subclasses.
-        VClassDao vcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
+        VClassDao vcDao = ModelAccess.on(req).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
-        VClassDao displayVcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getVClassDao();
+        VClassDao displayVcDao = ModelAccess.on(req).getWebappDaoFactory().getVClassDao();
 
         List<VClass> superVClasses = getVClassesForURIList(
                 vcDao.getSuperClassURIs(vcl.getURI(),false), displayVcDao);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java

@@ -66,11 +66,10 @@ public class VclassRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        WebappDaoFactory wadf = ModelAccess.on(getServletContext()).getWebappDaoFactory();
+        WebappDaoFactory wadf = ModelAccess.on(req).getWebappDaoFactory();
 
         VClassDao vcwDao = wadf.getVClassDao();
         epo.setDataAccessObject(vcwDao);
-        VClassGroupDao cgDao = wadf.getVClassGroupDao();
         OntologyDao oDao = wadf.getOntologyDao();
 
         VClass vclassForEditing = null;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java

@@ -37,7 +37,7 @@ public class NamespacesListingController extends BaseEditController {
 
         VitroRequest vrequest = new VitroRequest(request);
 
-		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
+		OntModel ontModel = ModelAccess.on(vrequest).getOntModel();
 
         ArrayList results = new ArrayList();
         request.setAttribute("results",results);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java

@@ -54,7 +54,7 @@ public class RestrictionsListingController extends BaseEditController {
 
         epo = super.createEpo(request);
 
-		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
+		OntModel ontModel = ModelAccess.on(vrequest).getOntModel();
 
         ObjectPropertyDao opDao = vrequest.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
         VClassDao vcDao = vrequest.getUnfilteredWebappDaoFactory().getVClassDao();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java

@@ -3,6 +3,8 @@
 package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,6 +44,8 @@ public class BrowseController extends FreemarkerHttpServlet {
         List<VClassGroup> groups = null;
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
         groups =vcgc.getGroups();
+        Collections.sort(groups, publicNameComparator);
+//        sortGroupListByPublicName(groups);
         List<VClassGroupTemplateModel> vcgroups = new ArrayList<VClassGroupTemplateModel>(groups.size());
         for (VClassGroup group : groups) {
             vcgroups.add(new VClassGroupTemplateModel(group));
@@ -50,4 +54,35 @@ public class BrowseController extends FreemarkerHttpServlet {
 
         return new TemplateResponseValues(templateName, body);
     }
+    public Comparator<VClassGroup> publicNameComparator = new Comparator<VClassGroup>() {
+
+    	public int compare(VClassGroup s1, VClassGroup s2) {
+    	   String groupName1 = s1.getPublicName().toUpperCase();
+    	   String groupName2 = s2.getPublicName().toUpperCase();
+
+    	   //ascending order
+    	   return groupName1.compareTo(groupName2);
+
+    	   //descending order
+    	   //return groupName2.compareTo(groupName1);
+        }};
+
+//
+//    public void sortGroupListByPublicName(List<VClassGroup> groupList) {
+//        groupList.sort(new Comparator<VClassGroup>() {
+//            public int compare(VClassGroup first, VClassGroup second) {
+//                if (first != null) {
+//                    if (second != null) {
+//                        return (first.getDisplayRank() - second.getDisplayRank());
+//                    } else {
+//                        log.error("error--2nd VClassGroup is null in VClassGroupDao.getGroupList().compare()");
+//                    }
+//                } else {
+//                    log.error("error--1st VClassGroup is null in VClassGroupDao.getGroupList().compare()");
+//                }
+//                return 0;
+//            }
+//        });
+//    }
+
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeleteIndividualController.java

@@ -1,201 +0,0 @@
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.QuerySolutionMap;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.event.BulkUpdateEvent;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
-
-@WebServlet(name="DeleteIndividualController",urlPatterns="/deleteIndividualController")
-public class DeleteIndividualController extends FreemarkerHttpServlet{
-	
-	private static final Log log = LogFactory.getLog(DeleteIndividualController.class);
-  private static final boolean BEGIN = true;
-  private static final boolean END = !BEGIN;
-	
-	private static String TYPE_QUERY_START = ""
-      + "PREFIX vitro:    <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>"
-      + "SELECT ?type "
-      + "WHERE"
-      + "{ <";
-	private static String TYPE_QUERY_END = "> vitro:mostSpecificType ?type ." 
-      +	"}";
-	private static String queryForDeleteQuery = 
- 		    "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
-        "SELECT ?deleteQueryText WHERE { ?associatedURI display:hasDeleteQuery ?deleteQueryText }";
-
-	private static final String DEFAULT_DELETE_QUERY_TEXT = "DESCRIBE ?individualURI";
-	
-	@Override
-	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
-		return SimplePermission.DO_FRONT_END_EDITING.ACTION;
-	}
-	
-	protected ResponseValues processRequest(VitroRequest vreq) {
-		String errorMessage = handleErrors(vreq);
-		if (!errorMessage.isEmpty()) {
-			return prepareErrorMessage(errorMessage);
-		}
-	  String individualUri = vreq.getParameter("individualUri");
-	  String type = getObjectMostSpecificType(individualUri, vreq);
-	  Model displayModel = vreq.getDisplayModel();
-	  
-	  String delteQueryText = getDeleteQueryForType(type, displayModel);
-	  byte[] toRemove = getIndividualsToDelete(individualUri, delteQueryText, vreq);
-	  if (toRemove.length > 0) {
-	  	deleteIndividuals(toRemove,vreq);	
-	  }
-		String redirectUrl = getRedirectUrl(vreq);
-		
-		return new RedirectResponseValues(redirectUrl, HttpServletResponse.SC_SEE_OTHER);
-	}
-	
-	private String getRedirectUrl(VitroRequest vreq) {
-		String redirectUrl = vreq.getParameter("redirectUrl");
-		if (redirectUrl != null) {
-			return redirectUrl;
-		}
-		return "/";
-	}
-
-
-	private TemplateResponseValues prepareErrorMessage(String errorMessage) {
-		HashMap<String,Object> map = new HashMap<String,Object>();
-	   	map.put("errorMessage", errorMessage);
-	   	return new TemplateResponseValues("error-message.ftl", map);
-	}
-	
-	private String handleErrors(VitroRequest vreq) {
-		String uri = vreq.getParameter("individualUri");
-		if ( uri == null) {
-			 return "Individual uri is null. No object to delete.";
-		}
-		if (uri.contains(">")) {
-			return "Individual uri shouldn't contain >";
-		}
-		return "";
-	}
-	
-	private static String getDeleteQueryForType(String typeURI,Model displayModel) {
-    
-		String deleteQueryText = DEFAULT_DELETE_QUERY_TEXT;
-		
-		Query queryForTypeSpecificDeleteQuery = QueryFactory.create(queryForDeleteQuery);
-
-    QuerySolutionMap initialBindings = new QuerySolutionMap();
-    initialBindings.add("associatedURI", ResourceFactory.createResource( typeURI ));
-
-    displayModel.enterCriticalSection(Lock.READ);
-    try{
-        QueryExecution qexec = QueryExecutionFactory.create(queryForTypeSpecificDeleteQuery,displayModel,initialBindings );
-        try{
-            ResultSet results = qexec.execSelect();
-            while (results.hasNext()) {
-                QuerySolution solution = results.nextSolution();
-                deleteQueryText = solution.get("deleteQueryText").toString();
-            }
-        }finally{ qexec.close(); }
-    }finally{ displayModel.leaveCriticalSection(); }
-    
-    if (!deleteQueryText.equals(DEFAULT_DELETE_QUERY_TEXT)) {
-    	log.debug("For " + typeURI + " found delete query \n" + deleteQueryText);
-    } else {
-    	log.debug("For " + typeURI + " delete query not found. Using defalut query \n" + deleteQueryText);	
-    }
-    return deleteQueryText;
-	}
-	
-  private String getObjectMostSpecificType(String individualURI, VitroRequest vreq) {
-    String type = "";
-    try {
-        ResultSet results = QueryUtils.getLanguageNeutralQueryResults(makeTypeQuery(individualURI), vreq);
-        while (results.hasNext()) {
-            QuerySolution solution = results.nextSolution();
-            type = solution.get("type").toString();
-            log.debug(type);
-        }
-    } catch (Exception e) {
-    		log.error("Failed to get type for individual URI " + individualURI);  
-        log.error(e, e);
-    }
-   return type;
-  }
-  
-  private byte[] getIndividualsToDelete(String targetIndividual, String deleteQuery,VitroRequest vreq) {
-  	ByteArrayOutputStream out = new ByteArrayOutputStream();
-  	try {
-  		Query queryForTypeSpecificDeleteQuery = QueryFactory.create(deleteQuery);
-      QuerySolutionMap initialBindings = new QuerySolutionMap();
-      initialBindings.add("individualURI", ResourceFactory.createResource( targetIndividual ));
-      Model ontModel = vreq.getJenaOntModel();
-      QueryExecution qexec = QueryExecutionFactory.create(queryForTypeSpecificDeleteQuery,ontModel,initialBindings );
-      Model results = qexec.execDescribe();
-      results.write(out,"N3");
-        
-    } catch (Exception e) {
-    	log.error("Query raised an error \n" + deleteQuery);  
-    	log.error(e, e);
-    }
-    return out.toByteArray();
-  }
-
-	private String makeTypeQuery(String objectURI) {
-		return TYPE_QUERY_START + objectURI + TYPE_QUERY_END;
-	}
-	
-	private void deleteIndividuals(byte[] toRemove, VitroRequest vreq) {
-  	String removingString = new String(toRemove, StandardCharsets.UTF_8);
-		RDFService rdfService = vreq.getRDFService();
-    ChangeSet cs = makeChangeSet(rdfService);
-    InputStream in = new ByteArrayInputStream(toRemove); 
-    cs.addRemoval(in, RDFServiceUtils.getSerializationFormatFromJenaString("N3"), ModelNames.ABOX_ASSERTIONS);
-    try {
-    	rdfService.changeSetUpdate(cs);
-    } catch (RDFServiceException e) {
-    	log.error("Got error while removing\n" + removingString);
-    	throw new RuntimeException(e);
-    }
-	}
-	
-  private ChangeSet makeChangeSet(RDFService rdfService) {
-    ChangeSet cs = rdfService.manufactureChangeSet();
-    cs.addPreChangeEvent(new BulkUpdateEvent(null, BEGIN));
-    cs.addPostChangeEvent(new BulkUpdateEvent(null, END));
-    return cs;
-}
-
-  
-	
-  
-}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java

@@ -10,6 +10,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.ResourceFactory;
+
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
@@ -25,6 +28,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUti
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
+
+
 /*
  * Custom deletion controller to which deletion requests from default property form are sent. May be replaced
  * later with additional features in process rdf form controller or alternative location.
@@ -61,14 +66,14 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
 
 
     private String getRedirectUrl(VitroRequest vreq) {
-		// TODO Auto-generated method stub
+    	// TODO Auto-generated method stub
     	String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
     	String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    	int hashIndex = predicateUri.lastIndexOf("#");
+    	Property prop = ResourceFactory.createProperty(predicateUri);
-    	String localName = predicateUri.substring(hashIndex + 1);
+    	String localName = prop.getLocalName();
     	String redirectUrl =  "/entity?uri=" + URLEncoder.encode(subjectUri);
-		return redirectUrl + "#" + URLEncoder.encode(localName);
+    	return redirectUrl + "#" + URLEncoder.encode(localName);
-	}
+    }
 
 
 	private String handleErrors(VitroRequest vreq) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java

@@ -8,6 +8,7 @@ import static javax.mail.Message.RecipientType.TO;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.charset.Charset;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -17,7 +18,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import edu.cornell.mannlib.vitro.webapp.dao.jena.MenuDaoJena;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -93,6 +93,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         throws IOException, ServletException {
 
         super.doGet(request,response);
+//UQAM-Optimization set for UTF-8
+        response.setCharacterEncoding("UTF-8");
 
         VitroRequest vreq = new VitroRequest(request);
         ResponseValues responseValues = null;
@@ -103,8 +105,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             if (!isAuthorizedToDisplayPage(request, response, requiredActions(vreq))) {
                 return;
             }
-
 			responseValues = processRequest(vreq);
+
 	        doResponse(vreq, response, responseValues);
 
     	} catch (Throwable e) {
@@ -256,7 +258,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 	protected void doTemplate(VitroRequest vreq, HttpServletResponse response,
             ResponseValues values) throws TemplateProcessingException {
 
-        Map<String, Object> templateDataModel = new HashMap<String, Object>();
+		Map<String, Object> templateDataModel = new HashMap<String, Object>();
         templateDataModel.putAll(getPageTemplateValues(vreq));
 
         // Add the values that we got from the subcontroller processRequest() method, and merge to the template.
@@ -276,8 +278,15 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             // is specified in the main page template.
             bodyString = "";
         }
+
         templateDataModel.put("body", bodyString);
 
+        String lang = vreq.getLocale().getLanguage();
+        if (!vreq.getLocale().getCountry().isEmpty()) {
+            lang += "-" + vreq.getLocale().getCountry();
+        }
+        templateDataModel.put("country", lang);
+
         // Tell the template and any directives it uses that we're processing a page template.
         templateDataModel.put("templateType", PAGE_TEMPLATE_TYPE);
 
@@ -462,7 +471,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 
     protected MainMenu getDisplayModelMenu(VitroRequest vreq){
         String url = vreq.getRequestURI().substring(vreq.getContextPath().length());
-        return vreq.getWebappDaoFactory().getMenuDao().getMainMenu(vreq, url);
+        return vreq.getWebappDaoFactory().getMenuDao().getMainMenu(url);
     }
 
     // NIHVIVO-3307: we need this here instead of FreemarkerConfiguration.java so that updates to

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java

@@ -42,7 +42,7 @@ public class TemplateProcessingHelper {
 
         try {
             Environment env = template.createProcessingEnvironment(map, writer);
-
+ 
             // Define a setup template to be included by every page template
             String templateType = (String) map.get("templateType");
             if (FreemarkerHttpServlet.PAGE_TEMPLATE_TYPE.equals(templateType)) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java

@@ -37,7 +37,6 @@ public class UrlBuilder {
         LOGIN("/login"),
         LOGOUT("/logout"),
         OBJECT_PROPERTY_EDIT("/propertyEdit"),
-        CUSTOMSEARCH("/customsearch"),
         SEARCH("/search"),
         SITE_ADMIN("/siteAdmin"),
         TERMS_OF_USE("/termsOfUse"),

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java

@@ -11,28 +11,29 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Literal;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
 
 
 /*Servlet to view all labels in various languages for individual*/
@@ -47,12 +48,13 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 		String subjectUri = vreq.getParameter("subjectUri");
 		body.put("subjectUri", subjectUri);
 		try {
-			//Get all language codes/labels in the system, and this list is sorted by language name
+	        //the labels already added by the user
-	        List<HashMap<String, String>> locales = this.getLocales(vreq);
+            ArrayList<Literal> existingLabels = this.getExistingLabels(subjectUri, vreq);
+			//Get all language codes/labels used in the list of existing labels
+	        List<HashMap<String, String>> locales = this.getLocales(vreq, existingLabels);
 	        //Get code to label hashmap - we use this to get the language name for the language code returned in the rdf literal
 	        HashMap<String, String> localeCodeToNameMap = this.getFullCodeToLanguageNameMap(locales);
-			//the labels already added by the user
+
-			ArrayList<Literal> existingLabels = this.getExistingLabels(subjectUri, vreq);
 			//existing labels keyed by language name and each of the list of labels is sorted by language name
 			HashMap<String, List<LabelInformation>> existingLabelsByLanguageName = this.getLabelsSortedByLanguageName(existingLabels, localeCodeToNameMap, vreq, subjectUri);
 			//Get available locales for the drop down for adding a new label, also sorted by language name
@@ -137,20 +139,26 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 		doGet(request, response);
 	}
 
-    //get locales
+    //get locales present in list of literals
-    public List<HashMap<String, String>> getLocales(VitroRequest vreq) {
+    public List<HashMap<String, String>> getLocales(VitroRequest vreq, 
-    	List<Locale> selectables = SelectedLocale.getSelectableLocales(vreq);
+            List<Literal> existingLiterals) {
-		if (selectables.isEmpty()) {
+        Set<Locale> locales = new HashSet<Locale>();
+        for(Literal literal : existingLiterals) {
+            String language = literal.getLanguage();
+            if(!StringUtils.isEmpty(language)) {
+                locales.add(LanguageFilteringUtils.languageToLocale(language));
+            }
+        }
+		if (locales.isEmpty()) {
 			return Collections.emptyList();
 		}
 		List<HashMap<String, String>> list = new ArrayList<HashMap<String, String>>();
 		Locale currentLocale = SelectedLocale.getCurrentLocale(vreq);
-		for (Locale locale : selectables) {
+		for (Locale locale : locales) {
 			try {
 				list.add(buildLocaleMap(locale, currentLocale));
 			} catch (FileNotFoundException e) {
-				log.warn("Can't show the Locale selector for '" + locale
+				log.warn("Can't show locale '" + locale + "': " + e);
-						+ "': " + e);
 			}
 		}
 
@@ -188,8 +196,8 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 
         ArrayList<Literal>  labels = new ArrayList<Literal>();
         try {
-        	//We want to get the labels for all the languages, not just the display language
+        	// Show only labels with current language filtering
-            ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
+            ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
             while (results.hasNext()) {
                 QuerySolution soln = results.nextSolution();
                 Literal nodeLiteral = soln.get("label").asLiteral();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java

@@ -6,14 +6,13 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
-import org.apache.jena.rdf.model.RDFNode;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 
@@ -36,6 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
 import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ExecuteDataRetrieval;
 import edu.cornell.mannlib.vitro.webapp.web.beanswrappers.ReadOnlyBeansWrapper;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
 import edu.ucsf.vitro.opensocial.OpenSocialManager;
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.template.TemplateModel;
@@ -123,8 +123,10 @@ class IndividualResponseBuilder {
 		 * into the data model: no real data can be modified.
 		 */
 		// body.put("individual", wrap(itm, BeansWrapper.EXPOSE_SAFE));
-	    body.put("labelCount", getLabelCount(itm.getUri(), vreq));
+		LabelAndLanguageCount labelAndLanguageCount = getLabelAndLanguageCount(
-	    body.put("languageCount", getLanguagesRepresentedCount(itm.getUri(), vreq));
+		        itm.getUri(), vreq);
+	    body.put("labelCount", labelAndLanguageCount.getLabelCount());
+	    body.put("languageCount", labelAndLanguageCount.getLanguageCount());
 	    //We also need to know the number of available locales
 	    body.put("localesCount", SelectedLocale.getSelectableLocales(vreq).size());
 	    body.put("profileType", getProfileType(itm.getUri(), vreq));
@@ -282,61 +284,103 @@ class IndividualResponseBuilder {
     	return map;
     }
 
-    private static String LABEL_COUNT_QUERY = ""
+    private static String LABEL_QUERY = ""
-        + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
-        + "SELECT ( str(COUNT(?label)) AS ?labelCount ) WHERE { \n"
-        + "    ?subject rdfs:label ?label \n"
-        + "    FILTER isLiteral(?label) \n"
-        + "}" ;
-
-    private static String DISTINCT_LANGUAGE_QUERY = ""
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
-            + "SELECT ( str(COUNT(DISTINCT lang(?label))) AS ?languageCount ) WHERE { \n"
+            + "SELECT ?label WHERE { \n"
             + "    ?subject rdfs:label ?label \n"
             + "    FILTER isLiteral(?label) \n"
             + "}" ;
+    
+//    Queries that were previously used for counts via RDFService that didn't
+//        filter results by language.  With language filtering, aggregate 
+//        functions like COUNT() cannot be used.
+    
+//    private static String LABEL_COUNT_QUERY = ""
+//        + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
+//        + "SELECT ( str(COUNT(?label)) AS ?labelCount ) WHERE { \n"
+//        + "    ?subject rdfs:label ?label \n"
+//        + "    FILTER isLiteral(?label) \n"
+//        + "}" ;
 
-    private static Integer getLabelCount(String subjectUri, VitroRequest vreq) {
+//    private static String DISTINCT_LANGUAGE_QUERY = ""
-        String queryStr = QueryUtils.subUriForQueryVar(LABEL_COUNT_QUERY, "subject", subjectUri);
+//            + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
+//            + "SELECT ( str(COUNT(DISTINCT lang(?label))) AS ?languageCount ) WHERE { \n"
+//            + "    ?subject rdfs:label ?label \n"
+//            + "    FILTER isLiteral(?label) \n"
+//            + "}" ;
+
+    private static LabelAndLanguageCount getLabelAndLanguageCount(
+            String subjectUri, VitroRequest vreq) {
+        // 1.12.0 Now filtering to only the labels for the current locale so as
+        // to be consistent with other editing forms.  Because the language
+        // filter can only act on a result set containing actual literals,
+        // we can't do the counting with a COUNT() in the query itself.  So
+        // we will now use the LABEL_QUERY instead of LABEL_COUNT_QUERY and 
+        // count the rows and the number of distinct languages represented.
+        Set<String> distinctLanguages = new HashSet<String>();
+        String queryStr = QueryUtils.subUriForQueryVar(LABEL_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
-        int theCount = 0;
+        int labelCount = 0;
-        try {
+        try {   
-            //ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
+            ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
-            //Get query results across all languages in order for template to show manage labels link correctly
+            while(results.hasNext()) {
-            ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
+                QuerySolution qsoln = results.next();
-            if (results.hasNext()) {
+                labelCount++;
-                QuerySolution soln = results.nextSolution();
+                String lang = qsoln.getLiteral("label").getLanguage();
-                RDFNode labelCount = soln.get("labelCount");
+                if(lang == null) {
-                if (labelCount != null && labelCount.isLiteral()) {
+                    lang = "";
-                    theCount = labelCount.asLiteral().getInt();
                 }
+                distinctLanguages.add(lang);
             }
         } catch (Exception e) {
             log.error(e, e);
         }
-        return theCount;
+        return new LabelAndLanguageCount(labelCount, distinctLanguages.size());
+    }
+    
+    private static class LabelAndLanguageCount {
+        
+        private Integer labelCount;
+        private Integer languageCount;
+        
+        public LabelAndLanguageCount(Integer labelCount, Integer languageCount) {
+            this.labelCount = labelCount;
+            this.languageCount = languageCount;
+        }
+        
+        public Integer getLabelCount() {
+            return this.labelCount;
+        }
+        
+        public Integer getLanguageCount() {
+            return this.languageCount;
+        }
+        
     }
 
     //what is the number of languages represented across the labels
-    private static Integer getLanguagesRepresentedCount(String subjectUri, VitroRequest vreq) {
+    // This version not compatible with language-filtering RDF services
-    	   String queryStr = QueryUtils.subUriForQueryVar(DISTINCT_LANGUAGE_QUERY, "subject", subjectUri);
+//    private static Integer getLanguagesRepresentedCount(String subjectUri, VitroRequest vreq) {
-           log.debug("queryStr = " + queryStr);
+//    	   String queryStr = QueryUtils.subUriForQueryVar(DISTINCT_LANGUAGE_QUERY, "subject", subjectUri);
-           int theCount = 0;
+//           log.debug("queryStr = " + queryStr);
-           try {
+//           int theCount = 0;
-
+//           try {
-               ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
+//
-               if (results.hasNext()) {
+//               ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
-                   QuerySolution soln = results.nextSolution();
+//               if (results.hasNext()) {
-                   RDFNode languageCount = soln.get("languageCount");
+//                   QuerySolution soln = results.nextSolution();
-                   if (languageCount != null && languageCount.isLiteral()) {
+//                   RDFNode languageCount = soln.get("languageCount");
-                       theCount = languageCount.asLiteral().getInt();
+//                   if (languageCount != null && languageCount.isLiteral()) {
-                   }
+//                       theCount = languageCount.asLiteral().getInt();
-               }
+//                       log.info("Language count is " + theCount);
-           } catch (Exception e) {
+//                   }
-               log.error(e, e);
+//               }
-           }
+//           } catch (Exception e) {
-           return theCount;
+//               log.error(e, e);
-    }
+//           }
+//           log.info("Returning language count " + theCount);
+//           return theCount;
+//    }
 
     private static String PROFILE_TYPE_QUERY = ""
         + "PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> \n"

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java

@@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.json;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -15,6 +16,7 @@ import org.apache.commons.logging.LogFactory;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService.ShortViewContext;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup;
@@ -73,7 +75,11 @@ public class GetRandomSearchIndividualsByVClass extends GetSearchIndividualsByVC
 		modelMap.put("individual",
 				IndividualTemplateModelBuilder.build(individual, vreq));
 		modelMap.put("vclass", vclassName);
-
+		String langCtx = vreq.getLocale().getLanguage();  //UQAM-Linguistic-Management build the linguistic context
+		if (!vreq.getLocale().getCountry().isEmpty()) {
+			langCtx += "-" + vreq.getLocale().getCountry();
+		}
+		modelMap.put("langCtx", langCtx); // UQAM-Linguistic-Management add the linguistic context to map
 		ShortViewService svs = ShortViewServiceSetup.getService(ctx);
 		return svs.renderShortView(individual, ShortViewContext.BROWSE,
 				modelMap, vreq);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java

@@ -5,6 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.dao;
 import java.util.List;
 import java.util.Set;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
+
 public interface WebappDaoFactory {
 
     /**
@@ -132,4 +134,6 @@ public interface WebappDaoFactory {
 
     public MenuDao getMenuDao();
 
+    public I18nBundle getI18nBundle();
+
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java

@@ -5,21 +5,25 @@ package edu.cornell.mannlib.vitro.webapp.dao;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
 
 public class WebappDaoFactoryConfig {
 
 	private List<String> preferredLanguages;
+	private List<Locale> preferredLocales;
 	private String defaultNamespace;
 	private Set<String> nonUserNamespaces;
 	private boolean isUnderlyingStoreReasoned = false;
 	public Map<FullPropertyKey, String> customListViewConfigFileMap;
 
 	public WebappDaoFactoryConfig() {
-	    preferredLanguages = Arrays.asList("en-US", "en", "EN");
+		preferredLanguages = Arrays.asList("en-US", "en", "EN");
+		preferredLocales = LanguageFilteringUtils.languagesToLocales(preferredLanguages);
 		defaultNamespace = "http://vitro.mannlib.cornell.edu/ns/default#";
 		nonUserNamespaces = new HashSet<String>();
 		nonUserNamespaces.add(VitroVocabulary.vitroURI);
@@ -33,6 +37,14 @@ public class WebappDaoFactoryConfig {
 		this.preferredLanguages = pl;
 	}
 
+	public List<Locale> getPreferredLocales() {
+		return this.preferredLocales;
+	}
+
+	public void setPreferredLocales(List<Locale> pl) {
+		this.preferredLocales = pl;
+	}
+
 	public String getDefaultNamespace() {
 		return defaultNamespace;
 	}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java

@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
+public class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
     final DataPropertyDao innerDataPropertyDao;
     final VitroFilters filters;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java

@@ -18,7 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPropertyStatementDao{
+public class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPropertyStatementDao{
 
     final DataPropertyStatementDao innerDataPropertyStatementDao;
     final VitroFilters filters;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java

@@ -26,47 +26,34 @@ public class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPrope
 
 	@Override
 	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
-		// TODO Auto-generated method stub
+		return innerFauxPropertyDao.getFauxPropertiesForBaseUri(uri);
-		throw new RuntimeException(
-				"FauxPropertyDao.getFauxPropertiesForBaseUri() not implemented.");
 	}
 
 	@Override
 	public FauxProperty getFauxPropertyFromContextUri(String contextUri) {
-		// TODO Auto-generated method stub
+		return innerFauxPropertyDao.getFauxPropertyFromContextUri(contextUri);
-		throw new RuntimeException(
-				"FauxPropertyDaoFiltering.getFauxPropertyFromConfigContextUri() not implemented.");
-
 	}
 
 	@Override
 	public FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
 			String rangeUri) {
-		// TODO Auto-generated method stub
+		return innerFauxPropertyDao.getFauxPropertyByUris(domainUri, baseUri, 
-		throw new RuntimeException(
+		        rangeUri);
-				"FauxPropertyDaoFiltering.getFauxPropertyByUris() not implemented.");
-
 	}
 
 	@Override
 	public void updateFauxProperty(FauxProperty fp) {
-		// TODO Auto-generated method stub
+		innerFauxPropertyDao.updateFauxProperty(fp);
-		throw new RuntimeException("FauxPropertyDaoFiltering.updateFauxProperty() not implemented.");
-
 	}
 
 	@Override
 	public void deleteFauxProperty(FauxProperty fp) {
-		// TODO Auto-generated method stub
+		innerFauxPropertyDao.deleteFauxProperty(fp);
-		throw new RuntimeException("FauxPropertyDao.deleteFauxProperty() not implemented.");
-
 	}
 
 	@Override
 	public void insertFauxProperty(FauxProperty fp) {
-		// TODO Auto-generated method stub
+		innerFauxPropertyDao.insertFauxProperty(fp);
-		throw new RuntimeException("FauxPropertyDao.insertFauxProperty() not implemented.");
-
 	}
 
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java

@@ -20,7 +20,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
 
 
-class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
+public class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
     IndividualDao innerIndividualDao;
     VitroFilters filters;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java

@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectPropertyDao{
+public class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectPropertyDao{
     final ObjectPropertyDao innerObjectPropertyDao;
     final VitroFilters filters;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java

@@ -16,7 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements ObjectPropertyStatementDao{
+public class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements ObjectPropertyStatementDao{
     final ObjectPropertyStatementDao innerObjectPropertyStatementDao;
     final VitroFilters filters;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java

@@ -24,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 /**
  * This wraps a WebappDaoFactory and applies filtering.
@@ -67,7 +68,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     transient private PropertyGroupDao filteringPropertyGroupDao=null;
     transient private PropertyInstanceDao filteringPropertyInstanceDao=null;
 
-    public WebappDaoFactoryFiltering( WebappDaoFactory innerDao, VitroFilters filters){
+    public WebappDaoFactoryFiltering(WebappDaoFactory innerDao, VitroFilters filters){
         if( innerDao == null )
             throw new Error("innerWebappDaoFactory must be non-null");
         this.filters = filters;
@@ -276,4 +277,9 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     public void close() {
         innerWebappDaoFactory.close();
     }
+
+    @Override
+    public I18nBundle getI18nBundle() {
+        return innerWebappDaoFactory.getI18nBundle();
+    }
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java

@@ -83,22 +83,21 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
     	}
     	ontModel.enterCriticalSection(Lock.WRITE);
     	try {
-    		appInd.setLabel(application.getApplicationName(), null);
+    		updateRDFSLabel(appInd, application.getApplicationName());
-	        updatePropertyStringValue(
+	        updatePlainLiteralValue(
-	        		appInd, APPLICATION_ABOUTTEXT, application.getAboutText(),
+	        		appInd, APPLICATION_ABOUTTEXT, application.getAboutText());
-	        		    ontModel);
+	        updatePlainLiteralValue(
-	        updatePropertyStringValue(
 	        		appInd, APPLICATION_ACKNOWLEGETEXT,
-	        		    application.getAcknowledgeText(), ontModel);
+	        		    application.getAcknowledgeText());
 	        updatePropertyStringValue(
 	        		appInd, APPLICATION_CONTACTMAIL,
 	        		    application.getContactMail(), ontModel);
 	        updatePropertyStringValue(
 	        		appInd, APPLICATION_CORRECTIONMAIL,
 	        		    application.getCorrectionMail(), ontModel);
-	        updatePropertyStringValue(
+	        updatePlainLiteralValue(
 	        		appInd, APPLICATION_COPYRIGHTANCHOR,
-	        		    application.getCopyrightAnchor(), ontModel);
+	        		    application.getCopyrightAnchor());
             updatePropertyStringValue(
             		appInd, APPLICATION_COPYRIGHTURL,
             		    application.getCopyrightURL(), ontModel);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java

@@ -516,9 +516,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             if (dtp.getFunctional()) {
                	ontModel.add(jDataprop,RDF.type,OWL.FunctionalProperty);
             }
-            addPropertyStringValue(jDataprop, EXAMPLE, dtp.getExample(), ontModel);
+            updatePlainLiteralValue(jDataprop, EXAMPLE, dtp.getExample());
-            addPropertyStringValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription(), ontModel);
+            updatePlainLiteralValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription());
-            addPropertyStringValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription(), ontModel);
+            updatePlainLiteralValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription());
             addPropertyStringValue(jDataprop, EDITING, dtp.getEditing(), ontModel);
             addPropertyNonNegativeIntValue(jDataprop, DISPLAY_RANK_ANNOT, dtp.getDisplayTier(), ontModel);
             addPropertyNonNegativeIntValue(jDataprop, DISPLAY_LIMIT, dtp.getDisplayLimit(), ontModel);
@@ -587,9 +587,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             	}
             }
 
-            updatePropertyStringValue(jDataprop, EXAMPLE, dtp.getExample(), ontModel);
+            updatePlainLiteralValue(jDataprop, EXAMPLE, dtp.getExample());
-            updatePropertyStringValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription(), ontModel);
+            updatePlainLiteralValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription());
-            updatePropertyStringValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription(), ontModel);
+            updatePlainLiteralValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription());
             updatePropertyStringValue(jDataprop, EDITING, dtp.getEditing(), ontModel);
             updatePropertyNonNegativeIntValue(jDataprop, DISPLAY_RANK_ANNOT, dtp.getDisplayTier(), ontModel);
             updatePropertyNonNegativeIntValue(jDataprop, DISPLAY_LIMIT, dtp.getDisplayLimit(), ontModel);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java

@@ -230,10 +230,9 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					OBJECT_PROPERTY_DISPLAY_CONFIG);
 			addPropertyResourceURINotEmpty(config, PROPERTY_GROUP,
 					fp.getGroupURI());
-			addPropertyStringValue(config, DISPLAY_NAME, fp.getDisplayName(),
+			updatePlainLiteralValue(config, DISPLAY_NAME, fp.getDisplayName());
-					displayModel);
+			updatePlainLiteralValue(config, PUBLIC_DESCRIPTION_ANNOT,
-			addPropertyStringValue(config, PUBLIC_DESCRIPTION_ANNOT,
+					fp.getPublicDescription());
-					fp.getPublicDescription(), displayModel);
 			addPropertyIntValue(config, DISPLAY_RANK_ANNOT,
 					fp.getDisplayTier(), displayModel);
 			addPropertyIntValue(config, DISPLAY_LIMIT, fp.getDisplayLimit(),
@@ -328,10 +327,10 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					.getConfigUri());
 			updatePropertyResourceURIValue(config, PROPERTY_GROUP,
 					fp.getGroupURI());
-			updatePropertyStringValue(config, DISPLAY_NAME,
+			updatePlainLiteralValue(config, DISPLAY_NAME,
-					fp.getDisplayName(), displayModel);
+					fp.getDisplayName());
-			updatePropertyStringValue(config, PUBLIC_DESCRIPTION_ANNOT,
+			updatePlainLiteralValue(config, PUBLIC_DESCRIPTION_ANNOT,
-					fp.getPublicDescription(), displayModel);
+					fp.getPublicDescription());
 			updatePropertyIntValue(config, DISPLAY_RANK_ANNOT,
 					fp.getDisplayTier(), displayModel);
 			updatePropertyIntValue(config, DISPLAY_LIMIT, fp.getDisplayLimit(),

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java

@@ -5,8 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
@@ -14,14 +14,14 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
-
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.iri.IRI;
+import org.apache.jena.iri.IRIFactory;
 import org.apache.jena.ontology.DatatypeProperty;
 import org.apache.jena.ontology.ObjectProperty;
 import org.apache.jena.ontology.OntClass;
@@ -39,6 +39,7 @@ import org.apache.jena.rdf.model.NodeIterator;
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.shared.Lock;
@@ -752,22 +753,111 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 			}
 		}
 	}
+	
+	/**
+     * Add to an OntResource an rdfs:label value with lexical form and default
+     * language tag. Remove any other existing values in default language.
+     * If lexicalForm parameter is null, remove all plain literal values of 
+     * Property in default language.
+     * @param ontRes may not be null
+     * @param lexicalForm may be null.  If null, existing values will be deleted
+     *        but none will be added.
+     */
+	protected void updateRDFSLabel(OntResource ontRes, String lexicalForm) {
+        updatePlainLiteralValue(ontRes, RDFS.label, lexicalForm);
+    }
+	
+	/**
+     * Add to an OntResource an rdfs:label value with lexical form and optional
+     * language tag. Remove any other existing plain literal values that match 
+     * specified language or lack language tags if no language is supplied.
+     * If lexicalForm parameter is null, remove all plain literal labels in 
+     * specified language, or all existing language-less labels
+     * if no language is specified.
+     * @param ontRes may not be null
+     * @param lexicalForm may be null.  If null, existing values will be deleted
+     *        but none will be added.
+     * @param lang may be null.  If null, method acts on language-less plain 
+     *        literal labels and ignores those with language tags.
+     */	
+	protected void updateRDFSLabel(OntResource ontRes, String lexicalForm, String lang) {
+	    updatePlainLiteralValue(ontRes, RDFS.label, lexicalForm, lang);
+	}
 
     /**
-     * convenience method for updating the RDFS label
+     * Add to an OntResource a Property value with lexical form and default
+     * language tag. Remove any other existing values in default language.
+     * If lexicalForm parameter is null, remove all plain literal values of 
+     * Property in default language.
+     * @param ontRes may not be null
+     * @param lexicalForm may be null.  If null, existing values will be deleted
+     *        but none will be added.
      */
-    protected void updateRDFSLabel(OntResource ontRes, String label) {
+	protected void updatePlainLiteralValue(OntResource ontRes, Property property, 
-
+            String lexicalForm) {
-    	if (label != null && label.length() > 0) {
+        updatePlainLiteralValue(ontRes, property, lexicalForm, getDefaultLanguage());
-
+    }
-    		String existingValue = ontRes.getLabel(getDefaultLanguage());
+    
-
+    /**
-    		if (existingValue == null || !existingValue.equals(label)) {
+     * Add to an OntResource a Property value with lexical form and optional
-    			ontRes.setLabel(label, getDefaultLanguage());
+     * language tag. Remove any other existing plain literal values that match 
-    	    }
+     * specified language or lack language tags if no language is supplied.
-    	} else {
+     * If lexicalForm parameter is null, remove all plain literal values of 
-    		ontRes.removeAll(RDFS.label);
+     * Property in specified language, or all existing language-less literals
-    	}
+     * if no language is specified.
+     * @param ontRes may not be null
+     * @param lexicalForm may be null.  If null, existing values will be deleted
+     *        but none will be added.
+     * @param lang may be null.  If null, method acts on language-less
+     *        plain literal values and ignores those with language tags.
+     */
+    protected void updatePlainLiteralValue(OntResource ontRes, Property property,
+            String lexicalForm, String lang) {
+        if(ontRes == null) {
+            throw new IllegalArgumentException("ontRes may not be null.");
+        }
+        boolean addNew = true;
+        List<Statement> toRemove = new ArrayList<Statement>();
+        StmtIterator existingStmts = ontRes.listProperties(property);
+        while(existingStmts.hasNext()) {
+            Statement stmt = existingStmts.next();
+            if(stmt.getObject().isLiteral()) {                
+                Literal lit = stmt.getObject().asLiteral();
+                if( (lang == null && isLanguageLessPlainLiteral(lit))  
+                        || (lang != null && lang.equals(lit.getLanguage())) ) {
+                    if(!lit.getLexicalForm().equals(lexicalForm)) {
+                        toRemove.add(stmt);
+                    } else {
+                        // New literal already exists in the model.
+                        // Do not add it again.
+                        addNew = false;
+                    }
+                }
+            }
+        }
+        if(!toRemove.isEmpty()) {
+            ontRes.getModel().remove(toRemove);
+        }
+        if (addNew && (lexicalForm != null)) {
+            if(!StringUtils.isEmpty(lang)) {
+                ontRes.addProperty(property, ResourceFactory.createLangLiteral(
+                        lexicalForm, lang));    
+            } else {
+                ontRes.addProperty(property, ResourceFactory.createPlainLiteral(
+                        lexicalForm));
+            }            
+        }
+    }
+    
+    private boolean isLanguageLessPlainLiteral(Literal lit) {
+        // In RDF 1.1 all the language-less literals get datatype xsd:string.
+        // The null datatype check is here just in case this gets run on an older
+        // version of Jena.  rdf:PlainLiteral is also a datatype, but doesn't
+        // (yet) seem to be used by Jena.        
+        return StringUtils.isEmpty(lit.getLanguage()) 
+                && ((lit.getDatatype() == null) 
+                || XSDDatatype.XSDstring.equals(lit.getDatatype()) ||
+                (RDF.getURI() + "PlainLiteral").equals(lit.getDatatypeURI()));
     }
 
     private Literal getLabel(String lang, List<RDFNode>labelList) {
@@ -780,6 +870,13 @@ public class JenaBaseDao extends JenaBaseDaoCon {
                 }
                 if ((lang != null) && (lang.equals(labelLanguage))) {
                     return labelLit;
+                } else
+                    /*
+                     * UQAM-Linguistic-Management
+                     * Check for country-part of lang (ex: 'en' for default consideration of labelLanguage in english but not encoded by 'en-US' most case of labels in vivo.owl)
+                     */
+                	if ((lang != null) && (Arrays.asList(lang.split("-")).get(0).equals(labelLanguage))) {
+                    return labelLit;
                 }
             }
         }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java

@@ -72,6 +72,7 @@ public class MenuDaoJena extends JenaBaseDao implements MenuDao {
         return getMenu( getOntModelSelector().getDisplayModel(), url );
     }
 
+    @Override
     public MainMenu getMainMenu( ServletRequest req, String url ) {
         OntModel displayModel = LanguageFilteringUtils.wrapOntModelInALanguageFilter(getOntModelSelector().getDisplayModel(), req );
         return getMenu(displayModel,  url) ;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java

@@ -714,14 +714,14 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             }
         }
 
-        updatePropertyStringValue(p,EXAMPLE_ANNOT,prop.getExample(),getOntModel());
+        updatePlainLiteralValue(p, EXAMPLE_ANNOT, prop.getExample());
-        updatePropertyStringValue(p,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel());
+        updatePlainLiteralValue(p, DESCRIPTION_ANNOT, prop.getDescription());
-        updatePropertyStringValue(p,PUBLIC_DESCRIPTION_ANNOT,prop.getPublicDescription(),getOntModel());
+        updatePlainLiteralValue(p, PUBLIC_DESCRIPTION_ANNOT, prop.getPublicDescription());
         updatePropertyNonNegativeIntegerValue(p,DISPLAY_LIMIT,prop.getDomainDisplayLimitInteger(),getOntModel());
         updatePropertyStringValue(p,PROPERTY_ENTITYSORTDIRECTION,prop.getDomainEntitySortDirection(),getOntModel());
         if (inv != null) {
-            updatePropertyStringValue(inv,EXAMPLE_ANNOT,prop.getExample(),getOntModel());
+            updatePlainLiteralValue(inv, EXAMPLE_ANNOT, prop.getExample());
-            updatePropertyStringValue(inv,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel());
+            updatePlainLiteralValue(inv, DESCRIPTION_ANNOT, prop.getDescription());
             updatePropertyNonNegativeIntegerValue(inv,DISPLAY_LIMIT,prop.getRangeDisplayLimitInteger(),getOntModel());
             updatePropertyStringValue(inv,PROPERTY_ENTITYSORTDIRECTION,prop.getRangeEntitySortDirection(),getOntModel());
         }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java

@@ -289,10 +289,15 @@ public class RDFServiceGraph implements GraphWithPerform {
             literalBuff.append("\"");
             pyString(literalBuff, node.getLiteralLexicalForm());
             literalBuff.append("\"");
-            if (node.getLiteralDatatypeURI() != null) {
+            /*
-                literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
+             * UQAM-Bug-Correction
-            } else if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
+             * reversing the condition tests.
+             * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data
+             */
+            if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
                 literalBuff.append("@").append(node.getLiteralLanguage());
+            } else if (node.getLiteralDatatypeURI() != null) {
+                literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
             }
             return literalBuff.toString();
         } else {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java

@@ -232,10 +232,10 @@ public class SparqlGraph implements GraphWithPerform {
             literalBuff.append("\"");
             pyString(literalBuff, node.getLiteralLexicalForm());
             literalBuff.append("\"");
-            if (node.getLiteralDatatypeURI() != null) {
+            if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
-                literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
-            } else if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
                 literalBuff.append("@").append(node.getLiteralLanguage());
+            } else if (node.getLiteralDatatypeURI() != null) {
+                literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
             }
             return literalBuff.toString();
         } else {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java

@@ -2,6 +2,8 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
+import static java.lang.String.format;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -60,15 +62,18 @@ import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
 
 public class VClassDaoJena extends JenaBaseDao implements VClassDao {
 
     protected static final Log log = LogFactory.getLog(VClassDaoJena.class);
+    private final I18nBundle i18n;
     private boolean isUnderlyingStoreReasoned = false;
 
     public VClassDaoJena(WebappDaoFactoryJena wadf, boolean isUnderlyingStoreReasoned) {
         super(wadf);
+        this.i18n = wadf.getI18nBundle();
         this.isUnderlyingStoreReasoned = isUnderlyingStoreReasoned;
     }
 
@@ -91,17 +96,19 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                     Restriction rest = cls.asRestriction();
                     OntProperty onProperty = rest.getOnProperty();
                     StringBuilder labelStr = new StringBuilder();
-                    labelStr.append("restriction on ").append(getLabelOrId(onProperty)).append(": ");
+                    labelStr.append(format("%s ", i18n.text("restriction_on")))
+                        .append(getLabelOrId(onProperty))
+                        .append(": ");
                     if (rest.isAllValuesFromRestriction() || rest.isSomeValuesFromRestriction()) {
                         Resource fillerRes = null;
                         if (rest.isAllValuesFromRestriction()) {
                             AllValuesFromRestriction avfRest = rest.asAllValuesFromRestriction();
                             fillerRes = avfRest.getAllValuesFrom();
-                            labelStr.append("all values from ");
+                            labelStr.append(format("%s ", i18n.text("all_values_from")));
                         } else {
                             SomeValuesFromRestriction svfRest = rest.asSomeValuesFromRestriction();
                             fillerRes = svfRest.getSomeValuesFrom();
-                            labelStr.append("some values from ");
+                            labelStr.append(format("%s ", i18n.text("some_values_from")));
                         }
                         if (fillerRes.canAs(OntClass.class)) {
                             OntClass avf = fillerRes.as(OntClass.class);
@@ -115,7 +122,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                         }
                     } else if (rest.isHasValueRestriction()) {
                         HasValueRestriction hvRest = rest.asHasValueRestriction();
-                        labelStr.append("has value ");
+                        labelStr.append(format("%s ", i18n.text("has_value")));
                         RDFNode fillerNode = hvRest.getHasValue();
                         try {
                             if (fillerNode.isResource()) {
@@ -128,22 +135,22 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                         }
                     } else if (rest.isMinCardinalityRestriction()) {
                         MinCardinalityRestriction mcRest = rest.asMinCardinalityRestriction();
-                        labelStr.append("minimum cardinality ");
+                        labelStr.append(format("%s ", i18n.text("minimum_cardinality")));
                         labelStr.append(mcRest.getMinCardinality());
                     } else if (rest.isMaxCardinalityRestriction()) {
                         MaxCardinalityRestriction mcRest = rest.asMaxCardinalityRestriction();
-                        labelStr.append("maximum cardinality ");
+                        labelStr.append(format("%s ", i18n.text("maximum_cardinality")));
                         labelStr.append(mcRest.getMaxCardinality());
                     } else if (rest.isCardinalityRestriction()) {
                         CardinalityRestriction cRest = rest.asCardinalityRestriction();
-                        labelStr.append("cardinality ");
+                        labelStr.append(format("%s ", i18n.text("cardinality")));
                         labelStr.append(cRest.getCardinality());
                     }
                     return labelStr.toString();
                 } else if (isBooleanClassExpression(cls)) {
                     StringBuilder labelStr = new StringBuilder("(");
                     if (cls.isComplementClass()) {
-                        labelStr.append("not ");
+                        labelStr.append(format("%s ", i18n.text("not")));
                         ComplementClass ccls = cls.as(ComplementClass.class);
                         labelStr.append(getLabelForClass(ccls.getOperand(), withPrefix, forPickList));
                     } else if (cls.isIntersectionClass()) {
@@ -153,7 +160,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                             OntClass operand = operandIt.next();
                             labelStr.append(getLabelForClass(operand, withPrefix, forPickList));
                             if (operandIt.hasNext()) {
-                                labelStr.append(" and ");
+                                labelStr.append(format(" %s ", i18n.text("and")));
                             }
                         }
                     } else if (cls.isUnionClass()) {
@@ -163,7 +170,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                             OntClass operand = operandIt.next();
                             labelStr.append(getLabelForClass(operand, withPrefix, forPickList));
                             if (operandIt.hasNext()) {
-                                labelStr.append(" or ");
+                                labelStr.append(format(" %s ", i18n.text("or")));
                             }
                         }
                     }
@@ -952,9 +959,9 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             } catch (Exception e) {
                 log.error("error linking class "+cls.getURI()+" to class group");
             }
-            addPropertyStringValue(ontCls,SHORTDEF,cls.getShortDef(),ontModel);
+            updatePlainLiteralValue(ontCls, SHORTDEF, cls.getShortDef());
-            addPropertyStringValue(ontCls,EXAMPLE_ANNOT,cls.getExample(),ontModel);
+            updatePlainLiteralValue(ontCls, EXAMPLE_ANNOT, cls.getExample());
-            addPropertyStringValue(ontCls,DESCRIPTION_ANNOT,cls.getDescription(),ontModel);
+            updatePlainLiteralValue(ontCls, DESCRIPTION_ANNOT, cls.getDescription());
             addPropertyIntValue(ontCls,DISPLAY_LIMIT,cls.getDisplayLimit(),ontModel);
             addPropertyIntValue(ontCls,DISPLAY_RANK_ANNOT,cls.getDisplayRank(),ontModel);
 
@@ -1011,9 +1018,9 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             if (ontCls != null) {
                 updateRDFSLabel(ontCls, cls.getName());
                 updatePropertyResourceURIValue(ontCls,IN_CLASSGROUP,cls.getGroupURI(),ontModel);
-                updatePropertyStringValue(ontCls,SHORTDEF,cls.getShortDef(),ontModel);
+                updatePlainLiteralValue(ontCls, SHORTDEF, cls.getShortDef());
-                updatePropertyStringValue(ontCls,EXAMPLE_ANNOT,cls.getExample(),ontModel);
+                updatePlainLiteralValue(ontCls, EXAMPLE_ANNOT, cls.getExample());
-                updatePropertyStringValue(ontCls,DESCRIPTION_ANNOT,cls.getDescription(),ontModel);
+                updatePlainLiteralValue(ontCls, DESCRIPTION_ANNOT, cls.getDescription());
                 updatePropertyNonNegativeIntValue(ontCls,DISPLAY_LIMIT,cls.getDisplayLimit(),ontModel);
                 updatePropertyNonNegativeIntValue(ontCls,DISPLAY_RANK_ANNOT,cls.getDisplayRank(),ontModel);
                 updatePropertyFloatValue(ontCls, SEARCH_BOOST_ANNOT, cls.getSearchBoost(), ontModel);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java

@@ -276,7 +276,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
         try {
             Individual groupInd = ontModel.getIndividual(vcg.getURI());
             try {
-                groupInd.setLabel(vcg.getPublicName(), getDefaultLanguage());
+                updateRDFSLabel(groupInd, vcg.getPublicName(), getDefaultLanguage());
             } catch (Exception e) {
                 log.error("error updating name for "+groupInd.getURI());
             }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java

@@ -50,6 +50,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel;
@@ -611,5 +613,10 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
         }
     }
 
+    @Override
+    public I18nBundle getI18nBundle() {
+        // return context based bundle for preferred locales
+        return I18n.bundle(config.getPreferredLocales());
+    }
 
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java

@@ -132,6 +132,11 @@ public class EditLiteral implements Literal {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public boolean isStmtResource() {
+        throw new UnsupportedOperationException();
+    }
+
     public Literal inModel(Model model) {
         throw new UnsupportedOperationException();
     }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.listener.impl;
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java

@@ -24,15 +24,25 @@ import edu.cornell.mannlib.vitro.webapp.beans.Datatype;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.DatatypeDaoJena;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 public class BasicValidationVTwo {
 
+    public final static String REQUIRED_FIELD_EMPTY_MSG = "required_field_empty_msg";
+
+    public final static String DATA_NOT_PAST_MSG = "data_not_past_msg";
+    public final static String INVALID_DATE_FORM_MSG = "invalid_date_form_msg";
+    public final static String FILE_MUST_BE_ENTERED_MSG = "file_must_be_entered_msg";
+    public final static String INVALID_URL_MSG = "invalid_url_msg";
+
+    private I18nBundle i18n;
+
     Map<String, List<String>> varsToValidations;
     EditConfigurationVTwo editConfig;
 
-    public BasicValidationVTwo(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub){
+    public BasicValidationVTwo(EditConfigurationVTwo editConfig, I18nBundle i18n){
         this.editConfig = editConfig;
+        this.i18n = i18n;
         Map<String,List<String>> validatorsForFields = new HashMap<String,List<String>>();
         for(String fieldName: editConfig.getFields().keySet()){
             FieldVTwo field = editConfig.getField(fieldName);
@@ -42,8 +52,9 @@ public class BasicValidationVTwo {
         checkValidations();
     }
 
-    public BasicValidationVTwo(Map<String, List<String>> varsToValidations){
+    public BasicValidationVTwo(Map<String, List<String>> varsToValidations, I18nBundle i18n){
         this.varsToValidations = varsToValidations;
+        this.i18n = i18n;
         checkValidations();
     }
 
@@ -94,7 +105,7 @@ public class BasicValidationVTwo {
                     //If no literals and this field was required, this is an error message
                     //and can return
                     if((literals == null || literals.size() == 0) && isRequiredField) {
-                    	errors.put(name, REQUIRED_FIELD_EMPTY_MSG);
+                    	errors.put(name, i18n.text(REQUIRED_FIELD_EMPTY_MSG));
                         break;
                     }
                     //Loop through literals if literals exist
@@ -113,7 +124,7 @@ public class BasicValidationVTwo {
 		                    // incorrectly generate errors.
 		                    if (isEmpty(value)) {
 		                        if (isRequiredField) {
-		                           errors.put(name, REQUIRED_FIELD_EMPTY_MSG);
+		                           errors.put(name, i18n.text(REQUIRED_FIELD_EMPTY_MSG));
 		                        }
 		                        break;
 		                    }
@@ -154,11 +165,11 @@ public class BasicValidationVTwo {
     private String validate(String validationType, List<FileItem> fileItems) {
         if( "nonempty".equalsIgnoreCase(validationType)){
             if( fileItems == null || fileItems.size() == 0 ){
-                return "a file must be entered for this field.";
+                return i18n.text(FILE_MUST_BE_ENTERED_MSG);
             }else{
                 FileItem fileItem = fileItems.get(0);
                 if( fileItem == null || fileItem.getName() == null || fileItem.getName().length() < 1 || fileItem.getSize() < 0){
-                    return "a file must be entered for this field.";
+                    return i18n.text(FILE_MUST_BE_ENTERED_MSG);
                 }
             }
         }
@@ -174,14 +185,14 @@ public class BasicValidationVTwo {
         // This case may be needed for validation of other field types.
         if( "nonempty".equalsIgnoreCase(validationType)){
             if( isEmpty(value) )
-                return REQUIRED_FIELD_EMPTY_MSG;
+                return i18n.text(REQUIRED_FIELD_EMPTY_MSG);
         }
         // Format validation
         else if("isDate".equalsIgnoreCase(validationType)){
             if( isDate( value))
                 return SUCCESS;
             else
-                return "must be in valid date format mm/dd/yyyy.";
+                return i18n.text(INVALID_DATE_FORM_MSG);
         }
         else if( validationType.indexOf("datatype:") == 0 ) {
             String datatypeURI = validationType.substring(9);
@@ -194,7 +205,7 @@ public class BasicValidationVTwo {
         } else if ("httpUrl".equalsIgnoreCase(validationType)){
         	//check if it has http or https, we could do more but for now this is all.
         	if(! value.startsWith("http://") && ! value.startsWith("https://") ){
-        		return "This URL must start with http:// or https://";
+                return i18n.text(INVALID_URL_MSG);
         	}else{
         		return SUCCESS;
         	}
@@ -216,7 +227,7 @@ public class BasicValidationVTwo {
         		dayParamStr = value.substring(monthDash + 1, value.length());
         		inputC.set(Integer.parseInt(yearParamStr), Integer.parseInt(monthParamStr) - 1, Integer.parseInt(dayParamStr));
         		if(inputC.before(c)) {
-            		return this.DATE_NOT_PAST_MSG;
+            		return i18n.text(DATA_NOT_PAST_MSG);
             		//Returning null makes the error message "field is empty" display instead
             		//return null;
             	} else {
@@ -278,14 +289,9 @@ public class BasicValidationVTwo {
         return (value == null || value.trim().length() == 0);
     }
 
-
-
-    private static Pattern urlRX = Pattern.compile("(([a-zA-Z][0-9a-zA-Z+\\-\\.]*:)/{0,2}[0-9a-zA-Z;/?:@&=+$\\.\\-_!~*'()%]+)(#[0-9a-zA-Z;/?:@&=+$\\.\\-_!~*'()%]+)?");
-
     /** we use null to indicate success */
     public final static String SUCCESS = null;
-    public final static String REQUIRED_FIELD_EMPTY_MSG = "This field must not be empty.";
+
-    public final static String DATE_NOT_PAST_MSG = "Please enter a future target date for publication (past dates are invalid).";
     //public final static String MIN_FIELDS_NOT_POPULATED = "Please enter values for at least ";
     //public final static String FORM_ERROR_FIELD_ID = "formannotationerrors";
     /** regex for strings like "12/31/2004" */

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java

@@ -28,6 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LanguageOption;
 import freemarker.template.Configuration;
 
 public class EditConfigurationUtils {
@@ -66,17 +67,19 @@ public class EditConfigurationUtils {
     }
 
     public static VClass getRangeVClass(VitroRequest vreq) {
-        // This needs a WebappDaoFactory with no filtering/RDFService
-        // funny business because it needs to be able to retrieve anonymous union
-        // classes by their "pseudo-bnode URIs".
-        // Someday we'll need to figure out a different way of doing this.
         WebappDaoFactory ctxDaoFact = ModelAccess.on(
                 vreq.getSession().getServletContext()).getWebappDaoFactory();
         return ctxDaoFact.getVClassDao().getVClassByURI(getRangeUri(vreq));
     }
 
+    public static VClass getLangAwardRangeVClass(VitroRequest vreq) {
+        // UQAM-Linguistic-Management
+        WebappDaoFactory vreqDaoFact = ModelAccess.on(vreq).getWebappDaoFactory(
+                LanguageOption.LANGUAGE_AWARE);
+        return vreqDaoFact.getVClassDao().getVClassByURI(getRangeUri(vreq));
+    }
+    
     //get individual
-
     public static Individual getSubjectIndividual(VitroRequest vreq) {
     	Individual subject = null;
     	String subjectUri = getSubjectUri(vreq);
@@ -126,12 +129,24 @@ public class EditConfigurationUtils {
 
     public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq,
             String predicateUri, String domainUri, String rangeUri) {
-    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    	// WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    	// UQAM-Linguistic-Management Use linguistic context
+        WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE);
     	ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURIs(
     	        predicateUri, domainUri, rangeUri);
     	return objectProp;
     }
 
+	// UQAM Use linguistic context
+    public static ObjectProperty getObjectPropertyForPredicateLangAware(VitroRequest vreq,
+            String predicateUri, String domainUri, String rangeUri) {
+    	// WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    	// UQAM Use linguistic context
+        WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE);
+    	ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURIs(
+    	        predicateUri, domainUri, rangeUri);
+    	return objectProp;
+    }
     public static DataProperty getDataPropertyForPredicate(VitroRequest vreq, String predicateUri) {
     	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
     	//TODO: Check reason for employing unfiltered webapp dao factory and note if using a different version
@@ -209,6 +224,7 @@ public class EditConfigurationUtils {
     	return (op != null && dp == null);
     }
 
+
 	private static boolean isVitroLabel(String predicateUri) {
 		return predicateUri.equals(VitroVocabulary.LABEL);
 	}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java

@@ -366,6 +366,8 @@ public class EditN3GeneratorVTwo {
         {
             sbuff.append("@") ;
             sbuff.append(lang) ;
+            //   added by UQAM to exit at this point without adding datatype
+            return sbuff.toString() ;
         }
 
         // Format the datatype

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java

@@ -10,23 +10,23 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.vocabulary.XSD;
+import org.apache.jena.vocabulary.RDF;
 
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
 
 public class MultiValueEditSubmission {
 
@@ -34,21 +34,31 @@ public class MultiValueEditSubmission {
 
     private Map<String,List<Literal>> literalsFromForm ;
     private Map<String,List<String>> urisFromForm ;
-
     private Map<String,String> validationErrors;
     private BasicValidationVTwo basicValidation;
-
+    
-    private Map<String, List<FileItem>> filesFromForm;
-
     private static Model literalCreationModel;
-
     private String entityToReturnTo;
+    private VitroRequest _vreq;
+
+    private static final String TIME_URI = XSD.time.getURI();
+
 
     static{
         literalCreationModel = ModelFactory.createDefaultModel();
     }
-
+	/*
-    public MultiValueEditSubmission(Map<String,String[]> queryParameters,  EditConfigurationVTwo editConfig){
+	 *  UQAM
+	 *   replace
+	 *   public MultiValueEditSubmission(Map<String,String[]> queryParameters,  EditConfigurationVTwo editConfig)
+	 *   by this new signature
+	 *   This affect PostEditCleanupController and ProcessRdfFormController classes.
+	 *   This replacement is justified by the fact that we need a linguistic context in this class.
+	 */
+    public MultiValueEditSubmission(VitroRequest vreq,  EditConfigurationVTwo editConfig){
+    	// UQAM add this both lines
+		_vreq  = vreq;
+		Map<String,String[]> queryParameters = vreq.getParameterMap();
         if( editConfig == null )
             throw new Error("EditSubmission needs an EditConfiguration");
         this.editKey = editConfig.getEditKey();
@@ -92,11 +102,12 @@ public class MultiValueEditSubmission {
         processEditElementFields(editConfig,queryParameters);
         //Incorporating basic validation
         //Validate URIS
-        this.basicValidation = new BasicValidationVTwo(editConfig, this);
+        this.basicValidation = new BasicValidationVTwo(editConfig, I18n.bundle(vreq));
         Map<String,String> errors = basicValidation.validateUris( urisFromForm );
         //Validate literals and add errors to the list of existing errors
         errors.putAll(basicValidation.validateLiterals( literalsFromForm ));
-        if( errors != null ) {
+        // UQAM Add empty contition
+        if( errors != null  && !errors.isEmpty()) {
             validationErrors.putAll( errors);
         }
 
@@ -141,9 +152,8 @@ public class MultiValueEditSubmission {
             }
         }
     }
-
     /* maybe this could be static */
-    public Literal createLiteral(String value, String datatypeUri, String lang) {
+    public Literal createLiteral_ORIG(String value, String datatypeUri, String lang) {
         if( datatypeUri != null ){
             if( "http://www.w3.org/2001/XMLSchema:anyURI".equals(datatypeUri) ){
                 try {
@@ -159,12 +169,27 @@ public class MultiValueEditSubmission {
             return ResourceFactory.createPlainLiteral(value);
     }
 
-    private static final String DATE_TIME_URI = XSD.dateTime.getURI();
+	/* maybe this could be static */
-    private static final String DATE_URI = XSD.date.getURI();
+	public Literal createLiteral(String value, String datatypeUri, String lang) {
-    private static final String TIME_URI = XSD.time.getURI();
+		if( datatypeUri != null && !datatypeUri.isEmpty() ){
-
+			// UQAM Original code contained tow-dots ':' in place of '#'
-    private static DateTimeFormatter dformater = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:00");
+//            if( "http://www.w3.org/2001/XMLSchema:anyURI".equals(datatypeUri) ){
-    private static DateTimeFormatter dateFormater = DateTimeFormat.forPattern("yyyy-MM-dd");
+			if( XSD.anyURI.getURI().equals(datatypeUri) ){
+//				try {
+//					return literalCreationModel.createTypedLiteral( URLEncoder.encode(value, "UTF8"), datatypeUri);
+					return literalCreationModel.createTypedLiteral( value, datatypeUri);
+//				} catch (UnsupportedEncodingException e) {
+//					log.error(e, e);
+//				}
+			} else if ( XSD.xstring.getURI().equals(datatypeUri) || RDF.dtLangString.getURI().equals(datatypeUri) ){
+				if( lang != null && lang.length() > 0 )	return ResourceFactory.createLangLiteral(value, lang);
+			}
+			return literalCreationModel.createTypedLiteral(value, datatypeUri);
+			// UQAM take into account the linguistic context
+		} else if( lang != null && lang.length() > 0 )
+			return ResourceFactory.createLangLiteral(value, lang);
+		return ResourceFactory.createPlainLiteral(value);
+	}
 
     public Map<String,String> getValidationErrors(){
         return validationErrors;
@@ -264,12 +289,46 @@ public class MultiValueEditSubmission {
         	for(String value:valueList) {
         		value = N3EditUtils.stripInvalidXMLChars(value);
                 //Add to array of literals corresponding to this variable
+        		/* UQAM OLD
                 if (!StringUtils.isEmpty(value)) {
                     literalsArray.add(createLiteral(
                                                 value,
                                                 field.getRangeDatatypeUri(),
                                                 field.getRangeLang()));
                 }
+                */
+        		/*
+        		 * UQAM Replaced by this to take the linguistic context into consideration.
+        		 */
+				if (!StringUtils.isEmpty(value)) {
+					String rangeLang = field.getRangeLang();  //UQAM  Default value
+					try {
+						if (_vreq != null ) {
+							// only if the request comes from the rdfsLabelGenerator the language should be used
+							Boolean getLabelLanguage = false;
+							if (!StringUtils.isBlank(editConfig.formUrl) && editConfig.formUrl.contains("RDFSLabelGenerator")) {
+								getLabelLanguage = true;
+							}
+							// if the language is set in the given Literal, this language-tag should be used and remain the same
+							// for example when you edit an label with an langauge-tag (no matter which language is selected globally)
+							if (!StringUtils.isBlank(editConfig.getLiteralsInScope().get("label").get(0).getLanguage()) && getLabelLanguage)
+							{
+								rangeLang = editConfig.getLiteralsInScope().get("label").get(0).getLanguage();
+							} else { // if the literal has no langauge-tag, use the language which is globally selected
+								rangeLang = _vreq.getLocale().getLanguage();
+								if (!_vreq.getLocale().getCountry().isEmpty()) {
+									rangeLang += "-" + _vreq.getLocale().getCountry();
+								}
+							}
+						}
+
+					} catch (Exception e) {
+					}
+					literalsArray.add(createLiteral(
+							value,
+							field.getRangeDatatypeUri(),
+							rangeLang));
+				}
         	}
         	literalsFromForm.put(var, literalsArray);
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java

@@ -9,15 +9,24 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
+import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.shared.Lock;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.XSD;
+import org.apache.commons.lang3.StringUtils;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
@@ -41,6 +50,7 @@ public class ProcessRdfForm {
     private EditN3GeneratorVTwo populator;
 
     private Map<String,String> urisForNewResources = null;
+//	private VitroRequest _vreq;
    /**
      * Construct the ProcessRdfForm object.
      */
@@ -76,9 +86,9 @@ public class ProcessRdfForm {
 
         AdditionsAndRetractions changes;
         if( configuration.isUpdate() ){
-            changes = editExistingStatements(configuration, submission);
+            changes = editExistingStatements(configuration, submission, vreq); //UQAM  vreq for getting linguistic context
         } else {
-            changes = createNewStatements(configuration, submission );
+            changes = createNewStatements(configuration, submission, vreq ); //UQAM vreq for getting linguistic context
         }
 
         changes = getMinimalChanges(changes);
@@ -99,12 +109,15 @@ public class ProcessRdfForm {
      * any optional N3 is to originally configure the
      * configuration.setN3Optional() to be empty.
      *
+     * UQAM add vreq for linguistic context managing
+     *
      * @throws Exception May throw an exception if the required N3
      * does not parse.
+     *
      */
     private AdditionsAndRetractions createNewStatements(
             EditConfigurationVTwo configuration,
-            MultiValueEditSubmission submission) throws Exception {
+            MultiValueEditSubmission submission, VitroRequest vreq) throws Exception {
         log.debug("in createNewStatements()" );
 
         //getN3Required and getN3Optional will return copies of the
@@ -113,10 +126,10 @@ public class ProcessRdfForm {
         List<String> optionalN3 = configuration.getN3Optional();
 
         /* substitute in the form values and existing values */
-        subInValuesToN3( configuration, submission, requiredN3, optionalN3, null , null);
+        subInValuesToN3( configuration, submission, requiredN3, optionalN3, null , null, vreq);
 
         /* parse N3 to RDF Models, No retractions since all of the statements are new. */
-        return parseN3ToChange(requiredN3, optionalN3, null, null);
+        return parseN3ToChange(requiredN3, optionalN3, null, null, vreq, null);
     }
 
     /* for a list of N3 strings, substitute in the subject, predicate and object URIs
@@ -140,10 +153,12 @@ public class ProcessRdfForm {
      * retractions are mutually diff'ed before statements are added to or
      * removed from the model. The explicit change check can cause problems in
      * more complex setups, like the automatic form building in DataStaR.
+     * @param vreq For getting linguistic context
+
      */
     protected AdditionsAndRetractions editExistingStatements(
             EditConfigurationVTwo editConfig,
-            MultiValueEditSubmission submission) throws Exception {
+            MultiValueEditSubmission submission, VitroRequest vreq) throws Exception {
 
         log.debug("editing an existing resource: " + editConfig.getObject() );
 
@@ -156,18 +171,18 @@ public class ProcessRdfForm {
 
         subInValuesToN3(editConfig, submission,
                 N3RequiredAssert, N3OptionalAssert,
-                N3RequiredRetract, N3OptionalRetract);
+                N3RequiredRetract, N3OptionalRetract, vreq);
 
         return parseN3ToChange(
                 N3RequiredAssert,N3OptionalAssert,
-                N3RequiredRetract, N3OptionalRetract);
+                N3RequiredRetract, N3OptionalRetract, vreq, editConfig);
     }
 
     @SuppressWarnings("unchecked")
     protected void subInValuesToN3(
             EditConfigurationVTwo editConfig, MultiValueEditSubmission submission,
             List<String> requiredAsserts, List<String> optionalAsserts,
-            List<String> requiredRetracts, List<String> optionalRetracts ) throws InsertException{
+            List<String> requiredRetracts, List<String> optionalRetracts, VitroRequest vreq ) throws InsertException{
 
         //need to substitute into the return to URL becase it may need new resource URIs
         List<String> URLToReturnTo = Arrays.asList(submission.getEntityToReturnTo());
@@ -184,7 +199,41 @@ public class ProcessRdfForm {
         //Retractions does NOT get values from form.
 
         /* ******** Form submission Literals *********** */
-        substituteInMultiLiterals( submission.getLiteralsFromForm(), requiredAsserts, optionalAsserts, URLToReturnTo);
+        /*
+         * UQAM Set all literals in the linguistic context
+         */
+        Map<String, List<Literal>> literalsFromForm = submission.getLiteralsFromForm();
+    	Set<String> keys = literalsFromForm.keySet();
+        for (String aKey : keys) {
+			List<Literal> literalFromForm = literalsFromForm.get(aKey);
+			List<Literal> newLiteralFromForm = new ArrayList<>();
+            for (Literal aLiteral : literalFromForm) {
+                if (aLiteral != null) {
+                    String aLiteratDT = aLiteral.getDatatype().getURI();
+                    Literal newLiteral = null;
+                    String aText = aLiteral.getLexicalForm();
+                    /*
+                     * do it only if aLiteral are xstring datatype
+                     */
+                    if (RDF.dtLangString.getURI().equals(aLiteratDT) && !aLiteral.getLanguage().isEmpty()) {
+                        newLiteral = aLiteral;
+                    }
+                    else if (XSD.xstring.getURI().equals(aLiteratDT) || RDF.dtLangString.getURI().equals(aLiteratDT)) {
+                        String lang = vreq.getLocale().getLanguage();
+                        if (!vreq.getLocale().getCountry().isEmpty()) {
+                            lang += "-" + vreq.getLocale().getCountry();
+                        }
+                        newLiteral = ResourceFactory.createLangLiteral(aText, lang);
+                    } else {
+                        newLiteral = ResourceFactory.createTypedLiteral(aText, aLiteral.getDatatype());
+                    }
+                    newLiteralFromForm.add(newLiteral);
+                }
+			}
+			literalsFromForm.replace(aKey, newLiteralFromForm);
+		}
+
+        substituteInMultiLiterals( literalsFromForm, requiredAsserts, optionalAsserts, URLToReturnTo);
         logSubstitue( "Added form Literals", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts);
         //Retractions does NOT get values from form.
 
@@ -254,20 +303,106 @@ public class ProcessRdfForm {
 
     protected AdditionsAndRetractions parseN3ToChange(
             List<String> requiredAdds, List<String> optionalAdds,
-            List<String> requiredDels, List<String> optionalDels) throws Exception{
+            List<String> requiredDels, List<String> optionalDels, VitroRequest vreq, EditConfigurationVTwo editConfig) throws Exception{
 
         List<Model> adds = parseN3ToRDF(requiredAdds, REQUIRED);
         adds.addAll( parseN3ToRDF(optionalAdds, OPTIONAL));
-
         List<Model> retracts = new ArrayList<Model>();
         if( requiredDels != null && optionalDels != null ){
-            retracts.addAll( parseN3ToRDF(requiredDels, REQUIRED) );
+            String lingCxt=null;
-            retracts.addAll( parseN3ToRDF(optionalDels, OPTIONAL) );
+            //UQAM Taking into account the linguistic context in retract
+            try {
+                // only if the request comes from the rdfsLabelGenerator the language should be used
+                Boolean getLabelLanguage = false;
+                if (!StringUtils.isBlank(editConfig.formUrl) && editConfig.formUrl.contains("RDFSLabelGenerator")) {
+                    getLabelLanguage = true;
+                }
+                // if the language is set in the given Literal, this language-tag should be used and remain the same
+                // for example when you edit an label with an langauge-tag (no matter which language is selected globally)
+                if (editConfig != null && !StringUtils.isBlank(editConfig.getLiteralsInScope().get("label").get(0).getLanguage()) && getLabelLanguage) {
+                    lingCxt = editConfig.getLiteralsInScope().get("label").get(0).getLanguage();
+                } else { // if the literal has no langauge-tag, use the language which is globally selected
+                    lingCxt = vreq.getLocale().getLanguage();
+                    if (!vreq.getLocale().getCountry().isEmpty()) {
+                        lingCxt += "-" + vreq.getLocale().getCountry();
+                    }
+                }
+            } catch (Exception e) {
+            }
+            retracts.addAll( parseN3ToRDF(requiredDels, REQUIRED, lingCxt) );
+            retracts.addAll( parseN3ToRDF(optionalDels, OPTIONAL, lingCxt) );
         }
 
         return new AdditionsAndRetractions(adds,retracts);
     }
+    /**
+     * Parse the n3Strings to a List of RDF Model objects.
+     *
+     * @param n3Strings N3 Strings to parse
+     * @param parseType if OPTIONAL, then don't throw exceptions on errors
+     * @param linguisticContext For Literals, Making parse only if the literal linguisticContext are same than  linguisticContext parameter //UQAM
+     * If REQUIRED, then throw exceptions on errors.
+     * @throws Exception
+     */
+    protected static List<Model> parseN3ToRDF(
+            List<String> n3Strings, N3ParseType parseType, String linguisticContext ) throws Exception {
+        // Use non-linguistic version of this method if no linguisticContext is provided
+        if (linguisticContext == null) {
+            return parseN3ToRDF(n3Strings, parseType);
+        }
 
+        List<String> errorMessages = new ArrayList<String>();
+
+        List<Model> rdfModels = new ArrayList<Model>();
+        for(String n3 : n3Strings){
+            try{
+                Model model = ModelFactory.createDefaultModel();
+                StringReader reader = new StringReader(n3);
+                model.read(reader, "", "N3");
+                List<Statement> stmts = model.listStatements().toList();
+                for (Iterator iterator = stmts.iterator(); iterator.hasNext();) {
+					Statement stmt = (Statement) iterator.next();
+					Resource subj = stmt.getSubject();
+					Property pred = stmt.getPredicate();
+					RDFNode obj = stmt.getObject();
+					if (obj.isLiteral()) {
+						Literal lit = obj.asLiteral();
+						String lang = lit.getLanguage();
+						if (! linguisticContext.equals(lang)) {
+							//UQAM Remove if linguisticContext != lang of the Literal
+							model.remove(subj, pred, obj);
+						}
+					}
+
+				}
+                rdfModels.add( model );
+            }catch(Throwable t){
+                errorMessages.add(t.getMessage() + "\nN3: \n" + n3 + "\n");
+            }
+        }
+
+        StringBuilder errors = new StringBuilder();
+        for( String errorMsg : errorMessages){
+            errors.append(errorMsg).append('\n');
+        }
+
+       if( !errorMessages.isEmpty() ){
+           if( REQUIRED.equals(parseType)  ){
+               throw new Exception("Errors processing required N3. The EditConfiguration should " +
+                    "be setup so that if a submission passes validation, there will not be errors " +
+                    "in the required N3.\n" +  errors );
+           }else if( OPTIONAL.equals(parseType) ){
+               log.debug("Some Optional N3 did not parse, if a optional N3 does not parse it " +
+                    "will be ignored.  This allows optional parts of a form submission to " +
+                    "remain unfilled out and then the optional N3 does not get values subsituted in from" +
+                    "the form submission values.  It may also be the case that there are unintentional " +
+                    "syntax errors the optional N3." );
+               log.debug(errors.toString());
+           }
+       }
+
+       return rdfModels;
+    }
     /**
      * Parse the n3Strings to a List of RDF Model objects.
      *
@@ -479,4 +614,4 @@ public class ProcessRdfForm {
 
 
    private static Log log = LogFactory.getLog(ProcessRdfForm.class);
-}
+}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java

@@ -7,6 +7,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -40,7 +41,8 @@ public class ChildVClassesOptions implements FieldOptions {
     public Map<String, String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact) throws Exception{
+            WebappDaoFactory wDaoFact,
+            I18nBundle i18n) throws Exception{
         // now create an empty HashMap to populate and return
         HashMap <String,String> optionsMap = new LinkedHashMap<String,String>();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java

@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
 
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -15,6 +15,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 public class ChildVClassesWithParent implements FieldOptions {
 
@@ -37,20 +38,24 @@ public class ChildVClassesWithParent implements FieldOptions {
         return this;
     }
 
-    @Override
+/*
+ * UQAM-Linguistic-Management
+ * This method is polymorphism of getOptions(EditConfigurationVTwo editConfig,String fieldName, WebappDaoFactory wDaoFact)
+ * for the internationalization of word "other" in the scroling list of personHasAdvisorRelationship.ftl
+ */
     public Map<String, String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact) throws Exception {
+            WebappDaoFactory wDaoFact,
-
+            I18nBundle i18n) throws Exception {
         HashMap <String,String> optionsMap = new LinkedHashMap<String,String>();
         // first test to see whether there's a default "leave blank" value specified with the literal options
         if ( ! StringUtils.isEmpty( defaultOptionLabel ) ){
             optionsMap.put(LEFT_BLANK, defaultOptionLabel);
         }
-
+        String other_i18n = i18n.text("other");
-        optionsMap.put(classUri, "Other");
+        // first character in capital
-
+        optionsMap.put(classUri, other_i18n.substring(0, 1).toUpperCase() + other_i18n.substring(1));
         VClassDao vclassDao = wDaoFact.getVClassDao();
         List<String> subClassList = vclassDao.getAllSubClassURIs(classUri);
         if (subClassList != null && subClassList.size() > 0) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java

@@ -10,6 +10,7 @@ import java.util.Map;
 
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 public class ConstantFieldOptions implements FieldOptions {
 
@@ -54,7 +55,8 @@ public class ConstantFieldOptions implements FieldOptions {
     public Map<String, String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact) throws Exception {
+            WebappDaoFactory wDaoFact,
+            I18nBundle i18n) throws Exception {
         // originally not auto-sorted but sorted now, and empty values not removed or replaced
         HashMap <String,String> optionsMap = new LinkedHashMap<String,String>();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 /**
  * Represents an object that can return a list of options
@@ -28,7 +29,8 @@ public interface FieldOptions {
     public Map<String,String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact) throws Exception;
+            WebappDaoFactory wDaoFact,
+            I18nBundle i18n) throws Exception;
 
     /*
      * Certain field options may have custom sorting requirements. If no sorting requirements exist,

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 public class IndividualsViaClassGroupOptions implements FieldOptions {
 
@@ -27,7 +28,8 @@ public class IndividualsViaClassGroupOptions implements FieldOptions {
     public Map<String, String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact) throws Exception {
+            WebappDaoFactory wDaoFact,
+            I18nBundle i18n) throws Exception {
         throw new Error("not implemented");
     }
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java

@@ -11,6 +11,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -77,7 +78,8 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
     public Map<String, String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact) {
+            WebappDaoFactory wDaoFact,
+            I18nBundle i18n) {
         HashMap<String, String> optionsMap = new LinkedHashMap<String, String>();
         int optionsCount = 0;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -90,7 +91,8 @@ public class IndividualsViaSearchQueryOptions extends IndividualsViaVClassOption
     public Map<String, String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact) throws Exception {
+            WebappDaoFactory wDaoFact,
+            I18nBundle i18n) throws Exception {
 
     	 Map<String, Individual> individualMap = new HashMap<String, Individual>();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java

@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -48,7 +49,8 @@ public class IndividualsViaVClassOptions implements FieldOptions {
     public Map<String, String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact) throws Exception {
+            WebappDaoFactory wDaoFact,
+            I18nBundle i18n) throws Exception {
 
         Map<String, Individual> individualMap = new HashMap<String, Individual>();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 public class RdfTypeOptions implements FieldOptions {
 
@@ -29,7 +30,8 @@ public class RdfTypeOptions implements FieldOptions {
     public Map<String, String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wdf) {
+            WebappDaoFactory wdf,
+            I18nBundle i18n) {
         Map<String,String> uriToLabel = new HashMap<String,String>();
 
         for (String uri : typeURIs) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java

@@ -11,6 +11,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -25,7 +27,8 @@ public class SelectListGeneratorVTwo {
     public static Map<String,String> getOptions(
             EditConfigurationVTwo editConfig,
             String fieldName,
-            WebappDaoFactory wDaoFact){
+            WebappDaoFactory wDaoFact,
+            I18nBundle i18n){
 
 
         if( editConfig == null ){
@@ -48,13 +51,51 @@ public class SelectListGeneratorVTwo {
         }
 
         try {
-            return field.getFieldOptions().getOptions(editConfig,fieldName,wDaoFact);
+            return field.getFieldOptions().getOptions(editConfig,fieldName,wDaoFact,i18n);
         } catch (Exception e) {
             log.error("Error runing getFieldOptionis()",e);
             return Collections.emptyMap();
         }
     }
 
+    // UQAM Overcharge method for linguistic contexte processisng
+    // AWoods: This method appears to never be invoked.
+	public static Map<String,String> getOptions(
+			EditConfigurationVTwo editConfig,
+			String fieldName,
+			VitroRequest vreq){
+
+
+		if( editConfig == null ){
+			log.error( "fieldToSelectItemList() must be called with a non-null EditConfigurationVTwo ");
+			return Collections.emptyMap();
+		}
+		if( fieldName == null ){
+			log.error( "fieldToSelectItemList() must be called with a non-null fieldName");
+			return Collections.emptyMap();
+		}
+
+		FieldVTwo field = editConfig.getField(fieldName);
+		if (field==null) {
+			log.error("no field \""+fieldName+"\" found from editConfig.");
+			return Collections.emptyMap();
+		}
+
+		if( field.getFieldOptions() == null ){
+			return Collections.emptyMap();
+		}
+
+		try {
+			//UQAM need vreq instead of WebappDaoFactory
+			Map<String, String> parentClass = Collections.emptyMap();
+			FieldOptions fieldOptions = field.getFieldOptions();
+			return fieldOptions.getOptions(editConfig,fieldName,vreq.getWebappDaoFactory(), I18n.bundle(vreq));
+		} catch (Exception e) {
+			log.error("Error runing getFieldOptionis()",e);
+			return Collections.emptyMap();
+		}
+	}
+
 
     //Methods to sort the options map
     // from http://forum.java.sun.com/thread.jspa?threadID=639077&messageID=4250708

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java

@@ -16,6 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.IdModelSelector;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.StandardModelSelector;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LanguageOption;
 
 public abstract class BaseEditConfigurationGenerator implements EditConfigurationGenerator {
 
@@ -63,6 +64,7 @@ public abstract class BaseEditConfigurationGenerator implements EditConfiguratio
         setupModelSelectorsFromVitroRequest(vreq, editConfig);
 
         OntModel queryModel = ModelAccess.on(vreq).getOntModel();
+        OntModel languageNeutralModel = vreq.getLanguageNeutralUnionFullModel();
 
         if( editConfig.getSubjectUri() == null)
             editConfig.setSubjectUri( EditConfigurationUtils.getSubjectUri(vreq));
@@ -78,7 +80,10 @@ public abstract class BaseEditConfigurationGenerator implements EditConfiguratio
             editConfig.prepareForObjPropUpdate(queryModel);
         } else if( dataKey != null ) { // edit of a data prop statement
             //do nothing since the data prop form generator must take care of it
-            editConfig.prepareForDataPropUpdate(queryModel, vreq.getWebappDaoFactory().getDataPropertyDao());
+            // Use language-neutral model to ensure that a data property statement
+            // is found for any literal hash, even if the UI locale is changed.
+            editConfig.prepareForDataPropUpdate(languageNeutralModel,
+                    vreq.getWebappDaoFactory().getDataPropertyDao());
         } else{
             //this might be a create new or a form
             editConfig.prepareForNonUpdate(queryModel);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java

@@ -350,7 +350,7 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from
-		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
+		OntModel model = ModelAccess.on(vreq).getOntModel();
     	//if object property
     	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){
 	    	Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java

@@ -28,9 +28,7 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
 	private Integer dataHash = 0;
 	private DataPropertyStatement dps = null;
 	private String dataLiteral = null;
-	private String propertyTemplate = "confirmDeletePropertyForm.ftl";
+	private String template = "confirmDeletePropertyForm.ftl";
-	private String individualTemplate = "confirmDeleteIndividualForm.ftl";
-
 
 	//In this case, simply return the edit configuration currently saved in session
 	//Since this is forwarding from another form, an edit configuration should already exist in session
@@ -45,32 +43,12 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
     	if(editConfiguration == null) {
     		editConfiguration = setupEditConfiguration(vreq, session);
     	}
+    	editConfiguration.setTemplate(template);
     	//prepare update?
     	prepare(vreq, editConfiguration);
-    	if (editConfiguration.getPredicateUri() == null && editConfiguration.getSubjectUri() == null) {
-    		editConfiguration.setTemplate(individualTemplate);
-    		addDeleteParams(vreq, editConfiguration);
-    	}else {
-    		editConfiguration.setTemplate(propertyTemplate);
-    	}
     	return editConfiguration;
     }
 
-	private void addDeleteParams(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-		String redirectUrl = vreq.getParameter("redirectUrl");
-		if (redirectUrl != null) {
-			editConfiguration.addFormSpecificData("redirectUrl", redirectUrl);
-		}
-		String individualName = vreq.getParameter("individualName");
-		if (redirectUrl != null) {
-			editConfiguration.addFormSpecificData("individualName", individualName);
-		}
-		String individualType = vreq.getParameter("individualType");
-		if (redirectUrl != null) {
-			editConfiguration.addFormSpecificData("individualType", individualType);
-		}
-	}
-
 	private EditConfigurationVTwo  setupEditConfiguration(VitroRequest vreq, HttpSession session) {
 		EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
 		initProcessParameters(vreq, session, editConfiguration);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java

@@ -2,6 +2,8 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LANGUAGE_NEUTRAL;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.POLICY_NEUTRAL;
 import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY;
 
 import java.util.ArrayList;
@@ -35,6 +37,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsVi
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LanguageOption;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.PolicyOption;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngineException;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchQuery;
@@ -125,7 +129,10 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
         // Someday we'll need to figure out a different way of doing this.
         //WebappDaoFactory ctxDaoFact = ModelAccess.on(
         //        vreq.getSession().getServletContext()).getWebappDaoFactory();
-        WebappDaoFactory ctxDaoFact = vreq.getLanguageNeutralWebappDaoFactory();
+//        WebappDaoFactory ctxDaoFact = vreq.getLanguageNeutralWebappDaoFactory();
+		//UQAM Linguistic-Management Manage linguistic context
+        WebappDaoFactory ctxDaoFact =  ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE, PolicyOption.POLICY_NEUTRAL);
+
 
         List<VClass> types = new ArrayList<VClass>();
     	Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
@@ -460,7 +467,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from
-		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
+		OntModel model = ModelAccess.on(vreq).getOntModel();
     	//if object property
     	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){
 	    	Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java

@@ -15,6 +15,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.http.HttpSession;
 
@@ -41,6 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.FoafNameToRdfsLabelPreprocessor;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ManageLabelsForIndividualPreprocessor;
 import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataPropertyStatementTemplateModel;
 
 /**
@@ -202,12 +204,12 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 
 	private void addFormSpecificData(EditConfigurationVTwo config,
 			VitroRequest vreq) {
-		//Get all language codes/labels in the system, and this list is sorted by language name
+	    //the labels already added by the user
-        List<HashMap<String, String>> locales = this.getLocales(vreq);
+        ArrayList<Literal> existingLabels = this.getExistingLabels(config.getSubjectUri(), vreq);
+		//Get language codes/labels for languages present in the existing labels
+        List<HashMap<String, String>> locales = this.getLocales(vreq, existingLabels);
         //Get code to label hashmap - we use this to get the language name for the language code returned in the rdf literal
-        HashMap<String, String> localeCodeToNameMap = this.getFullCodeToLanguageNameMap(locales);
+        HashMap<String, String> localeCodeToNameMap = this.getFullCodeToLanguageNameMap(locales);		
-		//the labels already added by the user
-		ArrayList<Literal> existingLabels = this.getExistingLabels(config.getSubjectUri(), vreq);
 		int numberExistingLabels = existingLabels.size();
 		//existing labels keyed by language name and each of the list of labels is sorted by language name
 		HashMap<String, List<LabelInformation>> existingLabelsByLanguageName = this.getLabelsSortedByLanguageName(existingLabels, localeCodeToNameMap, config, vreq);
@@ -224,6 +226,20 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 		 config.addFormSpecificData("displayRemoveLink", (numberExistingLabels > 1));
 
 
+		// get current selected locale
+		String rangeLang = vreq.getLocale().getLanguage();
+		if (!vreq.getLocale().getCountry().isEmpty()) {
+			rangeLang += "-" + vreq.getLocale().getCountry();
+		}
+
+		// check if locale already has an entry (label)
+		boolean localeEntryExisting = true;
+		for (HashMap<String, String> tmp : availableLocalesForAdd) {
+			if (tmp.get("code").equals(rangeLang)) localeEntryExisting = false;
+		}
+		config.addFormSpecificData("localeEntryExisting", localeEntryExisting);
+		config.addFormSpecificData("currentSelectedLocale", rangeLang);
+
         //How do we edit? Will need to see
         config.addFormSpecificData("deleteWebpageUrl", "/edit/primitiveDelete");
 
@@ -359,8 +375,9 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 
         ArrayList<Literal>  labels = new ArrayList<Literal>();
         try {
-        	//We want to get the labels for all the languages, not just the display language
+        	// Get results filtered to current locale so as to be consistent
-            ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
+            // with other editing forms.
+            ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
             while (results.hasNext()) {
                 QuerySolution soln = results.nextSolution();
                 Literal nodeLiteral = soln.get("label").asLiteral();
@@ -387,30 +404,32 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
     	return template;
     }
 
+    //get locales present in list of literals
+    public List<HashMap<String, String>> getLocales(VitroRequest vreq, 
+            List<Literal> existingLiterals) {
+        Set<Locale> locales = new HashSet<Locale>();
+        for(Literal literal : existingLiterals) {
+            String language = literal.getLanguage();
+            if(!StringUtils.isEmpty(language)) {
+                locales.add(LanguageFilteringUtils.languageToLocale(language));
+            }
+        }
+        if (locales.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<HashMap<String, String>> list = new ArrayList<HashMap<String, String>>();
+        Locale currentLocale = SelectedLocale.getCurrentLocale(vreq);
+        for (Locale locale : locales) {
+            try {
+                list.add(buildLocaleMap(locale, currentLocale));
+            } catch (FileNotFoundException e) {
+                log.warn("Can't show locale '" + locale + "': " + e);
+            }
+        }
 
-
+        return list;
-    //get locales
-    public List<HashMap<String, String>> getLocales(VitroRequest vreq) {
-    	List<Locale> selectables = SelectedLocale.getSelectableLocales(vreq);
-		if (selectables.isEmpty()) {
-			return Collections.emptyList();
-		}
-		List<HashMap<String, String>> list = new ArrayList<HashMap<String, String>>();
-		Locale currentLocale = SelectedLocale.getCurrentLocale(vreq);
-		for (Locale locale : selectables) {
-			try {
-				list.add(buildLocaleMap(locale, currentLocale));
-			} catch (FileNotFoundException e) {
-				log.warn("Can't show the Locale selector for '" + locale
-						+ "': " + e);
-			}
-		}
-
-		return list;
     }
 
-
-
     public HashMap<String, String> getFullCodeToLanguageNameMap(List<HashMap<String, String>> localesList) {
     	HashMap<String, String> codeToLanguageMap = new HashMap<String, String>();
     	for(Map<String, String> locale: localesList) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java

@@ -233,7 +233,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from
-		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
+		OntModel model = ModelAccess.on(vreq).getOntModel();
     	//This form is always doing a non-update
     	editConfiguration.prepareForNonUpdate( model );
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java

@@ -298,7 +298,7 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from
-		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
+		OntModel model = ModelAccess.on(vreq).getOntModel();
 		if( editConfiguration.isDataPropertyUpdate() ){
     		editConfiguration.prepareForDataPropUpdate(model, vreq.getWebappDaoFactory().getDataPropertyDao());
 		}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/LimitRemovalsToLanguage.java

@@ -0,0 +1,92 @@
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
+
+/**
+ * A model change preprocessor that discards triples with language tags
+ * in the retractionsModel that do not match the specified language, unless
+ * the additionsModel also contains a new value for the same subject and 
+ * predicate in that language, or no values in any language are added for the 
+ * same subject and predicate (such as when an entire resource is deleted) .
+ */
+public class LimitRemovalsToLanguage implements ModelChangePreprocessor {
+
+    private static final Log log = LogFactory.getLog(LimitRemovalsToLanguage.class);
+    private String language;
+    
+    /**
+     * @param locale the Java locale object representing the language
+     * to which edits should be limited.  May not be null.
+     */
+    public LimitRemovalsToLanguage(Locale locale) {
+        if(locale == null) {
+            throw new IllegalArgumentException("Locale may not be null.");    
+        }            
+        this.language = LanguageFilteringUtils.localeToLanguage(locale);
+    }
+    
+    /**
+     * @param language string representing the RDF language tag to which
+     * edits should be limited. May not be null.
+     */
+    public LimitRemovalsToLanguage(String language) {
+        if(language == null) {
+            throw new IllegalArgumentException("Language may not be null.");    
+        }
+        this.language = language;
+    }
+    
+    @Override
+    public void preprocess(Model retractionsModel, Model additionsModel,
+            HttpServletRequest request) {                 
+        log.debug("limiting changes to " + language);
+        List<Statement> eliminatedRetractions = new ArrayList<Statement>();
+        StmtIterator sit = retractionsModel.listStatements();
+        while(sit.hasNext()) {
+            Statement stmt = sit.next();
+            if(stmt.getObject().isLiteral()) {
+                Literal lit = stmt.getObject().asLiteral();
+                if(!StringUtils.isEmpty(lit.getLanguage()) 
+                        && !lit.getLanguage().equals(language)) {
+                    boolean eliminateRetraction = true;
+                    StmtIterator replacements = additionsModel
+                            .listStatements(stmt.getSubject(), 
+                                    stmt.getPredicate(), (RDFNode) null);
+                    if(!replacements.hasNext()) {
+                        eliminateRetraction = false;
+                    } else {
+                        while(replacements.hasNext()) {
+                            Statement replacement = replacements.next();
+                            if(replacement.getObject().isLiteral() 
+                                    && lit.getLanguage().equals(replacement
+                                            .getObject().asLiteral()
+                                            .getLanguage())) {
+                                eliminateRetraction = false;
+                            }
+                        }
+                    }
+                    if(eliminateRetraction) {
+                        eliminatedRetractions.add(stmt);
+                    }
+                }
+            }
+        }
+        retractionsModel.remove(eliminatedRetractions);
+    }
+
+}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java

@@ -78,9 +78,6 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 		} else if(MANAGE_MENUS_FORM.equals(vreq.getParameter("editForm"))) {
 		    return SimplePermission.MANAGE_MENUS.ACTION;
 		}
-		if (isIndividualDeletion(vreq)) {
-			return SimplePermission.DO_BACK_END_EDITING.ACTION;
-		}
 		// Check if this statement can be edited here and return unauthorized if not
 		String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
 		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
@@ -109,16 +106,6 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 		return isAuthorized? SimplePermission.DO_FRONT_END_EDITING.ACTION: AuthorizationRequest.UNAUTHORIZED;
 	}
 
-	private boolean isIndividualDeletion(VitroRequest vreq) {
-		String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
-		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-		String objectUri = EditConfigurationUtils.getObjectUri(vreq);
-		if (objectUri != null && subjectUri == null && predicateUri == null && isDeleteForm(vreq)) {
-			return true;
-		}
-		return false;
-	}
-
 	@Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
@@ -169,7 +156,7 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
          templateData.put("editConfiguration", etm);
          templateData.put("editSubmission", submissionTemplateModel);
          //Corresponding to original note for consistency with selenium tests and 1.1.1
-         templateData.put("title", "Edit");
+         templateData.put("title", etm.getPageTitle());
          templateData.put("submitUrl", getSubmissionUrl(vreq));
          templateData.put("cancelUrl", etm.getCancelUrl());
          templateData.put("editKey", editConfig.getEditKey());
@@ -376,7 +363,7 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
          String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
          String formParam = getFormParam(vreq);
          //if no form parameter, then predicate uri and subject uri must both be populated
-    	if ((formParam == null || "".equals(formParam)) && !isDeleteForm(vreq)) {
+    	if (formParam == null || "".equals(formParam)) {
             if ((predicateUri == null || predicateUri.trim().length() == 0)) {
             	return true;
             }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java

@@ -74,9 +74,11 @@ public class PostEditCleanupController extends FreemarkerHttpServlet{
         //The submission for getting the entity to return to is not retrieved from the session but needs
         //to be created - as it is in processRdfForm3.jsp
         if( entityToReturnTo == null ){
-            //this will not work if there entityToReturnTo has a new resource URI,
+            // this will not work if there entityToReturnTo has a new resource URI,
-            //in that case entityToReturnTo should not have been passed to this method as null
+            // in that case entityToReturnTo should not have been passed to this method as null
-            MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), editConfig);
+        	// UQAM-Linguistic-Management
+        	// MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), editConfig);
+            MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, editConfig);
             entityToReturnTo = N3EditUtils.processEntityToReturnTo(editConfig, submission, vreq);
         }
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java

@@ -8,10 +8,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.annotation.WebServlet;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.Property;
@@ -37,8 +38,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmis
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.ProcessRdfForm;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.RdfLiteralHash;
-
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.LimitRemovalsToLanguage;
-import javax.servlet.annotation.WebServlet;
 
 /**
  * This servlet will convert a request to an EditSubmission,
@@ -66,7 +66,9 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
             return handleMissingConfiguration(vreq);
 
         //get the EditSubmission
-        MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), configuration);
+ //       MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), configuration);
+        // Modified by UQAM-Linguistic-Management
+        MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, configuration);
         EditSubmissionUtils.putEditSubmissionInSession(vreq.getSession(), submission);
 
         //if errors, return error response
@@ -101,8 +103,11 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
 		if( configuration.isUseDependentResourceDelete() )
 		    changes = ProcessRdfForm.addDependentDeletes(changes, queryModel);
 
+		// prevent form from removing literals in languages other than the one
+		// associated with the current request
+		configuration.addModelChangePreprocessor(new LimitRemovalsToLanguage(vreq.getLocale()));
 		N3EditUtils.preprocessModels(changes, configuration, vreq);
-
+		
 		ProcessRdfForm.applyChangesToWriteModel(changes, queryModel, writeModel, N3EditUtils.getEditorUri(vreq) );
 
 		//Here we are trying to get the entity to return to URL,

api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java

@@ -35,6 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.impl.RequestModelAccessImpl;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 
 /**
@@ -88,8 +89,10 @@ public class ModelSwitcher {
 
     	// If they asked for the display model, give it to them.
 		if (isParameterPresent(vreq, SWITCH_TO_DISPLAY_MODEL)) {
-			OntModel mainOntModel = ModelAccess.on(_context).getOntModel(DISPLAY);
+			OntModel mainOntModel = LanguageFilteringUtils.wrapOntModelInALanguageFilter(
-			OntModel tboxOntModel = ModelAccess.on(_context).getOntModel(DISPLAY_TBOX);
+			        ModelAccess.on(vreq).getOntModel(DISPLAY), vreq);
+			OntModel tboxOntModel = LanguageFilteringUtils.wrapOntModelInALanguageFilter(
+			        ModelAccess.on(vreq).getOntModel(DISPLAY_TBOX), vreq);
 	   		setSpecialWriteModel(vreq, mainOntModel);
 
 	   		vreq.setAttribute(VitroRequest.ID_FOR_ABOX_MODEL, VitroModelSource.ModelName.DISPLAY.toString());

api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java

@@ -63,6 +63,7 @@ public class PageRoutingFilter implements Filter{
         // get URL without hostname or servlet context
         HttpServletResponse response = (HttpServletResponse) arg1;
         HttpServletRequest req = (HttpServletRequest) arg0;
+
         String path = req.getRequestURI().substring(req.getContextPath().length());
 
         // check for first part of path

api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java

@@ -6,6 +6,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.ServletContext;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java

@@ -304,7 +304,6 @@ public class FreemarkerConfigurationImpl extends Configuration {
 			urls.put("home", UrlBuilder.getHomeUrl());
 			urls.put("about", UrlBuilder.getUrl(Route.ABOUT));
 			urls.put("search", UrlBuilder.getUrl(Route.SEARCH));
-			urls.put("customsearch", UrlBuilder.getUrl(Route.CUSTOMSEARCH));
 			urls.put("termsOfUse", UrlBuilder.getUrl(Route.TERMS_OF_USE));
 			urls.put("login", UrlBuilder.getLoginUrl());
 			urls.put("logout", UrlBuilder.getLogoutUrl());

api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java

@@ -8,6 +8,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -20,7 +21,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings;
 import edu.cornell.mannlib.vitro.webapp.utils.developer.Key;
 
@@ -49,12 +52,27 @@ public class I18n {
 	 * This is where the work gets done. Not declared final, so it can be
 	 * modified in unit tests.
 	 */
-	private static I18n instance = new I18n();
+	private static I18n instance;
+
+	private final ServletContext ctx;
+
+	protected I18n(ServletContext ctx) {
+		this.ctx = ctx;
+	}
 
 	// ----------------------------------------------------------------------
 	// Static methods
 	// ----------------------------------------------------------------------
 
+	/**
+	 * This setup method must be called before I18n static methods can be used.
+	 * It is currently called from LocaleSelectionSetup.contextInitialized, which
+	 * should ensure it is called when the context is initialized.
+	 */
+	public static void setup(ServletContext ctx) {
+		I18n.instance = new I18n(ctx);
+	}
+
 	/**
 	 * A convenience method to get a bundle and format the text.
 	 */
@@ -72,19 +90,26 @@ public class I18n {
 	}
 
 	/**
-	 * Get a I18nBundle by this name.
+	 * Get a request I18nBundle by this name.
 	 */
 	public static I18nBundle bundle(String bundleName, HttpServletRequest req) {
 		return instance.getBundle(bundleName, req);
 	}
 
 	/**
-	 * Get the default I18nBundle.
+	 * Get the default request I18nBundle.
 	 */
 	public static I18nBundle bundle(HttpServletRequest req) {
 		return instance.getBundle(DEFAULT_BUNDLE_NAME, req);
 	}
 
+	/**
+	 * Get the default context I18nBundle for preferred locales.
+	 */
+	public static I18nBundle bundle(List<Locale> preferredLocales) {
+		return instance.getBundle(DEFAULT_BUNDLE_NAME, preferredLocales);
+	}
+
 	// ----------------------------------------------------------------------
 	// The instance
 	// ----------------------------------------------------------------------
@@ -106,25 +131,59 @@ public class I18n {
 	 * Declared 'protected' so it can be overridden in unit tests.
 	 */
 	protected I18nBundle getBundle(String bundleName, HttpServletRequest req) {
-		log.debug("Getting bundle '" + bundleName + "'");
+		log.debug("Getting request bundle '" + bundleName + "'");
 
+		checkDevelopmentMode(req);
+		checkForChangeInThemeDirectory(req);
+
+		Locale locale = req.getLocale();
+
+		return getBundle(bundleName, locale);
+	}
+
+	/**
+	 * Get an I18nBundle by this name. The context provides the selectable
+	 * Locale, the application directory, the theme directory and the
+	 * development mode flag. Choosing matching locale from context by
+	 * provided preferred locales.
+	 *
+	 * If the context indicates that the system is in development mode, then the
+	 * cache is cleared on each request.
+	 *
+	 * If the theme directory has changed, the cache is cleared.
+	 *
+	 * Declared 'protected' so it can be overridden in unit tests.
+	 */
+	protected I18nBundle getBundle(String bundleName, List<Locale> preferredLocales) {
+		log.debug("Getting context bundle '" + bundleName + "'");
+
+		checkDevelopmentMode();
+		checkForChangeInThemeDirectory(ctx);
+
+		Locale locale = SelectedLocale.getPreferredLocale(ctx, preferredLocales);
+
+		return getBundle(bundleName, locale);
+	}
+
+	/**
+	 * Get an I18nBundle by this name, context, and locale.
+	 */
+	private I18nBundle getBundle(String bundleName, Locale locale) {
 		I18nLogger i18nLogger = new I18nLogger();
 		try {
-			checkDevelopmentMode(req);
-			checkForChangeInThemeDirectory(req);
-
 			String dir = themeDirectory.get();
-			ServletContext ctx = req.getSession().getServletContext();
-
 			ResourceBundle.Control control = new ThemeBasedControl(ctx, dir);
 			ResourceBundle rb = ResourceBundle.getBundle(bundleName,
-					req.getLocale(), control);
+					locale, control);
+
 			return new I18nBundle(bundleName, rb, i18nLogger);
 		} catch (MissingResourceException e) {
 			log.warn("Didn't find text bundle '" + bundleName + "'");
+
 			return I18nBundle.emptyBundle(bundleName, i18nLogger);
 		} catch (Exception e) {
 			log.error("Failed to create text bundle '" + bundleName + "'", e);
+
 			return I18nBundle.emptyBundle(bundleName, i18nLogger);
 		}
 	}
@@ -139,6 +198,16 @@ public class I18n {
 		}
 	}
 
+	/**
+	 * If we are in development mode, clear the cache.
+	 */
+	private void checkDevelopmentMode() {
+		if (DeveloperSettings.getInstance().getBoolean(Key.I18N_DEFEAT_CACHE)) {
+			log.debug("In development mode - clearing the cache.");
+			ResourceBundle.clearCache();
+		}
+	}
+
 	/**
 	 * If the theme directory has changed from before, clear the cache of all
 	 * ResourceBundles.
@@ -153,6 +222,30 @@ public class I18n {
 		}
 	}
 
+	/**
+	 * If we have a complete model access and the theme directory has changed
+	 * from before, clear the cache of all ResourceBundles.
+	 */
+	private void checkForChangeInThemeDirectory(ServletContext ctx) {
+		WebappDaoFactory wdf = ModelAccess.on(ctx)
+			.getWebappDaoFactory();
+		// Only applicable if context has a complete model access
+		if (Objects.nonNull(wdf)
+				&& Objects.nonNull(wdf.getApplicationDao())
+				&& Objects.nonNull(wdf.getApplicationDao().getApplicationBean())) {
+			String currentDir = wdf
+				.getApplicationDao()
+				.getApplicationBean()
+				.getThemeDir();
+			String previousDir = themeDirectory.getAndSet(currentDir);
+			if (!currentDir.equals(previousDir)) {
+				log.debug("Theme directory changed from '" + previousDir + "' to '"
+						+ currentDir + "' - clearing the cache.");
+				ResourceBundle.clearCache();
+			}
+		}
+	}
+
 	/** Only clear the cache one time per request. */
 	private void clearCacheOnRequest(HttpServletRequest req) {
 		if (req.getAttribute(ATTRIBUTE_CACHE_CLEARED) != null) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java

@@ -10,6 +10,9 @@ import java.util.ResourceBundle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings;
+import edu.cornell.mannlib.vitro.webapp.utils.developer.Key;
+
 /**
  * A wrapper for a ResourceBundle that will not throw an exception, no matter
  * what string you request.
@@ -20,7 +23,9 @@ import org.apache.commons.logging.LogFactory;
  */
 public class I18nBundle {
 	private static final Log log = LogFactory.getLog(I18nBundle.class);
-
+	private static final String startSep = "\u25a4";
+	private static final String endSep = "\u25a5";
+	private static final String intSep = "\u25a6";
 	private static final String MESSAGE_BUNDLE_NOT_FOUND = "Text bundle ''{0}'' not found.";
 	private static final String MESSAGE_KEY_NOT_FOUND = "Text bundle ''{0}'' has no text for ''{1}''";
 
@@ -75,13 +80,26 @@ public class I18nBundle {
 					key);
 			log.warn(message);
 			textString = "ERROR: " + message;
-		}
+		}			
-		String result = formatString(textString, parameters);
+		String message = formatString(textString, parameters);	
 
 		if (i18nLogger != null) {
-			i18nLogger.log(bundleName, key, parameters, textString, result);
+			i18nLogger.log(bundleName, key, parameters, textString, message);
 		}
-		return result;
+		if (isNeedExportInfo()) {
+			String separatedArgs = "";
+			for (int i = 0; i < parameters.length; i++) {
+				separatedArgs += parameters[i] + intSep;
+			}
+			return startSep + key + intSep + textString + intSep + separatedArgs + message + endSep;
+		} else {
+			return message;	
+		}
+		
+	}
+	
+	private static boolean isNeedExportInfo() {
+		return DeveloperSettings.getInstance().getBoolean(Key.I18N_ONLINE_TRANSLATION);
 	}
 
 	private static String formatString(String textString, Object... parameters) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java

@@ -89,8 +89,8 @@ public class LocaleSelectionDataGetter implements DataGetter {
 			Locale currentLocale) throws FileNotFoundException {
 		Map<String, Object> map = new HashMap<>();
 		map.put("code", locale.toString());
-		map.put("label", locale.getDisplayName(currentLocale));
+		map.put("label", locale.getDisplayLanguage(locale));
-		map.put("imageUrl", LocaleSelectorUtilities.getImageUrl(vreq, locale));
+		map.put("country", locale.getDisplayCountry(locale));
 		map.put("selected", currentLocale.equals(locale));
 		return map;
 	}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
@@ -48,6 +49,10 @@ public class LocaleSelectionSetup implements ServletContextListener {
 		ss = StartupStatus.getBean(ctx);
 		props = ConfigurationProperties.getBean(sce);
 
+		// Instantiate I18n instance to afford access to ServletContext
+		// when requesting a bundle with or without a VitroRequest
+		I18n.setup(ctx);
+
 		readProperties();
 
 		if (isForcing() && hasSelectables()) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectorUtilities.java

@@ -1,58 +0,0 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.i18n.selection;
-
-import java.io.FileNotFoundException;
-import java.util.Locale;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-
-/**
- * Some static methods for the GUI aspects of selecting a Locale.
- */
-public class LocaleSelectorUtilities {
-	private static final Log log = LogFactory
-			.getLog(LocaleSelectorUtilities.class);
-
-	/**
-	 * Look in the current theme directory to find a selection image for this
-	 * Locale.
-	 *
-	 * Images are expected at a resource path like
-	 * /[themeDir]/i18n/images/select_locale_[locale_code].*
-	 *
-	 * For example, /themes/wilma/i18n/images/select_locale_en.png
-	 * /themes/wilma/i18n/images/select_locale_en.JPEG
-	 * /themes/wilma/i18n/images/select_locale_en.gif
-	 *
-	 * To create a proper URL, prepend the context path.
-	 */
-	public static String getImageUrl(VitroRequest vreq, Locale locale)
-			throws FileNotFoundException {
-		String filename = "select_locale_" + locale + ".";
-
-		String themeDir = vreq.getAppBean().getThemeDir();
-		String imageDirPath = "/" + themeDir + "i18n/images/";
-
-		ServletContext ctx = vreq.getSession().getServletContext();
-		@SuppressWarnings("unchecked")
-		Set<String> resourcePaths = ctx.getResourcePaths(imageDirPath);
-		if (resourcePaths != null) {
-			for (String resourcePath : resourcePaths) {
-				if (resourcePath.contains(filename)) {
-					String fullPath = vreq.getContextPath() + resourcePath;
-					log.debug("Found image for " + locale + " at '" + fullPath
-							+ "'");
-					return fullPath;
-				}
-			}
-		}
-		throw new FileNotFoundException("Can't find an image for " + locale);
-	}
-}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java

@@ -6,6 +6,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -61,13 +63,10 @@ public abstract class SelectedLocale {
 		ServletContext ctx = session.getServletContext();
 
 		Object ctxInfo = ctx.getAttribute(ATTRIBUTE_NAME);
-		if (ctxInfo instanceof ContextSelectedLocale) {
+
-			Locale forcedLocale = ((ContextSelectedLocale) ctxInfo)
+		Optional<Locale> forcedLocale = getForcedLocale(ctxInfo);
-					.getForcedLocale();
+		if (forcedLocale.isPresent()) {
-			if (forcedLocale != null) {
+			return forcedLocale.get();
-				log.debug("Found forced locale in the context: " + forcedLocale);
-				return forcedLocale;
-			}
 		}
 
 		Object sessionInfo = session.getAttribute(ATTRIBUTE_NAME);
@@ -92,7 +91,62 @@ public abstract class SelectedLocale {
 			}
 		}
 
-		return null;
+		Locale fallbackLocale = getFallbackLocale();
+        log.debug("Using fallback locale as default: " + fallbackLocale);
+        return fallbackLocale;
+	}
+
+	/**
+	 * Get the overriding Locale to use, which is the first of these to be found:
+	 * <ul>
+	 * <li>The forced Locale in the servlet context</li>
+	 * <li>The first selectable locale matching a preferred locale</li>
+	 * <li>The first of the preferred locale</li>
+	 * <li>null</li>
+	 * </ul>
+	 */
+	public static Locale getOverridingLocale(ServletContext ctx, List<Locale> preferredLocales) {
+		Object ctxInfo = ctx.getAttribute(ATTRIBUTE_NAME);
+		Optional<Locale> forcedLocale = getForcedLocale(ctxInfo);
+		if (forcedLocale.isPresent()) {
+			return forcedLocale.get();
+		}
+
+		if (ctxInfo instanceof ContextSelectedLocale) {
+			List<Locale> selectableLocales = ((ContextSelectedLocale) ctxInfo)
+					.getSelectableLocales();
+
+			if (Objects.nonNull(selectableLocales) && Objects.nonNull(preferredLocales)) {
+				for (Locale preferredLocal : preferredLocales) {
+					for (Locale selectableLocale : selectableLocales) {
+						if (selectableLocale.equals(preferredLocal)) {
+							log.debug("Using first matching selectable locale from context: "
+									+ selectableLocale);
+							return selectableLocale;
+						}
+					}
+				}
+			}
+		}
+
+		if (Objects.nonNull(preferredLocales) && !preferredLocales.isEmpty()) {
+			Locale preferredLocal = preferredLocales.get(0);
+			log.debug("Using first preferred locale as default: "
+					+ preferredLocal);
+			return preferredLocal;
+		}
+
+		Locale fallbackLocale = getFallbackLocale();
+		log.debug("Using fallback locale as default: " + fallbackLocale);
+		return fallbackLocale;
+	}
+	
+	/**
+	 * @return a default locale to use if no other criteria for selecting a 
+	 * different one exist.
+	 */
+	public static Locale getFallbackLocale() {
+	    return new Locale("en", "US");
 	}
 
 	/**
@@ -121,6 +175,42 @@ public abstract class SelectedLocale {
 		return Locale.getDefault();
 	}
 
+	/**
+	 * Get the preferred Locale to use, which is the first of these to be found:
+	 * <ul>
+	 * <li>The forced Locale in the servlet context</li>
+	 * <li>The first selectable locale matching a preferred locale</li>
+	 * <li>The first of the preferred locale</li>
+	 * <li>The default Locale for the JVM</li>
+	 * </ul>
+	 */
+	public static Locale getPreferredLocale(ServletContext ctx, List<Locale> preferredLocales) {
+		Locale overridingLocale = getOverridingLocale(ctx, preferredLocales);
+
+		if (overridingLocale != null) {
+			return overridingLocale;
+		}
+
+		log.debug("Using default locale: " + Locale.getDefault());
+		return Locale.getDefault();
+	}
+
+	/**
+	 * Check for forced locale on the context.
+	 */
+	private static Optional<Locale> getForcedLocale(Object ctxInfo) {
+		if (ctxInfo instanceof ContextSelectedLocale) {
+			Locale forcedLocale = ((ContextSelectedLocale) ctxInfo)
+					.getForcedLocale();
+			if (forcedLocale != null) {
+				log.debug("Found forced locale in the context: " + forcedLocale);
+				return Optional.of(forcedLocale);
+			}
+		}
+
+		return Optional.empty();
+	}
+
 	/**
 	 * Store a list of selectable Locales in the servlet context, so we can
 	 * easily build the selection panel in the GUI. Clears any forced locale.

api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelNames.java

@@ -13,20 +13,27 @@ public class ModelNames {
 	public static final String ABOX_ASSERTIONS = "http://vitro.mannlib.cornell.edu/default/vitro-kb-2";
 	public static final String ABOX_INFERENCES = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf";
 	public static final String ABOX_UNION = "vitro:aboxOntModel";
+	public static final String ABOX_ASSERTIONS_FIRSTTIME_BACKUP = ABOX_ASSERTIONS + "FirsttimeBackup";
 
 	public static final String TBOX_ASSERTIONS = "http://vitro.mannlib.cornell.edu/default/asserted-tbox";
 	public static final String TBOX_INFERENCES = "http://vitro.mannlib.cornell.edu/default/inferred-tbox";
 	public static final String TBOX_UNION = "vitro:tboxOntModel";
+	public static final String TBOX_ASSERTIONS_FIRSTTIME_BACKUP = TBOX_ASSERTIONS + "FirsttimeBackup";
 
 	public static final String FULL_ASSERTIONS = "vitro:baseOntModel";
 	public static final String FULL_INFERENCES = "vitro:inferenceOntModel";
 	public static final String FULL_UNION = "vitro:jenaOntModel";
 
 	public static final String APPLICATION_METADATA = "http://vitro.mannlib.cornell.edu/default/vitro-kb-applicationMetadata";
+	public static final String APPLICATION_METADATA_FIRSTTIME_BACKUP = APPLICATION_METADATA + "FirsttimeBackup";
 	public static final String USER_ACCOUNTS = "http://vitro.mannlib.cornell.edu/default/vitro-kb-userAccounts";
+	public static final String USER_ACCOUNTS_FIRSTTIME_BACKUP = USER_ACCOUNTS + "FirsttimeBackup";
 	public static final String DISPLAY = "http://vitro.mannlib.cornell.edu/default/vitro-kb-displayMetadata";
+	public static final String DISPLAY_FIRSTTIME_BACKUP = DISPLAY + "FirsttimeBackup";
 	public static final String DISPLAY_TBOX = "http://vitro.mannlib.cornell.edu/default/vitro-kb-displayMetadataTBOX";
+	public static final String DISPLAY_TBOX_FIRSTTIME_BACKUP = DISPLAY_TBOX + "FirsttimeBackup";
 	public static final String DISPLAY_DISPLAY = "http://vitro.mannlib.cornell.edu/default/vitro-kb-displayMetadata-displayModel";
+	public static final String DISPLAY_DISPLAY_FIRSTTIME_BACKUP = DISPLAY_DISPLAY + "FirsttimeBackup";
 
 	/**
 	 * A map of the URIS, keyed by their short names, intended only for display
@@ -39,17 +46,24 @@ public class ModelNames {
 		map.put("ABOX_ASSERTIONS", ABOX_ASSERTIONS);
 		map.put("ABOX_INFERENCES", ABOX_INFERENCES);
 		map.put("ABOX_UNION", ABOX_UNION);
+		map.put("ABOX_ASSERTIONS_FIRSTTIME_BACKUP", ABOX_ASSERTIONS_FIRSTTIME_BACKUP);
 		map.put("TBOX_ASSERTIONS", TBOX_ASSERTIONS);
 		map.put("TBOX_INFERENCES", TBOX_INFERENCES);
 		map.put("TBOX_UNION", TBOX_UNION);
+		map.put("TBOX_ASSERTIONS_FIRSTTIME_BACKUP", TBOX_ASSERTIONS_FIRSTTIME_BACKUP);
 		map.put("FULL_ASSERTIONS", FULL_ASSERTIONS);
 		map.put("FULL_INFERENCES", FULL_INFERENCES);
 		map.put("FULL_UNION", FULL_UNION);
 		map.put("APPLICATION_METADATA", APPLICATION_METADATA);
+		map.put("APPLICATION_METADATA_FIRSTTIME_BACKUP", APPLICATION_METADATA_FIRSTTIME_BACKUP);
 		map.put("USER_ACCOUNTS", USER_ACCOUNTS);
+		map.put("USER_ACCOUNTS_FIRSTTIME_BACKUP", USER_ACCOUNTS_FIRSTTIME_BACKUP);
 		map.put("DISPLAY", DISPLAY);
+		map.put("DISPLAY_FIRSTTIME_BACKUP", DISPLAY_FIRSTTIME_BACKUP);
 		map.put("DISPLAY_TBOX", DISPLAY_TBOX);
+		map.put("DISPLAY_TBOX_FIRSTTIME_BACKUP", DISPLAY_TBOX_FIRSTTIME_BACKUP);
 		map.put("DISPLAY_DISPLAY", DISPLAY_DISPLAY);
+		map.put("DISPLAY_DISPLAY_FIRSTTIME_BACKUP", DISPLAY_DISPLAY_FIRSTTIME_BACKUP);
 		return Collections.unmodifiableMap(map);
 	}
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java

@@ -6,6 +6,14 @@ import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY;
 import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_DISPLAY;
 import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_TBOX;
 import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.USER_ACCOUNTS;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.ABOX_ASSERTIONS_FIRSTTIME_BACKUP;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS_FIRSTTIME_BACKUP;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.APPLICATION_METADATA_FIRSTTIME_BACKUP;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.USER_ACCOUNTS_FIRSTTIME_BACKUP;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_FIRSTTIME_BACKUP;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_TBOX_FIRSTTIME_BACKUP;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_DISPLAY_FIRSTTIME_BACKUP;
+
 
 import org.apache.jena.rdf.model.ModelMaker;
 
@@ -18,7 +26,10 @@ public abstract class ConfigurationTripleSource implements TripleSource {
 	 * add memory-mapping.
 	 */
 	protected static final String[] CONFIGURATION_MODELS = { DISPLAY,
-			DISPLAY_TBOX, DISPLAY_DISPLAY, USER_ACCOUNTS };
+			DISPLAY_TBOX, DISPLAY_DISPLAY, USER_ACCOUNTS, ABOX_ASSERTIONS_FIRSTTIME_BACKUP,
+			TBOX_ASSERTIONS_FIRSTTIME_BACKUP, APPLICATION_METADATA_FIRSTTIME_BACKUP,
+			USER_ACCOUNTS_FIRSTTIME_BACKUP, DISPLAY_FIRSTTIME_BACKUP, 
+			DISPLAY_TBOX_FIRSTTIME_BACKUP, DISPLAY_DISPLAY_FIRSTTIME_BACKUP };
 
 	/**
 	 * These decorators are added to a Configuration ModelMaker, regardless of

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java

@@ -10,6 +10,8 @@ import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelChangedListener;
 import org.apache.jena.rdf.model.RDFNode;
 
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+
 /**
  * Interface for API to write, read, and update Vitro's RDF store, with support
  * to allow listening, logging and auditing.
@@ -263,4 +265,10 @@ public interface RDFService {
      * multiple invocations do not cause an error.
      */
     public void close();
+    /**
+     * UQAM-Bug-Correction  Useful among other things to transport the linguistic context in the service
+     * @param vitroRequest
+     */
+	public void setVitroRequest(VitroRequest vitroRequest);
+	public VitroRequest getVitroRequest();
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractGraphDecorator.java

@@ -0,0 +1,136 @@
+package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters;
+
+import org.apache.jena.graph.Capabilities;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.GraphEventManager;
+import org.apache.jena.graph.GraphStatisticsHandler;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.TransactionHandler;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.shared.AddDeniedException;
+import org.apache.jena.shared.DeleteDeniedException;
+import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.util.iterator.ExtendedIterator;
+
+import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
+
+/**
+ * The base class for a delegating graph decorator.
+ *
+ * As implemented, all methods simply delegate to the inner graph. Subclasses
+ * should override selected methods to provide functionality.
+ */
+public abstract class AbstractGraphDecorator implements 
+        Graph {
+    
+    private final Graph inner;
+
+    protected AbstractGraphDecorator(Graph g) {
+        if (g == null) {
+            throw new IllegalArgumentException("g may not be null.");
+        }
+        this.inner = g;
+    }
+
+    @Override
+    public String toString() {
+        return ToString.simpleName(this) + "[" + ToString.hashHex(this)
+                + ", inner=" + ToString.graphToString(inner) + "]";
+    }
+
+    @Override
+    public void add(Triple arg0) throws AddDeniedException {
+        inner.add(arg0);
+    }
+
+    @Override
+    public void clear() {
+        inner.clear();
+    }
+
+    @Override
+    public void close() {
+        inner.close();
+    }
+
+    @Override
+    public boolean contains(Triple arg0) {
+        return inner.contains(arg0);
+    }
+
+    @Override
+    public boolean contains(Node arg0, Node arg1, Node arg2) {
+        return inner.contains(arg0, arg1, arg2);
+    }
+
+    @Override
+    public void delete(Triple arg0) throws DeleteDeniedException {
+        inner.delete(arg0);
+    }
+
+    @Override
+    public boolean dependsOn(Graph arg0) {
+        return inner.dependsOn(arg0);
+    }
+
+    @Override
+    public ExtendedIterator<Triple> find(Triple arg0) {
+        return inner.find(arg0);
+    }
+
+    @Override
+    public ExtendedIterator<Triple> find(Node arg0, Node arg1, Node arg2) {
+        return inner.find(arg0, arg1, arg2);
+    }
+
+    @Override
+    public Capabilities getCapabilities() {
+        return inner.getCapabilities();
+    }
+
+    @Override
+    public GraphEventManager getEventManager() {
+        return inner.getEventManager();
+    }
+
+    @Override
+    public PrefixMapping getPrefixMapping() {
+        return inner.getPrefixMapping();
+    }
+
+    @Override
+    public GraphStatisticsHandler getStatisticsHandler() {
+        return inner.getStatisticsHandler();
+    }
+
+    @Override
+    public TransactionHandler getTransactionHandler() {
+        return inner.getTransactionHandler();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return inner.isClosed();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return inner.isEmpty();
+    }
+
+    @Override
+    public boolean isIsomorphicWith(Graph arg0) {
+        return inner.isIsomorphicWith(arg0);
+    }
+
+    @Override
+    public void remove(Node arg0, Node arg1, Node arg2) {
+        inner.remove(arg0, arg1, arg2);
+    }
+
+    @Override
+    public int size() {
+        return inner.size();
+    }
+    
+}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java

@@ -54,7 +54,7 @@ public abstract class AbstractModelDecorator implements Model {
 
 	protected AbstractModelDecorator(Model m) {
 		if (m == null) {
-			throw new NullPointerException("m may not be null.");
+			throw new IllegalArgumentException("m may not be null.");
 		}
 		this.inner = m;
 	}
@@ -325,6 +325,11 @@ public abstract class AbstractModelDecorator implements Model {
 		return inner.lock();
 	}
 
+	@Override
+	public boolean hasNoMappings() {
+		return inner.hasNoMappings();
+	}
+
 	@Override
 	public boolean samePrefixMappingAs(PrefixMapping other) {
 		return inner.samePrefixMappingAs(other);
@@ -684,6 +689,11 @@ public abstract class AbstractModelDecorator implements Model {
 		return inner.createResource(uri);
 	}
 
+	@Override
+	public Resource createResource(Statement statement) {
+		return inner.createResource(statement);
+	}
+
 	@Override
 	public Property createProperty(String nameSpace, String localName) {
 		return inner.createProperty(nameSpace, localName);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java

@@ -364,6 +364,11 @@ public abstract class AbstractOntModelDecorator implements OntModel {
 		return inner.lock();
 	}
 
+	@Override
+	public boolean hasNoMappings() {
+		return inner.hasNoMappings();
+	}
+
 	@Override
 	public boolean samePrefixMappingAs(PrefixMapping other) {
 		return inner.samePrefixMappingAs(other);
@@ -729,6 +734,11 @@ public abstract class AbstractOntModelDecorator implements OntModel {
 		return inner.createResource(uri);
 	}
 
+	@Override
+	public Resource createResource(Statement statement) {
+		return inner.createResource(statement);
+	}
+
 	@Override
 	public Property createProperty(String nameSpace, String localName) {
 		return inner.createProperty(nameSpace, localName);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java

@@ -0,0 +1,36 @@
+package edu.cornell.mannlib.vitro.webapp.rdfservice.filter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A normalized list of languages/locales acceptable in results
+ * returned by language-filtering RDFServices, graphs, models, etc.
+ */
+public class AcceptableLanguages extends ArrayList<String>{
+    
+    private static final long serialVersionUID = 1L;
+    private static final Log log = LogFactory.getLog(AcceptableLanguages.class);
+    
+    /**
+     * Construct a normalized list of acceptable language strings
+     * from a set of raw language strings.  For any values of form 'aa-BB',
+     * the base language ('aa') will be also added to the list. 
+     * @param rawLanguageStrs may not be null
+     */
+    public AcceptableLanguages(List<String> rawLanguageStrs) {
+        log.debug("Raw language strings:" + rawLanguageStrs);
+        for (String lang : rawLanguageStrs) {
+            this.add(lang);
+            String baseLang = lang.split("-")[0];
+            if (!lang.equals(baseLang) && !this.contains(baseLang)) {
+                this.add(baseLang);
+            }
+        }
+        log.debug("Normalized language strings:" + this);
+    }
+
+}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java

@@ -9,6 +9,7 @@ import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.engine.binding.BindingUtils;
 
 public class FilteredResultSet implements ResultSet {
 
@@ -53,7 +54,7 @@ public class FilteredResultSet implements ResultSet {
 
     @Override
     public Binding nextBinding() {
-        throw new UnsupportedOperationException("Can we ignore this?");
+        return BindingUtils.asBinding(nextSolution());
     }
 
     @Override

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LangSort.java

@@ -0,0 +1,78 @@
+package edu.cornell.mannlib.vitro.webapp.rdfservice.filter;
+
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A class for sorting language strings by acceptability according to a 
+ * supplied list of language preferences.  
+ * Refactored from LanguageFilteringRDFService for reuse by classes performing
+ * similar functions.
+ */
+public class LangSort {
+     
+    private static final Log log = LogFactory.getLog(LangSort.class);
+    
+    protected List<String> langs;
+    private int inexactMatchPenalty;
+    private int noLanguage;
+    private int noMatch;
+
+    /**
+     * Construct a language string sorter with a supplied list of preferred 
+     * language strings
+     * @param preferredLanguageStrings list of preferred languages of form
+     *                                 'en-US', 'es', 'fr-CA'.  May not be null.
+     */
+    public LangSort(List<String> preferredLanguageStrings) {
+        this.langs = preferredLanguageStrings;
+        this.inexactMatchPenalty = langs.size();
+        // no language is worse than any inexact match (if the preferred list does not include "").
+        this.noLanguage = 2 * inexactMatchPenalty;
+        // no match is worse than no language.
+        this.noMatch = noLanguage + 1;
+    }
+    
+    protected int compareLangs(String t1lang, String t2lang) {
+        int index1 = languageIndex(t1lang);
+        int index2 = languageIndex(t2lang);
+        if(index1 == index2) {
+            return t1lang.compareTo(t2lang);
+        } else {
+            return languageIndex(t1lang) - languageIndex(t2lang);
+        }
+    }
+
+    /**
+     * Return index of exact match, or index of partial match, or
+     * language-free, or no match.
+     */
+    private int languageIndex(String lang) {
+        if (lang == null) {
+            lang = "";
+        }
+
+        int index = langs.indexOf(lang);
+        if (index >= 0) {
+            log.debug("languageIndex for '" + lang + "' is " + index);
+            return index;
+        }
+
+        if (lang.length() > 2) {
+            index = langs.indexOf(lang.substring(0, 2));
+            if (index >= 0) {
+                log.debug("languageIndex for '" + lang + "' is " + index + inexactMatchPenalty);
+                return index + inexactMatchPenalty;
+            }
+        }
+
+        if (lang.isEmpty()) {
+            log.debug("languageIndex for '" + lang + "' is " + noLanguage);
+            return noLanguage;
+        }
+
+        return noMatch;
+    }
+}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilterModel.java

@@ -0,0 +1,104 @@
+package edu.cornell.mannlib.vitro.webapp.rdfservice.filter;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+
+/**
+ * A filter of literal statements from Models according to language preferences. 
+ */
+public class LanguageFilterModel {
+
+    private static final Log log = LogFactory.getLog(LanguageFilterModel.class);
+    
+    /**
+     * 
+     * @param m the model to filter. May not be null.
+     * @param langs list of strings of type 'en-US'. May not be null.
+     * @return model with language-inappropriate literal statements filtered out.
+     */
+    public Model filterModel(Model m, List<String> langs) {
+        log.debug("filterModel");
+        List<Statement> retractions = new ArrayList<Statement>();
+        StmtIterator stmtIt = m.listStatements();
+        while (stmtIt.hasNext()) {
+            Statement stmt = stmtIt.nextStatement();
+            if (stmt.getObject().isLiteral()) {
+                List<Statement> candidatesForRemoval = m.listStatements(
+                        stmt.getSubject(), stmt.getPredicate(), (RDFNode) null).toList();
+                if (candidatesForRemoval.size() == 1) {
+                    continue;
+                }
+                candidatesForRemoval.sort(new StatementSortByLang(langs));
+                log.debug("sorted statements: " + showSortedStatements(candidatesForRemoval));
+                Iterator<Statement> candIt = candidatesForRemoval.iterator();
+                String langRegister = null;
+                boolean chuckRemaining = false;
+                while(candIt.hasNext()) {
+                    Statement s = candIt.next();
+                    if (!s.getObject().isLiteral()) {
+                        continue;
+                    } else if (chuckRemaining) {
+                        retractions.add(s);
+                    }
+                    String lang = s.getObject().asLiteral().getLanguage();
+                    if (langRegister == null) {
+                        langRegister = lang;
+                    } else if (!langRegister.equals(lang)) {
+                        chuckRemaining = true;
+                        retractions.add(s);
+                    }
+                }
+            }
+
+        }
+        m.remove(retractions);
+        return m;
+    }
+    
+    private String showSortedStatements(List<Statement> candidatesForRemoval) {
+        List<String> langStrings = new ArrayList<String>();
+        for (Statement stmt: candidatesForRemoval) {
+            if (stmt == null) {
+                langStrings.add("null stmt");
+            } else {
+                RDFNode node = stmt.getObject();
+                if (!node.isLiteral()) {
+                    langStrings.add("not literal");
+                } else {
+                    langStrings.add(node.asLiteral().getLanguage());
+                }
+            }
+        }
+        return langStrings.toString();
+    }
+    
+    private class StatementSortByLang extends LangSort implements Comparator<Statement> {
+
+        public StatementSortByLang(List<String> langs) {
+            super(langs);
+        }
+        
+        public int compare(Statement s1, Statement s2) {
+            if (s1 == null || s2 == null) {
+                return 0;
+            } else if (!s1.getObject().isLiteral() || !s2.getObject().isLiteral()) {
+                return 0;
+            }
+
+            String s1lang = s1.getObject().asLiteral().getLanguage();
+            String s2lang = s2.getObject().asLiteral().getLanguage();
+
+            return compareLangs(s1lang, s2lang);
+        }
+    }
+    
+}