Skip to content

Commit

Permalink
Merge branch 'release/v0.19.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
gee1k committed Jun 12, 2020
2 parents b3bc86d + 732095c commit 7443db1
Show file tree
Hide file tree
Showing 8 changed files with 512 additions and 14 deletions.
33 changes: 21 additions & 12 deletions uPic.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
/* Begin PBXFileReference section */
1602ED9622ADEFB200AA8638 /* BaseUploader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseUploader.swift; sourceTree = "<group>"; };
1602ED9822ADF43800AA8638 /* SmmsUploader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmmsUploader.swift; sourceTree = "<group>"; };
1605DDD8246D993C00262C89 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Main.strings"; sourceTree = "<group>"; };
1605DDD9246D993C00262C89 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Preferences.strings"; sourceTree = "<group>"; };
1605DDDA246D993D00262C89 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
1605DDDB246D996700262C89 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
16068C7422AEC1D1004D39B7 /* PreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesViewController.swift; sourceTree = "<group>"; };
16068C7722AECB34004D39B7 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
16068C7B22AECD9F004D39B7 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -849,6 +853,7 @@
en,
Base,
"zh-Hans",
"zh-Hant",
);
mainGroup = 16A6DC4B22AA375700813706;
productRefGroup = 16A6DC4B22AA375700813706;
Expand Down Expand Up @@ -1087,6 +1092,7 @@
children = (
1623612422AB951E00E4025C /* en */,
1623612622AB951F00E4025C /* zh-Hans */,
1605DDDB246D996700262C89 /* zh-Hant */,
);
name = Localizable.strings;
sourceTree = "<group>";
Expand All @@ -1097,6 +1103,7 @@
1648A215238E742600B99B9D /* Base */,
1648A218238E743200B99B9D /* zh-Hans */,
9667517C240D2BA6007C7012 /* en */,
1605DDD8246D993C00262C89 /* zh-Hant */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand All @@ -1107,6 +1114,7 @@
169F073C22AF53DE008E8525 /* Base */,
161ABBE323B212C800805C5B /* zh-Hans */,
969018A3240D998400B545B2 /* en */,
1605DDD9246D993C00262C89 /* zh-Hant */,
);
name = Preferences.storyboard;
sourceTree = "<group>";
Expand All @@ -1116,6 +1124,7 @@
children = (
968ECC08240DFCF900B2D78C /* en */,
968ECC0A240DFCFA00B2D78C /* zh-Hans */,
1605DDDA246D993D00262C89 /* zh-Hant */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
Expand Down Expand Up @@ -1251,7 +1260,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20200505;
CURRENT_PROJECT_VERSION = 20200612;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
Expand All @@ -1260,10 +1269,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.19.2;
MARKETING_VERSION = 0.19.3;
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = Developer_uPic_osx;
PROVISIONING_PROFILE_SPECIFIER = "uPic for macOS Developer";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -1281,7 +1290,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20200505;
CURRENT_PROJECT_VERSION = 20200612;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
Expand All @@ -1290,10 +1299,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.19.2;
MARKETING_VERSION = 0.19.3;
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = Developer_uPic_osx;
PROVISIONING_PROFILE_SPECIFIER = "uPic for macOS Developer";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 5.0;
};
Expand All @@ -1307,7 +1316,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20200505;
CURRENT_PROJECT_VERSION = 20200612;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
Expand All @@ -1317,10 +1326,10 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.19.2;
MARKETING_VERSION = 0.19.3;
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = Developer_uPic_osx_finder;
PROVISIONING_PROFILE_SPECIFIER = "uPic for macOS_ FinderExtension Developer";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
Expand All @@ -1334,7 +1343,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20200505;
CURRENT_PROJECT_VERSION = 20200612;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
Expand All @@ -1344,10 +1353,10 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.19.2;
MARKETING_VERSION = 0.19.3;
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = Developer_uPic_osx_finder;
PROVISIONING_PROFILE_SPECIFIER = "uPic for macOS_ FinderExtension Developer";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
Expand Down
2 changes: 1 addition & 1 deletion uPic/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ extension AppDelegate {
// sponsor

func sponsorByPaypal() {
guard let url = URL(string: "https://paypal.me/geeek") else { return }
guard let url = URL(string: "https://paypal.me/geeee1k") else { return }
NSWorkspace.shared.open(url)
}

Expand Down
4 changes: 4 additions & 0 deletions uPic/Models/Amazon_S3/AmazonS3Region.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ public class AmazonS3Region {
if key.isEmpty {
return ""
}
if key == "cn-north-1" || key == "cn-northwest-1" {
// s3-control.cn-north-1.amazonaws.com.cn
return "s3.\(key).amazonaws.com.cn"
}
return "s3.\(key).amazonaws.com"
}

Expand Down
2 changes: 1 addition & 1 deletion uPic/Models/Weibo/WeiboHostConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class WeiboHostConfig: HostConfig {
dynamic var cookie: String = ""
dynamic var quality: String = WeiboqQuality.large.rawValue
// tva1.sinaimg.cn
dynamic var domain: String = "https://ws1.sinaimg.cn"
dynamic var domain: String = "https://ww1.sinaimg.cn"

override func displayName(key: String) -> String {
switch key {
Expand Down
171 changes: 171 additions & 0 deletions uPic/PreferencesWindow/zh-Hant.lproj/Preferences.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@

/* Class = "NSButtonCell"; title = "svend.cc"; ObjectID = "0dV-As-mmQ"; */
"0dV-As-mmQ.title" = "svend.cc";

/* Class = "NSTextFieldCell"; title = "may require a"; ObjectID = "2Rg-te-FPU"; */
"2Rg-te-FPU.title" = "可能需要";

/* Class = "NSButtonCell"; title = "Paypal"; ObjectID = "59m-hG-lVw"; */
"59m-hG-lVw.title" = "PayPal";

/* Class = "NSViewController"; title = "Host"; ObjectID = "5Ln-jV-uxk"; */
"5Ln-jV-uxk.title" = "圖床";

/* Class = "NSWindow"; title = "Preferences"; ObjectID = "5f3-UK-Rft"; */
"5f3-UK-Rft.title" = "偏好設定";

/* Class = "NSButtonCell"; title = "Reset"; ObjectID = "8gb-uy-oRd"; */
"8gb-uy-oRd.title" = "重設";

/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "8lH-1K-GR0"; */
"8lH-1K-GR0.title" = "複製";

/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "8px-ng-UpC"; */
"8px-ng-UpC.title" = "Text Cell";

/* Class = "NSTextFieldCell"; title = "Spacing:"; ObjectID = "AYG-Uz-MYq"; */
"AYG-Uz-MYq.title" = "內邊距:";

/* Class = "NSTextFieldCell"; title = "File name scroll speed:"; ObjectID = "BBZ-i9-B2g"; */
"BBZ-i9-B2g.title" = "文件名滾動速度(ms):";

/* Class = "NSButtonCell"; title = "Add Header Field"; ObjectID = "Ckh-A7-mxC"; */
"Ckh-A7-mxC.title" = "增加 Header 字段";

/* Class = "NSButtonCell"; title = "OK"; ObjectID = "Cp0-zp-Dpm"; */
"Cp0-zp-Dpm.title" = "確定";

/* Class = "NSTextFieldCell"; title = "Shortcuts"; ObjectID = "FpP-Q9-flS"; */
"FpP-Q9-flS.title" = "快捷鍵";

/* Class = "NSViewController"; title = "General"; ObjectID = "Gn1-zC-bzB"; */
"Gn1-zC-bzB.title" = "通用";

/* Class = "NSMenuItem"; title = "Non"; ObjectID = "GwK-5k-ATM"; */
"GwK-5k-ATM.title" = "無圖標";

/* Class = "NSViewController"; title = "Advanced"; ObjectID = "H3q-JS-Bu4"; */
"H3q-JS-Bu4.title" = "進階";

/* Class = "NSTextFieldCell"; title = "💻 GitHub:"; ObjectID = "How-dP-tcX"; */
"How-dP-tcX.title" = "💻 GitHub:";

/* Class = "NSButtonCell"; title = "[email protected]"; ObjectID = "IPL-yO-Vkp"; */
"IPL-yO-Vkp.title" = "[email protected]";

/* Class = "NSTextFieldCell"; title = "0.1.0"; ObjectID = "Jnf-AX-bIr"; */
"Jnf-AX-bIr.title" = "0.1.0";

/* Class = "NSTextFieldCell"; title = "Upload from select file:"; ObjectID = "Mqt-Fp-Ssl"; */
"Mqt-Fp-Ssl.title" = "選擇文件上傳:";

/* Class = "NSTextFieldCell"; title = "Columns:"; ObjectID = "N1b-Cf-tno"; */
"N1b-Cf-tno.title" = "列數:";

/* Class = "NSTextFieldCell"; title = "🐦 Twitter:"; ObjectID = "OKr-1C-5jV"; */
"OKr-1C-5jV.title" = "🐦 Twitter:";

/* Class = "NSTextFieldCell"; title = "File name scroll wait time:"; ObjectID = "ON0-aF-BNd"; */
"ON0-aF-BNd.title" = "文件名滾動等待時間(s):";

/* Class = "NSBox"; title = "Header and Body Data"; ObjectID = "OaN-c4-l0X"; */
"OaN-c4-l0X.title" = "Header 和 Body 資料";

/* Class = "NSTextFieldCell"; title = "💡 HomePage:"; ObjectID = "OjL-Zl-YKD"; */
"OjL-Zl-YKD.title" = "💡 主頁:";

/* Class = "NSTextFieldCell"; title = "⚠️ Note that this will reset all user preferences"; ObjectID = "PmD-JC-2Hq"; */
"PmD-JC-2Hq.title" = "⚠️ 注意這將會重置所有用戶偏好設定";

/* Class = "NSTextFieldCell"; title = "Supports {year} {month} {day} {hour} {minute} {second} {since_second} {since_millisecond} {random} {filename} {.suffix} {saveKey} and etc."; ObjectID = "R0i-0c-6TZ"; */
"R0i-0c-6TZ.title" = "支持 {year} {month} {day} {hour} {minute} {second} {since_second} {since_millisecond} {random} {filename} {.suffix} {suffix} {mimetype} {saveKey} 等變數。";

/* Class = "NSButtonCell"; title = "⚠️ Reset"; ObjectID = "TD4-LI-X9U"; */
"TD4-LI-X9U.title" = "⚠️ 撤回";

/* Class = "NSTextFieldCell"; title = "History record"; ObjectID = "UN0-Iq-Cop"; */
"UN0-Iq-Cop.title" = "歷史記錄";

/* Class = "NSTextFieldCell"; title = "💸 Donate:"; ObjectID = "Vjv-pA-ffP"; */
"Vjv-pA-ffP.title" = "💸 贊助:";

/* Class = "NSTextFieldCell"; title = "✉️ Contact:"; ObjectID = "Vu4-Wz-Agk"; */
"Vu4-Wz-Agk.title" = "✉️ 聯繫:";

/* Class = "NSTextFieldCell"; title = "Upload from screenshot:"; ObjectID = "Xd9-iA-emU"; */
"Xd9-iA-emU.title" = "截圖並上傳:";

/* Class = "NSTextFieldCell"; title = "Finder extension"; ObjectID = "XtR-28-Jft"; */
"XtR-28-Jft.title" = "查看擴展";

/* Class = "NSButtonCell"; title = "Launch uPic at login"; ObjectID = "ZbK-xW-anT"; */
"ZbK-xW-anT.title" = "開機自動啟動 uPic";

/* Class = "NSTextFieldCell"; title = "Padding:"; ObjectID = "bp8-mz-gke"; */
"bp8-mz-gke.title" = "外邊距:";

/* Class = "NSTextFieldCell"; title = "Upload from clipboard:"; ObjectID = "bvy-v3-hhf"; */
"bvy-v3-hhf.title" = "剪貼板上傳:";

/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "chO-9j-Fca"; */
"chO-9j-Fca.title" = "編輯";

/* Class = "NSBox"; title = "HostSettings"; ObjectID = "dEW-XT-ogl"; */
"dEW-XT-ogl.title" = "設定雲存處";

/* Class = "NSMenuItem"; title = "Single"; ObjectID = "dGv-rY-F7Z"; */
"dGv-rY-F7Z.title" = "單色";

/* Class = "NSMenuItem"; title = "More"; ObjectID = "dZy-kW-0lH"; */
"dZy-kW-0lH.title" = "更多";

/* Class = "NSButtonCell"; title = "Alipay"; ObjectID = "eWy-BH-pJy"; */
"eWy-BH-pJy.title" = "支付寶";

/* Class = "NSButtonCell"; title = "https://github.com/gee1k/uPic"; ObjectID = "f2V-P5-pQI"; */
"f2V-P5-pQI.title" = "https://github.com/gee1k/uPic";

/* Class = "NSButtonCell"; title = "WeChat"; ObjectID = "fJL-Ts-QPI"; */
"fJL-Ts-QPI.title" = "WeChat";

/* Class = "NSButtonCell"; title = "@geee1k"; ObjectID = "i90-se-6z8"; */
"i90-se-6z8.title" = "@geee1k";

/* Class = "NSTextFieldCell"; title = "Width:"; ObjectID = "iRI-j6-BHQ"; */
"iRI-j6-BHQ.title" = "寬度:";

/* Class = "NSButtonCell"; title = "Finder Restart"; ObjectID = "jA2-Zt-kWu"; */
"jA2-Zt-kWu.title" = "重啟訪達";

/* Class = "NSTextFieldCell"; title = "Reset"; ObjectID = "jcs-Ou-OZ2"; */
"jcs-Ou-OZ2.title" = "重置";

/* Class = "NSButtonCell"; title = "Reset preferences"; ObjectID = "jyI-H7-qN3"; */
"jyI-H7-qN3.title" = "重置偏好設置";

/* Class = "NSButtonCell"; title = "Save"; ObjectID = "k4M-cg-63L"; */
"k4M-cg-63L.title" = "存檔";

/* Class = "NSViewController"; title = "About"; ObjectID = "k6X-N1-mVu"; */
"k6X-N1-mVu.title" = "關於";

/* Class = "NSTextFieldCell"; title = "uPic"; ObjectID = "mOB-su-ZM1"; */
"mOB-su-ZM1.title" = "uPic";

/* Class = "NSTextFieldCell"; title = "uPic will automatically launch at login."; ObjectID = "ngT-lX-vFA"; */
"ngT-lX-vFA.title" = "uPic 將在系統啟動時時自動啟動。";

/* Class = "NSButtonCell"; title = "Save"; ObjectID = "nvN-EI-scz"; */
"nvN-EI-scz.title" = "存檔";

/* Class = "NSButtonCell"; title = "Add Body Field"; ObjectID = "osM-Ga-s0H"; */
"osM-Ga-s0H.title" = "新增 Body 字段";

/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "q1H-P0-jix"; */
"q1H-P0-jix.title" = "取消";

/* Class = "NSMenuItem"; title = "Color"; ObjectID = "q6h-oC-nNb"; */
"q6h-oC-nNb.title" = "彩色";

/* Class = "NSTextFieldCell"; title = "Icon:"; ObjectID = "ugx-B2-gPe"; */
"ugx-B2-gPe.title" = "圖標:";
Loading

0 comments on commit 7443db1

Please sign in to comment.