From 2064bbd7e024015d01b03c03b65bf72cb98ba875 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 17 Nov 2013 13:20:18 -0500
Subject: [PATCH] =?UTF-8?q?VIVO-453=20language=20filtering=20defaults=20to?=
 =?UTF-8?q?=20=E2=80=9Cfalse=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/install.html                                  | 15 +++++++++++++++
 webapp/config/example.runtime.properties          |  4 ++--
 .../vitro/webapp/filters/RequestModelsPrep.java   |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/doc/install.html b/doc/install.html
index dd40c7a09..22932f888 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -745,6 +745,21 @@
                         </td>
                     </tr>
                     
+                    <tr>
+                        <td colspan="2">
+							Show only the most appropriate data values based on the Accept-Language 
+							header supplied by the browser.  Default is false if not set.
+                        </td>
+                    </tr>
+                    <tr class="odd_row">
+                        <td>
+                          RDFService.languageFilter
+                        </td>
+                        <td>
+                           false
+                        </td>
+                    </tr>
+
                     <tr>
                         <td colspan="2">
                           Force VIVO to use a specific language or Locale instead of those 
diff --git a/webapp/config/example.runtime.properties b/webapp/config/example.runtime.properties
index d680c1621..fa1100def 100644
--- a/webapp/config/example.runtime.properties
+++ b/webapp/config/example.runtime.properties
@@ -116,9 +116,9 @@ proxy.eligibleTypeList = http://www.w3.org/2002/07/owl#Thing
 
 #
 # Show only the most appropriate data values based on the Accept-Language 
-# header supplied by the browser.  Default is true if not set.
+# header supplied by the browser.  Default is false if not set.
 #
-RDFService.languageFilter = true
+# RDFService.languageFilter = true
 
 #
 # Tell VIVO to generate HTTP headers on its responses to facilitate caching the 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
index d4da08f70..032795028 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
@@ -336,11 +336,11 @@ public class RequestModelsPrep implements Filter {
 	}
 
 	/**
-	 * Language awareness is enabled unless they explicitly disable it.
+	 * Language awareness is disabled unless they explicitly enable it.
 	 */
 	private Boolean isLanguageAwarenessEnabled() {
 		return Boolean.valueOf(props.getProperty("RDFService.languageFilter",
-				"true"));
+				"false"));
 	}
 
 	private RDFService addLanguageAwareness(HttpServletRequest req,