Merge remote branch 'origin/master' into wosch

[mkws-moved-to-github.git] / src / mkws-team.js

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 2b962a2..2bac42e 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -341,32 +341,6 @@ function team($, teamName) {
     };
 
 
-    /*
-     * All the HTML stuff to render the search forms and
-     * result pages.
-     */
-    function mkwsHtmlAll() {
-        var container = findnode(".mkwsMOTDContainer");
-       if (container.length) {
-           // Move the MOTD from the provided element down into the container
-           findnode(".mkwsMOTD").appendTo(container);
-       }
-    }
-
-
-    function mkwsSetLang()  {
-       var lang = mkws.getParameterByName("lang") || m_config.lang;
-       if (!lang || !mkws.locale_lang[lang]) {
-           m_config.lang = ""
-       } else {
-           m_config.lang = lang;
-       }
-
-       log("Locale language: " + (m_config.lang ? m_config.lang : "none"));
-       return m_config.lang;
-    }
-
-
     // Translation function. At present, this is properly a
     // global-level function (hence the assignment to mkws.M) but we
     // want to make it per-team so different teams can operate in
@@ -476,8 +450,15 @@ function team($, teamName) {
         return m_widgets[type];
     }
 
-    mkwsHtmlAll()
-    mkwsSetLang();
+
+    var lang = mkws.getParameterByName("lang") || m_config.lang;
+    if (!lang || !mkws.locale_lang[lang]) {
+       m_config.lang = ""
+    } else {
+       m_config.lang = lang;
+    }
+
+    log("Locale language: " + (m_config.lang ? m_config.lang : "none"));
 
     return that;
 };