Merge branch 'maint-rel-1.6' into develop
This commit is contained in:
commit
9fc4841bff
3 changed files with 19 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Add table
Reference in a new issue