From: Mike Taylor <mike@indexdata.com>
Date: Wed, 13 Nov 2013 13:59:30 +0000 (+0000)
Subject: Standard defaulting approach for lang.
X-Git-Tag: 0.9.1~149^2
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=c31a69ab6f910e67fba4008fb32cc3e84bfafe21;p=mkws-moved-to-github.git

Standard defaulting approach for lang.
Fixes last part of MKWS-40
---

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 7cd281e..d39b25d 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -100,12 +100,10 @@ var debug = mkws.debug_function; // local alias
 
 {
     /* default mkws config */
-    /* ### No defaults given for:
-     * lang and of course the optional language_* entries.
-     */
     var config_default = {
 	use_service_proxy: true,
 	service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth",
+	lang: "",
 	sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
 	perpage_options: [10, 20, 30, 50],
 	sort_default: "relevance",
@@ -675,7 +673,7 @@ function mkws_html_all() {
 }
 
 function mkws_set_lang()  {
-    var lang = $.parseQuerystring().lang || mkws_config.lang || "";
+    var lang = $.parseQuerystring().lang || mkws_config.lang;
     if (!lang || !mkws.locale_lang[lang]) {
 	mkws_config.lang = ""
     } else {