Browse Source

lang tests

causefx 7 years ago
parent
commit
818967ee4b
1 changed files with 9 additions and 2 deletions
  1. 9 2
      js/functions.js

+ 9 - 2
js/functions.js

@@ -3,8 +3,8 @@ var lang = new Lang();
 var langStrings = { "token": {} };
 var langStrings = { "token": {} };
 loadLanguageList();
 loadLanguageList();
 lang.init({
 lang.init({
-	defaultLang: 'en',
-	currentLang: language(moment.locale(navigator.languages[0])),
+	//defaultLang: 'en',
+	currentLang: (getCookie('organizrLanguage')) ? getCookie('organizrLanguage') : language(moment.locale(navigator.languages[0])),
 	cookie: {
 	cookie: {
 		name: 'organizrLanguage',
 		name: 'organizrLanguage',
 		expiry: 365,
 		expiry: 365,
@@ -18,6 +18,12 @@ $(document).ready(function () {
     launch();
     launch();
 });
 });
 /* NORMAL FUNCTIONS */
 /* NORMAL FUNCTIONS */
+function setLangCookie(lang){
+    Cookies.set('organizrLanguage',lang, {
+        expires: 365,
+        path: '/'
+    });
+}
 function toggleDebug(){
 function toggleDebug(){
     $('.debugModal').modal('show')
     $('.debugModal').modal('show')
 }
 }
@@ -1565,6 +1571,7 @@ function buildLanguage(replace=false,newLang=null){
 		</li>
 		</li>
 	`;
 	`;
 	if(replace == true){
 	if(replace == true){
+	    setLangCookie(newLang);
 		$('#languageDropdown').replaceWith(lang);
 		$('#languageDropdown').replaceWith(lang);
 		message("",window.lang.translate('Changed Language To')+": "+newLang,activeInfo.settings.notifications.position,"#FFF","success","3500");
 		message("",window.lang.translate('Changed Language To')+": "+newLang,activeInfo.settings.notifications.position,"#FFF","success","3500");
 	}else if(replace == 'wizard'){
 	}else if(replace == 'wizard'){