Home Explore Help
Sign In
TC
/
arozos
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fixed the hard coded lang list in language selection setting page

Toby Chui 3 years ago
parent
e18da6823d
commit
008072eb65
5 changed files with 30 additions and 15 deletions
Unified View Show Diff Stats
  1. 0 2
      web/MDEditor/filesaver.js
  2. 1 1
      web/MDEditor/mde.html
  3. 13 10
      web/SystemAO/disk/diskprop.html
  4. 13 2
      web/SystemAO/info/locale.html
  5. 3 0
      web/SystemAO/locale/file_explorer.json

+ 0 - 2
web/MDEditor/filesaver.js
View File 

@@ -17,8 +17,6 @@ function error(message){
 
 }
 
 }
 
 
 
 
 
-
 
-
 
 function main(){
 
 function main(){
 
     //Require libraries
 
     //Require libraries
 
     if (!requirelib("filelib")){
 
     if (!requirelib("filelib")){

+ 1 - 1
web/MDEditor/mde.html
View File 

@@ -136,7 +136,7 @@
 
                     return;
 
                     return;
 
                 }
 
                 }
 
                 var newcontent = simplemde.value();
 
                 var newcontent = simplemde.value();
 
-                ao_module_agirun("MDEditor/filesaver.js", {
 
+                ao_module_agirun("./MDEditor/filesaver.js", {
 
                     filepath: filepath, 
                     filepath: filepath, 
                     content: newcontent
 
                     content: newcontent
 
                 }, function(data){
 
                 }, function(data){

+ 13 - 10
web/SystemAO/disk/diskprop.html
View File 

@@ -14,8 +14,7 @@
 
         .hidden{
 
         .hidden{
 
             display:none;
 
             display:none;
 
         }
 
         }
 
-        
-
 
+    
         .disabled{
 
         .disabled{
 
             opacity: 0.5;
 
             opacity: 0.5;
 
             pointer-events: none;
 
             pointer-events: none;
 
@@ -50,6 +49,10 @@
 
             top:0px; 
             top:0px; 
             left: 0px;
 
             left: 0px;
 
         }
 
         }
 
+
 
+        .smallerFont{
 
+            font-size: 98%;
 
+        }
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -101,10 +104,10 @@
 
                     <div class="blue colorblock"></div><span locale="spaceinfo/totalUsed">Total Used Space:</span>
 
                     <div class="blue colorblock"></div><span locale="spaceinfo/totalUsed">Total Used Space:</span>
 
                 </td>
 
                 </td>
 
                 <td>
 
                 <td>
 
-                    <span id="usedSpaceInBytes"></span> <span locale="unit/bytes">Bytes</span>
 
+                    <span id="usedSpaceInBytes"  class="smallerFont"></span> <span locale="unit/bytes">Bytes</span>
 
                 </td>
 
                 </td>
 
                 <td>
 
                 <td>
 
-                    <span id="usedSpaceInHumanReadableFormat"></span>
 
+                    <span id="usedSpaceInHumanReadableFormat" class="smallerFont"></span>
 
                 </td>
 
                 </td>
 
             </tr>
 
             </tr>
 
             <tr>
 
             <tr>
 
@@ -112,10 +115,10 @@
 
                     <div class="yellow colorblock"></div><span locale="spaceinfo/userUsed">User Used Space:</span>
 
                     <div class="yellow colorblock"></div><span locale="spaceinfo/userUsed">User Used Space:</span>
 
                 </td>
 
                 </td>
 
                 <td>
 
                 <td>
 
-                    <span id="usedVirtualSpaceInByte"></span> <span locale="unit/bytes">Bytes</span>
 
+                    <span id="usedVirtualSpaceInByte" class="smallerFont"></span> <span locale="unit/bytes">Bytes</span>
 
                 </td>
 
                 </td>
 
                 <td>
 
                 <td>
 
-                    <span id="usedVirtualSpaceInHumanReadableFormat"></span>
 
+                    <span id="usedVirtualSpaceInHumanReadableFormat"  class="smallerFont"></span>
 
                 </td>
 
                 </td>
 
             </tr>
 
             </tr>
 
             <tr>
 
             <tr>
 
@@ -123,10 +126,10 @@
 
                     <div class="grey colorblock"></div><span locale="spaceinfo/Usable">Usable Space:</span>
 
                     <div class="grey colorblock"></div><span locale="spaceinfo/Usable">Usable Space:</span>
 
                 </td>
 
                 </td>
 
                 <td>
 
                 <td>
 
-                    <span id="usableSpaceInBytes"></span> <span locale="unit/bytes">Bytes</span>
 
+                    <span id="usableSpaceInBytes" class="smallerFont"></span> <span locale="unit/bytes">Bytes</span>
 
                 </td>
 
                 </td>
 
                 <td>
 
                 <td>
 
-                    <span id="usableSpaceInHumanReadableFormat"></span>
 
+                    <span id="usableSpaceInHumanReadableFormat" class="smallerFont"></span>
 
                 </td>
 
                 </td>
 
             </tr>
 
             </tr>
 
             <tr>
 
             <tr>
 
@@ -134,10 +137,10 @@
 
                     <div class="transparent colorblock"></div><span locale="spaceinfo/Capacity">Capacity:</span>
 
                     <div class="transparent colorblock"></div><span locale="spaceinfo/Capacity">Capacity:</span>
 
                 </td>
 
                 </td>
 
                 <td>
 
                 <td>
 
-                    <span id="totalSpaceInBytes"></span> <span locale="unit/bytes">Bytes</span>
 
+                    <span id="totalSpaceInBytes" class="smallerFont"></span> <span locale="unit/bytes">Bytes</span>
 
                 </td>
 
                 </td>
 
                 <td>
 
                 <td>
 
-                    <span id="totalSpaceInHumanReadableFormat"></span>
 
+                    <span id="totalSpaceInHumanReadableFormat" class="smallerFont"></span>
 
                 </td>
 
                 </td>
 
             </tr>
 
             </tr>
 
         </table>
 
         </table>

+ 13 - 2
web/SystemAO/info/locale.html
View File 

@@ -37,9 +37,8 @@
 
                     <input id="language" type="hidden" name="language">
 
                     <input id="language" type="hidden" name="language">
 
                     <i class="dropdown icon"></i>
 
                     <i class="dropdown icon"></i>
 
                     <div class="default text">Language</div>
 
                     <div class="default text">Language</div>
 
-                    <div class="menu">
 
+                    <div class="menu" id="langlist">
 
                         <div class="item" data-value="default">Browser Default</div>
 
                         <div class="item" data-value="default">Browser Default</div>
 
-                        <div class="item" data-value="zh-TW">繁體中文</div>
 
                     </div>
 
                     </div>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
@@ -54,6 +53,18 @@
 
             localStorage.setItem('global_language', $("#language").val());
 
             localStorage.setItem('global_language', $("#language").val());
 
             $("#updateSet").stop().finish().slideDown("fast").delay(3000).slideUp('fast');
 
             $("#updateSet").stop().finish().slideDown("fast").delay(3000).slideUp('fast');
 
         }
 
         }
 
+
 
+        //Updates 13 Nov: Remove hardcoded lang option and get lang option from file manager's localization file
 
+        $.getJSON("../locale/file_explorer.json", function(data){
 
+            for (let [key, value] of Object.entries(data.keys)) {
 
+                let langName = value.name;
 
+                if (langName == undefined || langName == null){
 
+                    langName = key;
 
+                }
 
+                console.log(langName, key);
 
+                $("#langlist").append(`<div class="item" data-value="${key}">${langName}</div>`);
 
+            }
 
+        });
 
     </script>
 
     </script>
 
 </body>
 
 </body>

+ 3 - 0
web/SystemAO/locale/file_explorer.json
View File 

@@ -3,6 +3,7 @@
 
     "version": "1.0",
 
     "version": "1.0",
 
     "keys": {
 
     "keys": {
 
         "zh-tw": {
 
         "zh-tw": {
 
+            "name": "繁體中文（台灣）",
 
             "fontFamily":"\"Microsoft JhengHei\",\"SimHei\", \"Apple LiGothic Medium\", \"STHeiti\"",
 
             "fontFamily":"\"Microsoft JhengHei\",\"SimHei\", \"Apple LiGothic Medium\", \"STHeiti\"",
 
             "strings": {
 
             "strings": {
 
                 "title/title": "檔案管理員",
 
                 "title/title": "檔案管理員",
 
@@ -177,6 +178,7 @@
 
             }
 
             }
 
         },
 
         },
 
         "zh-hk": {
 
         "zh-hk": {
 
+            "name": "繁體中文（香港）",
 
             "fontFamily":"\"Microsoft JhengHei\",\"SimHei\", \"Apple LiGothic Medium\", \"STHeiti\"",
 
             "fontFamily":"\"Microsoft JhengHei\",\"SimHei\", \"Apple LiGothic Medium\", \"STHeiti\"",
 
             "strings": {
 
             "strings": {
 
                 "title/title": "檔案管理員",
 
                 "title/title": "檔案管理員",
 
@@ -351,6 +353,7 @@
 
             }
 
             }
 
         },
 
         },
 
         "zh-cn": {
 
         "zh-cn": {
 
+            "name": "简体中文",
 
             "fontFamily":"\"Microsoft YaHei\",\"SimHei\", \"PingFangSC-Medium\", \"STHeiti\"",
 
             "fontFamily":"\"Microsoft YaHei\",\"SimHei\", \"PingFangSC-Medium\", \"STHeiti\"",
 
             "strings": {
 
             "strings": {
 
                 "title/title": "文件管理器",
 
                 "title/title": "文件管理器",