Trang chủ Khám phá Trợ giúp
Đăng nhập
TC
/
arozos
1
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu kéo về 0 Wiki
Browse Source

Merge branch 'langselector-20210915' of tmp/arozos into master

should be fine I guess
TC 4 năm trước cách đây
mục cha
850cd922cc cdc2320d26
commit
6c00d5784a
4 tập tin đã thay đổi với 99 bổ sung và 33 xóa
View chưa được định nghĩa Hiển thị tình trạng sai khác
  1. 15 7
      devices.go
  2. 0 1
      setting.advance.go
  3. 60 0
      web/SystemAO/info/locale.html
  4. 24 25
      web/script/applocale.js

+ 15 - 7
devices.go
Xem Tập Tin 

@@ -1,17 +1,13 @@
 
 package main
 
 package main
 
 
 
-import (
 
-
 
-)
 
-
 
 /*
 
 /*
 
 	Device Handler
 
 	Device Handler
 
-	
+
 
 	This script mainly handle the external devices like client devices reflect information
 
 	This script mainly handle the external devices like client devices reflect information
 
 	or IoT devices. If you want to handle storage devices mounting, use system.storage.go instead.
 
 	or IoT devices. If you want to handle storage devices mounting, use system.storage.go instead.
 
 */
 
 */
 
 
 
-func DeviceServiceInit(){
 
+func DeviceServiceInit() {
 
 	//Register Device related settings. Compatible to ArOZ Online Beta
 
 	//Register Device related settings. Compatible to ArOZ Online Beta
 
 	registerSetting(settingModule{
 
 	registerSetting(settingModule{
 
 		Name:     "Client Device",
 
 		Name:     "Client Device",
 
@@ -37,5 +33,17 @@ func DeviceServiceInit(){
 
 		StartDir: "SystemAO/info/display.html",
 
 		StartDir: "SystemAO/info/display.html",
 
 	})
 
 	})
 
 
 
+	/*
 
+		Locale / Display Language
 
 
 
-}
 
+		This method allows users to change their own language
 
+	*/
 
+	registerSetting(settingModule{
 
+		Name:         "Language",
 
+		Desc:         "Set the display language of the system",
 
+		IconPath:     "SystemAO/info/img/small_icon.png",
 
+		Group:        "Device",
 
+		StartDir:     "SystemAO/info/locale.html",
 
+		RequireAdmin: false,
 
+	})
 
+}

+ 0 - 1
setting.advance.go
Xem Tập Tin 

@@ -64,5 +64,4 @@ func AdvanceSettingInit() {
 
 			RequireAdmin: true,
 
 			RequireAdmin: true,
 
 		})
 
 		})
 
 	}
 
 	}
 
-
 
 }
 
 }

+ 60 - 0
web/SystemAO/info/locale.html
Xem Tập Tin 

@@ -0,0 +1,60 @@
 
+<html>
 
+
 
+<head>
 
+    <title>Locale</title>
 
+    <meta charset="UTF-8">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0 user-scalable=no">
 
+    <link rel="stylesheet" href="../../script/semantic/semantic.css">
 
+    <script type="application/javascript" src="../../script/jquery.min.js"></script>
 
+    <script type="application/javascript" src="../../script/clipboard.min.js"></script>
 
+    <script type="application/javascript" src="../../script/semantic/semantic.js"></script>
 
+</head>
 
+
 
+<body>
 
+    <div class="ui container">
 
+        <div class="ui basic segment">
 
+            <div class="ui header">
 
+                <i class="translate icon"></i>
 
+                <div class="content">
 
+                    Language setting
 
+                    <div class="sub header">You can change the display language here.<br> The language setting will only affect the current computer.</div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="ui divider"></div>
 
+        <div class="ui green inverted segment" style="display:none;" id="updateSet">
 
+            <h5 class="ui header">
 
+                <i class="checkmark icon"></i>
 
+                <div class="content">
 
+                    Setting Updated. Please sign out to apply these changes.
 
+                </div>
 
+            </h5>
 
+        </div>
 
+        <div class="ui form">
 
+            <div class="field">
 
+                <label>Display language</label>
 
+                <div class="ui selection dropdown">
 
+                    <input id="language" type="hidden" name="language">
 
+                    <i class="dropdown icon"></i>
 
+                    <div class="default text">Language</div>
 
+                    <div class="menu">
 
+                        <div class="item" data-value="default">Browser Default</div>
 
+                        <div class="item" data-value="zh-TW">繁體中文</div>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <button id="ntb" onclick="update();" class="ui green button" type="submit">Update</button>
 
+        </div>
 
+    </div>
 
+    <script>
 
+        $("#language").val(localStorage.getItem('global_language'));
 
+        $('.selection.dropdown').dropdown();
 
+
 
+        function update() {
 
+            localStorage.setItem('global_language', $("#language").val());
 
+            $("#updateSet").stop().finish().slideDown("fast").delay(3000).slideUp('fast');
 
+        }
 
+    </script>
 
+</body>
 
+
 
+</html>

+ 24 - 25
web/script/applocale.js
Xem Tập Tin 

@@ -18,32 +18,31 @@
 
 
 
 
 
 var applocale = {
 
 var applocale = {
 
-    lang: navigator.language,
 
+    lang: localStorage.getItem('global_language') == null || localStorage.getItem('global_language') == "default" ? navigator.language : localStorage.getItem('global_language'),
 
     localeFile: "",
 
     localeFile: "",
 
     localData: {},
 
     localData: {},
 
-    init: function(localeFile, callback=undefined){
 
+    init: function(localeFile, callback = undefined) {
 
         applocale.localeFile = localeFile;
 
         applocale.localeFile = localeFile;
 
         $.ajax({
 
         $.ajax({
 
             dataType: "json",
 
             dataType: "json",
 
             url: localeFile,
 
             url: localeFile,
 
-            success: function(data){
 
+            success: function(data) {
 
                 applocale.localData = data;
 
                 applocale.localData = data;
 
-                if (callback != undefined){
 
+                if (callback != undefined) {
 
                     callback(data);
 
                     callback(data);
 
                 }
 
                 }
 
 
 
-                if (data.keys[applocale.lang] != undefined && data.keys[applocale.lang].fwtitle != undefined && ao_module_virtualDesktop){
 
+                if (data.keys[applocale.lang] != undefined && data.keys[applocale.lang].fwtitle != undefined && ao_module_virtualDesktop) {
 
                     //Update the floatwindow title as well
 
                     //Update the floatwindow title as well
 
                     ao_module_setWindowTitle(data.keys[applocale.lang].fwtitle);
 
                     ao_module_setWindowTitle(data.keys[applocale.lang].fwtitle);
 
                 }
 
                 }
 
             }
 
             }
 
-          });
 
+        });
 
     },
 
     },
 
-    translate: function(targetLang = ""){
 
+    translate: function(targetLang = "") {
 
         var targetLang = targetLang || applocale.lang;
 
         var targetLang = targetLang || applocale.lang;
 
-
 
         //Check if the given locale exists
 
         //Check if the given locale exists
 
-        if (applocale.localData.keys[targetLang] == undefined){
 
+        if (applocale.localData.keys[targetLang] == undefined) {
 
             console.log("[Applocale] This language is not supported. Using default")
 
             console.log("[Applocale] This language is not supported. Using default")
 
             return
 
             return
 
         }
 
         }
 
@@ -52,39 +51,39 @@ var applocale = {
 
         let hasTitleLocale = (applocale.localData.keys[targetLang].titles !== undefined);
 
         let hasTitleLocale = (applocale.localData.keys[targetLang].titles !== undefined);
 
         let hasStringLocale = (applocale.localData.keys[targetLang].strings !== undefined);
 
         let hasStringLocale = (applocale.localData.keys[targetLang].strings !== undefined);
 
         let hasPlaceHolderLocale = (applocale.localData.keys[targetLang].placeholder !== undefined);
 
         let hasPlaceHolderLocale = (applocale.localData.keys[targetLang].placeholder !== undefined);
 
-        $("*").each(function(){
 
-            if ($(this).attr("title") != undefined && hasTitleLocale){
 
-               let targetString = applocale.localData.keys[targetLang].titles[$(this).attr("title")];
 
-               if (targetString != undefined){
 
+        $("*").each(function() {
 
+            if ($(this).attr("title") != undefined && hasTitleLocale) {
 
+                let targetString = applocale.localData.keys[targetLang].titles[$(this).attr("title")];
 
+                if (targetString != undefined) {
 
                     $(this).attr("title", targetString);
 
                     $(this).attr("title", targetString);
 
-               }
 
-               
+                }
 
+
 
             }
 
             }
 
 
 
-            if ($(this).attr("locale") != undefined && hasStringLocale){
 
+            if ($(this).attr("locale") != undefined && hasStringLocale) {
 
                 let targetString = applocale.localData.keys[targetLang].strings[$(this).attr("locale")];
 
                 let targetString = applocale.localData.keys[targetLang].strings[$(this).attr("locale")];
 
-                if (targetString != undefined){
 
+                if (targetString != undefined) {
 
                     $(this).html(targetString);
 
                     $(this).html(targetString);
 
                 }
 
                 }
 
             }
 
             }
 
 
 
-            if ($(this).attr("placeholder") != undefined && hasPlaceHolderLocale){
 
+            if ($(this).attr("placeholder") != undefined && hasPlaceHolderLocale) {
 
                 let targetString = applocale.localData.keys[targetLang].placeholder[$(this).attr("placeholder")];
 
                 let targetString = applocale.localData.keys[targetLang].placeholder[$(this).attr("placeholder")];
 
-                if (targetString != undefined){
 
-                    $(this).attr("placeholder",targetString);
 
+                if (targetString != undefined) {
 
+                    $(this).attr("placeholder", targetString);
 
                 }
 
                 }
 
             }
 
             }
 
         })
 
         })
 
-   },
 
-    getString: function(key, original, type="strings"){
 
+    },
 
+    getString: function(key, original, type = "strings") {
 
         var targetLang = applocale.lang;
 
         var targetLang = applocale.lang;
 
-        if (applocale.localData.keys[targetLang] == undefined){
 
+        if (applocale.localData.keys[targetLang] == undefined) {
 
             return original;
 
             return original;
 
         }
 
         }
 
         let targetString = applocale.localData.keys[targetLang].strings[key];
 
         let targetString = applocale.localData.keys[targetLang].strings[key];
 
-        if (targetString != undefined){
 
+        if (targetString != undefined) {
 
             return targetString
 
             return targetString
 
-        }else{
 
+        } else {
 
             return original
 
             return original
 
         }
 
         }
 
     }
 
     }