Ver código fonte

Fixed desktop localization issue

TC pushbot 5 4 anos atrás
pai
commit
391c7a13fb
2 arquivos alterados com 118 adições e 7 exclusões
  1. 89 0
      web/SystemAO/locale/desktop.json
  2. 29 7
      web/desktop.system

+ 89 - 0
web/SystemAO/locale/desktop.json

@@ -89,6 +89,95 @@
             "placeholder":{
                 "Search": "搜尋"
             }
+        },
+        "zh-hk": {
+            "strings":{
+                "topbar/welcome":"歡迎回來",
+                "topbar/arozos":"ArozOS 網頁桌面模式",
+
+                "notification/clear": "全部清除",
+                "notification/nonotification":"無通知",
+
+                "listmenu/catergory/searchResults": "搜尋結果",
+                "listmenu/catergory/all": "全部",
+                "listmenu/catergory/media": "媒體",
+                "listmenu/catergory/office": "辦工",
+                "listmenu/catergory/download": "下載",
+                "listmenu/catergory/files": "檔案",
+                "listmenu/catergory/internet": "網絡",
+                "listmenu/catergory/settings": "設定",
+                "listmenu/catergory/tools": "系統程式",
+                "listmenu/catergory/utils": "附屬程式",
+                "listmenu/catergory/other": "其他",
+                "listmenu/catergory/exit": "登出",
+
+                "error/connlost/title": "連線中斷",
+                "error/connlost":"與伺服器的連線中斷。請等待此警告牌消失再作進一步操作",
+                "error/connlost/recheck":"重試",
+                "error/connlost/wait":"等待",
+
+                "quickAccess/logout": "登出",
+                "quickAccess/sysvol":"系統音量",
+                "quickAccess/settings":"系統設定",
+                "quickAccess/fullscreen":"切換全螢幕",
+                "quickAccess/restart":"重新啟動伺服器",
+                "quickAccess/poweroff":"關機伺服器",
+
+                "contextmenu/New": "新增",
+                "contextmenu/Open": "開啟",
+                "contextmenu/Open With": "使用 … 開啟",
+                "contextmenu/Download in Zip": "壓縮並下載",
+                "contextmenu/Make a Copy": "製作複本",
+                "contextmenu/Delete": "刪除",
+                "contextmenu/Properties": "內容",
+                "contextmenu/Share": "分享",
+                "contextmenu/Download": "下載",
+                "contextmenu/Rename": "重新命名",
+                "contextmenu/Zip here": "壓縮至此",
+                "contextmenu/Open in New Tab": "在新分頁開啟",
+                "contextmenu/Download as Zip": "壓縮並下載",
+                "contextmenu/Refresh": "重新整理",
+                "contextmenu/Open File Manager": "開啟檔案管理員",
+                "contextmenu/Open File Location": "開啟檔案位置",
+                "contextmenu/Personalization": "個人化",
+                "contextmenu/Background": "桌面背景",
+                "contextmenu/Icon Size": "圖標大小",
+                "contextmenu/Exit": "登出",
+                "contextmenu/Toggle FullScreen": "切換全螢幕",
+                "contextmenu/Minimize": "最小化",
+                "contextmenu/Restore": "還原大小",
+                "contextmenu/Maximize": "最大化",
+                "contextmenu/Close": "關閉",
+                "contextmenu/Select Other WebApps": "選擇預設應用程式",
+                "contextmenu/Open Shared Link": "開啟分享鏈接",
+                "contextmenu/Copy Link": "複製鏈接",
+                "contextmenu/Change Share Settings": "更改分享設定",
+                "contextmenu/Share this File": "分享此檔案",
+                "contextmenu/share/link": "任何擁有鏈接的使用者",
+                "contextmenu/share/signedin": "任何已登入的使用者",
+                "contextmenu/share/samegroup": "擁有相同權限的使用者",
+                "contextmenu/Remove Share": "移除檔案分享",
+                "contextmenu/Small": "小",
+                "contextmenu/Medium": "中",
+                "contextmenu/Big": "大",
+                "contextmenu/Folder": "資料夾",
+                "contextmenu/Shortcut": "捷徑",
+
+                "power/shutdown/title":"關機 - 輸入密碼以作確認",
+                "power/shutdown/text":"關閉伺服器主機",
+                "power/shutdown/instruction":"請輸入你的管理員密碼以啟動關機程序",
+
+                "power/restart/title":"重新啟動 - 輸入密碼以作確認",
+                "power/restart/text":"重啟伺服器主機",
+                "power/restart/instruction":"請輸入你的管理員密碼以確認重啟伺服器",
+
+                "upload/message/uploading": "上載中…",
+                "upload/message/failed": "上載失敗",
+                "":""
+            },
+            "placeholder":{
+                "Search": "搜尋"
+            }
         }
     }
 }

+ 29 - 7
web/desktop.system

@@ -2649,7 +2649,13 @@
                     });
                 }else{
                     //Cleanup all previous icons
-                    $("#iconwrapper").html("");
+                    $("#iconwrapper").children().each(function(){
+                        if ($(this).hasClass("launchIcon") && $(this).attr("type") == "dummy"){
+                            //Special kind of launchIcon. Skip this
+                            return;
+                        }
+                        $(this).remove();
+                    });
                 }
                 //Allocate new items location
                 var iheight = 106;
@@ -5235,7 +5241,13 @@
                     noflash: true
                 };
             }else{
-                $(".launchIcon").remove();
+                $(".launchIcon").each(function*(){
+                    if ($(this).attr("tyoe") == "dummy"){
+                        //Do not remove this
+                        return;
+                    }
+                    $(this).remove();
+                });
             }
             if (callback == undefined) {
                 initDesktopFiles(launchOption, function(){
@@ -5560,14 +5572,14 @@
                 
                 //Define a function for sending a particular chunk
                 function sendChunk(id, uploadingIconUUID){
-                    var offsetStart = id*uploadFileChunkSize;
-                    var offsetEnd = id*uploadFileChunkSize + uploadFileChunkSize;
-                    var thisblob = file.slice(offsetStart,offsetEnd);
+                    let offsetStart = id*uploadFileChunkSize;
+                    let offsetEnd = id*uploadFileChunkSize + uploadFileChunkSize;
+                    let thisblob = file.slice(offsetStart,offsetEnd);
                     socket.send(thisblob);
                     //console.log(id + "/" + chunks);
 
                     //Update progress to first percentage
-                    var progress = id / (chunks-1) * 100.0;
+                    let progress = id / (chunks-1) * 100.0;
                     if (progress > 100){
                         progress = 100;
                     }
@@ -5622,7 +5634,11 @@
                                 sendNotification("Upload Failed", resp.error, "remove")
 
                                 //Update the progress bar to error
-                               
+                                $("." + uploadingIconUUID + ".launchIcon").find(".progress").removeClass("primary").addClass("error");
+                                $("." + uploadingIconUUID + ".launchIcon").find(".launchIconText").text(applocale.getString("upload/message/failed", "Failed!"));
+                                setTimeout(function(){
+                                    $("." + uploadingIconUUID + ".launchIcon").fadeOut(3000,function() { $(this).remove(); });
+                                }, 2000);
                             }
                         }catch(ex){
                             //Something else
@@ -5676,6 +5692,12 @@
                     }
                     else if (xhr.readyState == 4 && xhr.status != 200) {
                         console.log("Upload failed :" + xhr.status);
+                        //Set upload progress bar to error
+                        $("." + uploadingIconUUID + ".launchIcon").find(".progress").removeClass("primary").addClass("error");
+                        $("." + uploadingIconUUID + ".launchIcon").find(".launchIconText").text(applocale.getString("upload/message/failed", "Failed!"));
+                        setTimeout(function(){
+                            $("." + uploadingIconUUID + ".launchIcon").fadeOut(3000,function() { $(this).remove(); });
+                        }, 2000);
                     }
                 })
                 xhr.send(formData);