Skip to content

Commit 7443db1

Browse files
committed
Merge branch 'release/v0.19.3'
2 parents b3bc86d + 732095c commit 7443db1

File tree

8 files changed

+512
-14
lines changed

8 files changed

+512
-14
lines changed

uPic.xcodeproj/project.pbxproj

+21-12
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@
183183
/* Begin PBXFileReference section */
184184
1602ED9622ADEFB200AA8638 /* BaseUploader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseUploader.swift; sourceTree = "<group>"; };
185185
1602ED9822ADF43800AA8638 /* SmmsUploader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmmsUploader.swift; sourceTree = "<group>"; };
186+
1605DDD8246D993C00262C89 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Main.strings"; sourceTree = "<group>"; };
187+
1605DDD9246D993C00262C89 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Preferences.strings"; sourceTree = "<group>"; };
188+
1605DDDA246D993D00262C89 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
189+
1605DDDB246D996700262C89 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
186190
16068C7422AEC1D1004D39B7 /* PreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesViewController.swift; sourceTree = "<group>"; };
187191
16068C7722AECB34004D39B7 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
188192
16068C7B22AECD9F004D39B7 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
@@ -849,6 +853,7 @@
849853
en,
850854
Base,
851855
"zh-Hans",
856+
"zh-Hant",
852857
);
853858
mainGroup = 16A6DC4B22AA375700813706;
854859
productRefGroup = 16A6DC4B22AA375700813706;
@@ -1087,6 +1092,7 @@
10871092
children = (
10881093
1623612422AB951E00E4025C /* en */,
10891094
1623612622AB951F00E4025C /* zh-Hans */,
1095+
1605DDDB246D996700262C89 /* zh-Hant */,
10901096
);
10911097
name = Localizable.strings;
10921098
sourceTree = "<group>";
@@ -1097,6 +1103,7 @@
10971103
1648A215238E742600B99B9D /* Base */,
10981104
1648A218238E743200B99B9D /* zh-Hans */,
10991105
9667517C240D2BA6007C7012 /* en */,
1106+
1605DDD8246D993C00262C89 /* zh-Hant */,
11001107
);
11011108
name = Main.storyboard;
11021109
sourceTree = "<group>";
@@ -1107,6 +1114,7 @@
11071114
169F073C22AF53DE008E8525 /* Base */,
11081115
161ABBE323B212C800805C5B /* zh-Hans */,
11091116
969018A3240D998400B545B2 /* en */,
1117+
1605DDD9246D993C00262C89 /* zh-Hant */,
11101118
);
11111119
name = Preferences.storyboard;
11121120
sourceTree = "<group>";
@@ -1116,6 +1124,7 @@
11161124
children = (
11171125
968ECC08240DFCF900B2D78C /* en */,
11181126
968ECC0A240DFCFA00B2D78C /* zh-Hans */,
1127+
1605DDDA246D993D00262C89 /* zh-Hant */,
11191128
);
11201129
name = InfoPlist.strings;
11211130
sourceTree = "<group>";
@@ -1251,7 +1260,7 @@
12511260
CODE_SIGN_IDENTITY = "Developer ID Application";
12521261
CODE_SIGN_STYLE = Manual;
12531262
COMBINE_HIDPI_IMAGES = YES;
1254-
CURRENT_PROJECT_VERSION = 20200505;
1263+
CURRENT_PROJECT_VERSION = 20200612;
12551264
DEVELOPMENT_TEAM = W863J6W8DZ;
12561265
ENABLE_HARDENED_RUNTIME = YES;
12571266
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1260,10 +1269,10 @@
12601269
"@executable_path/../Frameworks",
12611270
);
12621271
MACOSX_DEPLOYMENT_TARGET = 10.12;
1263-
MARKETING_VERSION = 0.19.2;
1272+
MARKETING_VERSION = 0.19.3;
12641273
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
12651274
PRODUCT_NAME = "$(TARGET_NAME)";
1266-
PROVISIONING_PROFILE_SPECIFIER = Developer_uPic_osx;
1275+
PROVISIONING_PROFILE_SPECIFIER = "uPic for macOS Developer";
12671276
SWIFT_OBJC_BRIDGING_HEADER = "";
12681277
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
12691278
SWIFT_VERSION = 5.0;
@@ -1281,7 +1290,7 @@
12811290
CODE_SIGN_IDENTITY = "Developer ID Application";
12821291
CODE_SIGN_STYLE = Manual;
12831292
COMBINE_HIDPI_IMAGES = YES;
1284-
CURRENT_PROJECT_VERSION = 20200505;
1293+
CURRENT_PROJECT_VERSION = 20200612;
12851294
DEVELOPMENT_TEAM = W863J6W8DZ;
12861295
ENABLE_HARDENED_RUNTIME = YES;
12871296
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1290,10 +1299,10 @@
12901299
"@executable_path/../Frameworks",
12911300
);
12921301
MACOSX_DEPLOYMENT_TARGET = 10.12;
1293-
MARKETING_VERSION = 0.19.2;
1302+
MARKETING_VERSION = 0.19.3;
12941303
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
12951304
PRODUCT_NAME = "$(TARGET_NAME)";
1296-
PROVISIONING_PROFILE_SPECIFIER = Developer_uPic_osx;
1305+
PROVISIONING_PROFILE_SPECIFIER = "uPic for macOS Developer";
12971306
SWIFT_OBJC_BRIDGING_HEADER = "";
12981307
SWIFT_VERSION = 5.0;
12991308
};
@@ -1307,7 +1316,7 @@
13071316
CODE_SIGN_IDENTITY = "Developer ID Application";
13081317
CODE_SIGN_STYLE = Manual;
13091318
COMBINE_HIDPI_IMAGES = YES;
1310-
CURRENT_PROJECT_VERSION = 20200505;
1319+
CURRENT_PROJECT_VERSION = 20200612;
13111320
DEVELOPMENT_TEAM = W863J6W8DZ;
13121321
ENABLE_HARDENED_RUNTIME = YES;
13131322
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1317,10 +1326,10 @@
13171326
"@executable_path/../../../../Frameworks",
13181327
);
13191328
MACOSX_DEPLOYMENT_TARGET = 10.12;
1320-
MARKETING_VERSION = 0.19.2;
1329+
MARKETING_VERSION = 0.19.3;
13211330
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
13221331
PRODUCT_NAME = "$(TARGET_NAME)";
1323-
PROVISIONING_PROFILE_SPECIFIER = Developer_uPic_osx_finder;
1332+
PROVISIONING_PROFILE_SPECIFIER = "uPic for macOS_ FinderExtension Developer";
13241333
SKIP_INSTALL = YES;
13251334
SWIFT_VERSION = 5.0;
13261335
};
@@ -1334,7 +1343,7 @@
13341343
CODE_SIGN_IDENTITY = "Developer ID Application";
13351344
CODE_SIGN_STYLE = Manual;
13361345
COMBINE_HIDPI_IMAGES = YES;
1337-
CURRENT_PROJECT_VERSION = 20200505;
1346+
CURRENT_PROJECT_VERSION = 20200612;
13381347
DEVELOPMENT_TEAM = W863J6W8DZ;
13391348
ENABLE_HARDENED_RUNTIME = YES;
13401349
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1344,10 +1353,10 @@
13441353
"@executable_path/../../../../Frameworks",
13451354
);
13461355
MACOSX_DEPLOYMENT_TARGET = 10.12;
1347-
MARKETING_VERSION = 0.19.2;
1356+
MARKETING_VERSION = 0.19.3;
13481357
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
13491358
PRODUCT_NAME = "$(TARGET_NAME)";
1350-
PROVISIONING_PROFILE_SPECIFIER = Developer_uPic_osx_finder;
1359+
PROVISIONING_PROFILE_SPECIFIER = "uPic for macOS_ FinderExtension Developer";
13511360
SKIP_INSTALL = YES;
13521361
SWIFT_VERSION = 5.0;
13531362
};

uPic/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ extension AppDelegate {
515515
// sponsor
516516

517517
func sponsorByPaypal() {
518-
guard let url = URL(string: "https://paypal.me/geeek") else { return }
518+
guard let url = URL(string: "https://paypal.me/geeee1k") else { return }
519519
NSWorkspace.shared.open(url)
520520
}
521521

uPic/Models/Amazon_S3/AmazonS3Region.swift

+4
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ public class AmazonS3Region {
5151
if key.isEmpty {
5252
return ""
5353
}
54+
if key == "cn-north-1" || key == "cn-northwest-1" {
55+
// s3-control.cn-north-1.amazonaws.com.cn
56+
return "s3.\(key).amazonaws.com.cn"
57+
}
5458
return "s3.\(key).amazonaws.com"
5559
}
5660

uPic/Models/Weibo/WeiboHostConfig.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class WeiboHostConfig: HostConfig {
1616
dynamic var cookie: String = ""
1717
dynamic var quality: String = WeiboqQuality.large.rawValue
1818
// tva1.sinaimg.cn
19-
dynamic var domain: String = "https://ws1.sinaimg.cn"
19+
dynamic var domain: String = "https://ww1.sinaimg.cn"
2020

2121
override func displayName(key: String) -> String {
2222
switch key {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
2+
/* Class = "NSButtonCell"; title = "svend.cc"; ObjectID = "0dV-As-mmQ"; */
3+
"0dV-As-mmQ.title" = "svend.cc";
4+
5+
/* Class = "NSTextFieldCell"; title = "may require a"; ObjectID = "2Rg-te-FPU"; */
6+
"2Rg-te-FPU.title" = "可能需要";
7+
8+
/* Class = "NSButtonCell"; title = "Paypal"; ObjectID = "59m-hG-lVw"; */
9+
"59m-hG-lVw.title" = "PayPal";
10+
11+
/* Class = "NSViewController"; title = "Host"; ObjectID = "5Ln-jV-uxk"; */
12+
"5Ln-jV-uxk.title" = "圖床";
13+
14+
/* Class = "NSWindow"; title = "Preferences"; ObjectID = "5f3-UK-Rft"; */
15+
"5f3-UK-Rft.title" = "偏好設定";
16+
17+
/* Class = "NSButtonCell"; title = "Reset"; ObjectID = "8gb-uy-oRd"; */
18+
"8gb-uy-oRd.title" = "重設";
19+
20+
/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "8lH-1K-GR0"; */
21+
"8lH-1K-GR0.title" = "複製";
22+
23+
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "8px-ng-UpC"; */
24+
"8px-ng-UpC.title" = "Text Cell";
25+
26+
/* Class = "NSTextFieldCell"; title = "Spacing:"; ObjectID = "AYG-Uz-MYq"; */
27+
"AYG-Uz-MYq.title" = "內邊距:";
28+
29+
/* Class = "NSTextFieldCell"; title = "File name scroll speed:"; ObjectID = "BBZ-i9-B2g"; */
30+
"BBZ-i9-B2g.title" = "文件名滾動速度(ms):";
31+
32+
/* Class = "NSButtonCell"; title = "Add Header Field"; ObjectID = "Ckh-A7-mxC"; */
33+
"Ckh-A7-mxC.title" = "增加 Header 字段";
34+
35+
/* Class = "NSButtonCell"; title = "OK"; ObjectID = "Cp0-zp-Dpm"; */
36+
"Cp0-zp-Dpm.title" = "確定";
37+
38+
/* Class = "NSTextFieldCell"; title = "Shortcuts"; ObjectID = "FpP-Q9-flS"; */
39+
"FpP-Q9-flS.title" = "快捷鍵";
40+
41+
/* Class = "NSViewController"; title = "General"; ObjectID = "Gn1-zC-bzB"; */
42+
"Gn1-zC-bzB.title" = "通用";
43+
44+
/* Class = "NSMenuItem"; title = "Non"; ObjectID = "GwK-5k-ATM"; */
45+
"GwK-5k-ATM.title" = "無圖標";
46+
47+
/* Class = "NSViewController"; title = "Advanced"; ObjectID = "H3q-JS-Bu4"; */
48+
"H3q-JS-Bu4.title" = "進階";
49+
50+
/* Class = "NSTextFieldCell"; title = "💻 GitHub:"; ObjectID = "How-dP-tcX"; */
51+
"How-dP-tcX.title" = "💻 GitHub:";
52+
53+
/* Class = "NSButtonCell"; title = "[email protected]"; ObjectID = "IPL-yO-Vkp"; */
54+
"IPL-yO-Vkp.title" = "[email protected]";
55+
56+
/* Class = "NSTextFieldCell"; title = "0.1.0"; ObjectID = "Jnf-AX-bIr"; */
57+
"Jnf-AX-bIr.title" = "0.1.0";
58+
59+
/* Class = "NSTextFieldCell"; title = "Upload from select file:"; ObjectID = "Mqt-Fp-Ssl"; */
60+
"Mqt-Fp-Ssl.title" = "選擇文件上傳:";
61+
62+
/* Class = "NSTextFieldCell"; title = "Columns:"; ObjectID = "N1b-Cf-tno"; */
63+
"N1b-Cf-tno.title" = "列數:";
64+
65+
/* Class = "NSTextFieldCell"; title = "🐦 Twitter:"; ObjectID = "OKr-1C-5jV"; */
66+
"OKr-1C-5jV.title" = "🐦 Twitter:";
67+
68+
/* Class = "NSTextFieldCell"; title = "File name scroll wait time:"; ObjectID = "ON0-aF-BNd"; */
69+
"ON0-aF-BNd.title" = "文件名滾動等待時間(s):";
70+
71+
/* Class = "NSBox"; title = "Header and Body Data"; ObjectID = "OaN-c4-l0X"; */
72+
"OaN-c4-l0X.title" = "Header 和 Body 資料";
73+
74+
/* Class = "NSTextFieldCell"; title = "💡 HomePage:"; ObjectID = "OjL-Zl-YKD"; */
75+
"OjL-Zl-YKD.title" = "💡 主頁:";
76+
77+
/* Class = "NSTextFieldCell"; title = "⚠️ Note that this will reset all user preferences"; ObjectID = "PmD-JC-2Hq"; */
78+
"PmD-JC-2Hq.title" = "⚠️ 注意這將會重置所有用戶偏好設定";
79+
80+
/* Class = "NSTextFieldCell"; title = "Supports {year} {month} {day} {hour} {minute} {second} {since_second} {since_millisecond} {random} {filename} {.suffix} {saveKey} and etc."; ObjectID = "R0i-0c-6TZ"; */
81+
"R0i-0c-6TZ.title" = "支持 {year} {month} {day} {hour} {minute} {second} {since_second} {since_millisecond} {random} {filename} {.suffix} {suffix} {mimetype} {saveKey} 等變數。";
82+
83+
/* Class = "NSButtonCell"; title = "⚠️ Reset"; ObjectID = "TD4-LI-X9U"; */
84+
"TD4-LI-X9U.title" = "⚠️ 撤回";
85+
86+
/* Class = "NSTextFieldCell"; title = "History record"; ObjectID = "UN0-Iq-Cop"; */
87+
"UN0-Iq-Cop.title" = "歷史記錄";
88+
89+
/* Class = "NSTextFieldCell"; title = "💸 Donate:"; ObjectID = "Vjv-pA-ffP"; */
90+
"Vjv-pA-ffP.title" = "💸 贊助:";
91+
92+
/* Class = "NSTextFieldCell"; title = "✉️ Contact:"; ObjectID = "Vu4-Wz-Agk"; */
93+
"Vu4-Wz-Agk.title" = "✉️ 聯繫:";
94+
95+
/* Class = "NSTextFieldCell"; title = "Upload from screenshot:"; ObjectID = "Xd9-iA-emU"; */
96+
"Xd9-iA-emU.title" = "截圖並上傳:";
97+
98+
/* Class = "NSTextFieldCell"; title = "Finder extension"; ObjectID = "XtR-28-Jft"; */
99+
"XtR-28-Jft.title" = "查看擴展";
100+
101+
/* Class = "NSButtonCell"; title = "Launch uPic at login"; ObjectID = "ZbK-xW-anT"; */
102+
"ZbK-xW-anT.title" = "開機自動啟動 uPic";
103+
104+
/* Class = "NSTextFieldCell"; title = "Padding:"; ObjectID = "bp8-mz-gke"; */
105+
"bp8-mz-gke.title" = "外邊距:";
106+
107+
/* Class = "NSTextFieldCell"; title = "Upload from clipboard:"; ObjectID = "bvy-v3-hhf"; */
108+
"bvy-v3-hhf.title" = "剪貼板上傳:";
109+
110+
/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "chO-9j-Fca"; */
111+
"chO-9j-Fca.title" = "編輯";
112+
113+
/* Class = "NSBox"; title = "HostSettings"; ObjectID = "dEW-XT-ogl"; */
114+
"dEW-XT-ogl.title" = "設定雲存處";
115+
116+
/* Class = "NSMenuItem"; title = "Single"; ObjectID = "dGv-rY-F7Z"; */
117+
"dGv-rY-F7Z.title" = "單色";
118+
119+
/* Class = "NSMenuItem"; title = "More"; ObjectID = "dZy-kW-0lH"; */
120+
"dZy-kW-0lH.title" = "更多";
121+
122+
/* Class = "NSButtonCell"; title = "Alipay"; ObjectID = "eWy-BH-pJy"; */
123+
"eWy-BH-pJy.title" = "支付寶";
124+
125+
/* Class = "NSButtonCell"; title = "https://github.com/gee1k/uPic"; ObjectID = "f2V-P5-pQI"; */
126+
"f2V-P5-pQI.title" = "https://github.com/gee1k/uPic";
127+
128+
/* Class = "NSButtonCell"; title = "WeChat"; ObjectID = "fJL-Ts-QPI"; */
129+
"fJL-Ts-QPI.title" = "WeChat";
130+
131+
/* Class = "NSButtonCell"; title = "@geee1k"; ObjectID = "i90-se-6z8"; */
132+
"i90-se-6z8.title" = "@geee1k";
133+
134+
/* Class = "NSTextFieldCell"; title = "Width:"; ObjectID = "iRI-j6-BHQ"; */
135+
"iRI-j6-BHQ.title" = "寬度:";
136+
137+
/* Class = "NSButtonCell"; title = "Finder Restart"; ObjectID = "jA2-Zt-kWu"; */
138+
"jA2-Zt-kWu.title" = "重啟訪達";
139+
140+
/* Class = "NSTextFieldCell"; title = "Reset"; ObjectID = "jcs-Ou-OZ2"; */
141+
"jcs-Ou-OZ2.title" = "重置";
142+
143+
/* Class = "NSButtonCell"; title = "Reset preferences"; ObjectID = "jyI-H7-qN3"; */
144+
"jyI-H7-qN3.title" = "重置偏好設置";
145+
146+
/* Class = "NSButtonCell"; title = "Save"; ObjectID = "k4M-cg-63L"; */
147+
"k4M-cg-63L.title" = "存檔";
148+
149+
/* Class = "NSViewController"; title = "About"; ObjectID = "k6X-N1-mVu"; */
150+
"k6X-N1-mVu.title" = "關於";
151+
152+
/* Class = "NSTextFieldCell"; title = "uPic"; ObjectID = "mOB-su-ZM1"; */
153+
"mOB-su-ZM1.title" = "uPic";
154+
155+
/* Class = "NSTextFieldCell"; title = "uPic will automatically launch at login."; ObjectID = "ngT-lX-vFA"; */
156+
"ngT-lX-vFA.title" = "uPic 將在系統啟動時時自動啟動。";
157+
158+
/* Class = "NSButtonCell"; title = "Save"; ObjectID = "nvN-EI-scz"; */
159+
"nvN-EI-scz.title" = "存檔";
160+
161+
/* Class = "NSButtonCell"; title = "Add Body Field"; ObjectID = "osM-Ga-s0H"; */
162+
"osM-Ga-s0H.title" = "新增 Body 字段";
163+
164+
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "q1H-P0-jix"; */
165+
"q1H-P0-jix.title" = "取消";
166+
167+
/* Class = "NSMenuItem"; title = "Color"; ObjectID = "q6h-oC-nNb"; */
168+
"q6h-oC-nNb.title" = "彩色";
169+
170+
/* Class = "NSTextFieldCell"; title = "Icon:"; ObjectID = "ugx-B2-gPe"; */
171+
"ugx-B2-gPe.title" = "圖標:";

0 commit comments

Comments
 (0)