Merge remote-tracking branch 'origin/dev' into dev

app/appearance/langs/zh_CHT.json

@@ -177,8 +177,8 @@
   "updateAll": "全部更新",
   "confirmUpdateAll": "確定全部更新嗎？",
   "confirmUpdate": "確定更新嗎？",
-  "insertRowBefore": "在上方插入${x}行",
-  "insertRowAfter": "在下方插入${x}行",
+  "insertRowBefore": "在上方插入${x}列",
+  "insertRowAfter": "在下方插入${x}列",
   "setDueTime": "設定到期時間",
   "showCardDay": "要在幾天後顯示卡片？",
   "forgetCount": "遺忘次數",
@@ -1332,12 +1332,12 @@
   "cardPreview": "預覽",
   "check": "任務列表",
   "code": "代碼塊",
-  "column": "行",
+  "column": "欄",
   "copied": "已複製",
   "copy": "複製",
   "copyFile": "複製檔案",
   "copyText": "複製 文本 *",
-  "delete-column": "刪除行",
+  "delete-column": "刪除欄",
   "delete-row": "刪除列",
   "down": "下",
   "downloadTip": "該瀏覽器不支援下載功能",
@@ -1355,8 +1355,8 @@
   "inline-code": "行內代碼",
   "insertAfter": "下方插入塊",
   "insertBefore": "上方插入塊",
-  "insertColumnLeft": "在左邊插入一行",
-  "insertColumnRight": "在右邊插入一行",
+  "insertColumnLeft": "在左邊插入一欄",
+  "insertColumnRight": "在右邊插入一欄",
   "insertRowAbove": "在上方插入一列",
   "insertRowBelow": "在下方插入一列",
   "italic": "斜體",

kernel/harmony/kernel.go

@@ -20,7 +20,6 @@ import (
 	"C"
 	"fmt"
 	"os"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -114,9 +113,6 @@ func GetMimeTypeByExt(ext string) string {
 
 //export SetTimezone
 func SetTimezone(container, appDir, timezoneID string) {
-	if "ios" == container {
-		os.Setenv("ZONEINFO", filepath.Join(appDir, "app", "zoneinfo.zip"))
-	}
 	z, err := time.LoadLocation(strings.TrimSpace(timezoneID))
 	if err != nil {
 		fmt.Printf("load location failed: %s\n", err)

kernel/model/import.go

@@ -585,9 +585,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
 			return nil
 		}
 		if d.Name() == "assets" && d.IsDir() {
-			if syFiles, _ := filepath.Glob(filepath.Join(path, "*/*.sy")); 1 > len(syFiles) {
-				assetsDirs = append(assetsDirs, path)
-			}
+			assetsDirs = append(assetsDirs, path)
 		}
 		return nil
 	})
@@ -631,9 +629,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
 			return nil
 		}
 		if d.Name() == "emojis" && d.IsDir() {
-			if syFiles, _ := filepath.Glob(filepath.Join(path, "*/*.sy")); 1 > len(syFiles) {
-				emojiDirs = append(emojiDirs, path)
-			}
+			emojiDirs = append(emojiDirs, path)
 		}
 		return nil
 	})