X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=07f0574d234401c2d94dee2008c8d53dae5ef4fb;hb=bfc3e7ff15c47ecfedd558c612e9e6d453cad9f8;hp=2867341ca810acb7e2cb0edecb846637e1f3bab9;hpb=e039d5fff8f0deb60726643b8b474f0bedde73c0;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 2867341..07f0574 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -3,9 +3,6 @@
 
 "use strict"; // HTML5: disable for debug_level >= 2
 
-// Wrapper for jQuery
-(function ($) {
-
 // Set up namespace and some state.
 var mkws = {};
 
@@ -18,6 +15,9 @@ var mkws = {};
 if (!mkws_config)
     var mkws_config = {};
 
+// Wrapper for jQuery
+(function ($) {
+
 mkws.locale_lang = {
     "de": {
 	"Authors": "Autoren",
@@ -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",
@@ -148,6 +146,7 @@ for (var key in mkws_config) {
 	    var lang = key.replace(/^language_/, "");
 	    // Copy custom languages into list
 	    mkws.locale_lang[lang] = mkws_config[key];
+	    debug("Added locally configured language '" + lang + "'");
 	}
     }
 }
@@ -675,7 +674,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 {
@@ -844,7 +843,7 @@ function M(word) {
     if (!lang || !mkws.locale_lang[lang])
 	return word;
 
-    return mkws.locale_lang[lang][word] ? mkws.locale_lang[lang][word] : word;
+    return mkws.locale_lang[lang][word] || word;
 }
 
 /*