Skip to content

Commit 9f65328

Browse files
chihchychihchy
authored
Merge pull request #405 from EhPanda-Team/develop
Bugfix & I18n improvement
2 parents 9b8fce2 + bcb9234 commit 9f65328

File tree

14 files changed

+677
-669
lines changed

14 files changed

+677
-669
lines changed

‎.github/workflows/dependencies.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
forceResolution: true
2121
failWhenOutdated: false
22-
xcodePath: '/Applications/Xcode_16.1.app'
22+
xcodePath: '/Applications/Xcode_16.2.app'
2323
- name: Create Pull Request
2424
if: steps.resolution.outputs.dependenciesChanged == 'true'
2525
uses: peter-evans/create-pull-request@v7

‎.github/workflows/deploy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
- main
66
types: [closed]
77
env:
8-
DEVELOPER_DIR: /Applications/Xcode_16.1.app
9-
APP_VERSION: '2.7.8'
8+
DEVELOPER_DIR: /Applications/Xcode_16.2.app
9+
APP_VERSION: '2.7.9'
1010
SCHEME_NAME: 'EhPanda'
1111
ALTSTORE_JSON_PATH: './AltStore.json'
1212
BUILDS_PATH: '/tmp/action-builds'

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Test
22
on: [push, workflow_dispatch]
33
env:
44
SCHEME_NAME: 'EhPanda'
5-
DEVELOPER_DIR: /Applications/Xcode_16.1.app
5+
DEVELOPER_DIR: /Applications/Xcode_16.2.app
66
jobs:
77
Test:
88
runs-on: macos-15

‎EhPanda.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2487,7 +2487,7 @@
24872487
repositoryURL = "https://github.com/pointfreeco/swift-composable-architecture";
24882488
requirement = {
24892489
kind = upToNextMajorVersion;
2490-
minimumVersion = 1.15.2;
2490+
minimumVersion = 1.17.0;
24912491
};
24922492
};
24932493
ABAC82FC26BC4866009F5026 /* XCRemoteSwiftPackageReference "SwiftyOpenCC" */ = {

‎EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+34-25
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"identity" : "alertkit",
66
"kind" : "remoteSourceControl",
7-
"location" : "https://github.com/EhPanda-Team/AlertKit.git",
7+
"location" : "https://github.com/EhPanda-Team/AlertKit",
88
"state" : {
99
"branch" : "custom",
1010
"revision" : "39b01c53ffadf3dab9871dd4c960cd81af5246b6"
@@ -13,7 +13,7 @@
1313
{
1414
"identity" : "colorful",
1515
"kind" : "remoteSourceControl",
16-
"location" : "https://github.com/Co2333/Colorful.git",
16+
"location" : "https://github.com/Co2333/Colorful",
1717
"state" : {
1818
"revision" : "eb5a350aec759bd413615273cb6d64553aead4d5",
1919
"version" : "1.0.1"
@@ -31,7 +31,7 @@
3131
{
3232
"identity" : "deprecatedapi",
3333
"kind" : "remoteSourceControl",
34-
"location" : "https://github.com/EhPanda-Team/DeprecatedAPI.git",
34+
"location" : "https://github.com/EhPanda-Team/DeprecatedAPI",
3535
"state" : {
3636
"branch" : "main",
3737
"revision" : "021e29675457a9b4b7859a46afbb5d0e37574e84"
@@ -40,7 +40,7 @@
4040
{
4141
"identity" : "filepicker",
4242
"kind" : "remoteSourceControl",
43-
"location" : "https://github.com/markrenaud/FilePicker.git",
43+
"location" : "https://github.com/markrenaud/FilePicker",
4444
"state" : {
4545
"revision" : "720f8cb5ca0c0efc982ed381afc84ba3e8b3214e",
4646
"version" : "1.0.1"
@@ -49,7 +49,7 @@
4949
{
5050
"identity" : "kanna",
5151
"kind" : "remoteSourceControl",
52-
"location" : "https://github.com/tid-kijyun/Kanna.git",
52+
"location" : "https://github.com/tid-kijyun/Kanna",
5353
"state" : {
5454
"revision" : "41c3d28ea0eac07e4551b28def9de1ede702e739",
5555
"version" : "5.3.0"
@@ -58,7 +58,7 @@
5858
{
5959
"identity" : "kingfisher",
6060
"kind" : "remoteSourceControl",
61-
"location" : "https://github.com/onevcat/Kingfisher.git",
61+
"location" : "https://github.com/onevcat/Kingfisher",
6262
"state" : {
6363
"revision" : "2ef543ee21d63734e1c004ad6c870255e8716c50",
6464
"version" : "7.12.0"
@@ -67,7 +67,7 @@
6767
{
6868
"identity" : "sfsafesymbols",
6969
"kind" : "remoteSourceControl",
70-
"location" : "https://github.com/SFSafeSymbols/SFSafeSymbols.git",
70+
"location" : "https://github.com/SFSafeSymbols/SFSafeSymbols",
7171
"state" : {
7272
"revision" : "7cca2d60925876b5953a2cf7341cd80fbeac983c",
7373
"version" : "4.1.1"
@@ -103,19 +103,19 @@
103103
{
104104
"identity" : "swift-composable-architecture",
105105
"kind" : "remoteSourceControl",
106-
"location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
106+
"location" : "https://github.com/pointfreeco/swift-composable-architecture",
107107
"state" : {
108-
"revision" : "56149436a3c3dbf605a89a204aaa904de8ba4580",
109-
"version" : "1.15.2"
108+
"revision" : "d602618c628e5123f66643437151079d3664970d",
109+
"version" : "1.17.0"
110110
}
111111
},
112112
{
113113
"identity" : "swift-concurrency-extras",
114114
"kind" : "remoteSourceControl",
115115
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
116116
"state" : {
117-
"revision" : "6054df64b55186f08b6d0fd87152081b8ad8d613",
118-
"version" : "1.2.0"
117+
"revision" : "163409ef7dae9d960b87f34b51587b6609a76c1f",
118+
"version" : "1.3.0"
119119
}
120120
},
121121
{
@@ -132,8 +132,8 @@
132132
"kind" : "remoteSourceControl",
133133
"location" : "https://github.com/pointfreeco/swift-dependencies",
134134
"state" : {
135-
"revision" : "0fc0255e780bf742abeef29dec80924f5f0ae7b9",
136-
"version" : "1.4.1"
135+
"revision" : "5526c8a27675dc7b18d6fa643abfb64bcb200b77",
136+
"version" : "1.6.2"
137137
}
138138
},
139139
{
@@ -159,8 +159,17 @@
159159
"kind" : "remoteSourceControl",
160160
"location" : "https://github.com/pointfreeco/swift-perception",
161161
"state" : {
162-
"revision" : "bc67aa8e461351c97282c2419153757a446ae1c9",
163-
"version" : "1.3.5"
162+
"revision" : "8d52279b9809ef27eabe7d5420f03734528f19da",
163+
"version" : "1.4.1"
164+
}
165+
},
166+
{
167+
"identity" : "swift-sharing",
168+
"kind" : "remoteSourceControl",
169+
"location" : "https://github.com/pointfreeco/swift-sharing",
170+
"state" : {
171+
"revision" : "b68bf99b05cb974392f6ffa380351e9b7391e233",
172+
"version" : "1.1.0"
164173
}
165174
},
166175
{
@@ -175,7 +184,7 @@
175184
{
176185
"identity" : "swiftcommonmark",
177186
"kind" : "remoteSourceControl",
178-
"location" : "https://github.com/gonzalezreal/SwiftCommonMark.git",
187+
"location" : "https://github.com/gonzalezreal/SwiftCommonMark",
179188
"state" : {
180189
"revision" : "ed252beaddecce28ea6363f800c773d6169011b8",
181190
"version" : "1.0.0"
@@ -184,7 +193,7 @@
184193
{
185194
"identity" : "swiftuipager",
186195
"kind" : "remoteSourceControl",
187-
"location" : "https://github.com/fermoya/SwiftUIPager.git",
196+
"location" : "https://github.com/fermoya/SwiftUIPager",
188197
"state" : {
189198
"revision" : "4ddc04c801aac143090bb14cf26603a3bf9c74cb",
190199
"version" : "2.5.0"
@@ -193,7 +202,7 @@
193202
{
194203
"identity" : "swiftybeaver",
195204
"kind" : "remoteSourceControl",
196-
"location" : "https://github.com/SwiftyBeaver/SwiftyBeaver.git",
205+
"location" : "https://github.com/SwiftyBeaver/SwiftyBeaver",
197206
"state" : {
198207
"revision" : "8cba041db09596183331d123f337d0eb2e6e8e91",
199208
"version" : "2.1.1"
@@ -202,7 +211,7 @@
202211
{
203212
"identity" : "swiftyopencc",
204213
"kind" : "remoteSourceControl",
205-
"location" : "https://github.com/ddddxxx/SwiftyOpenCC.git",
214+
"location" : "https://github.com/ddddxxx/SwiftyOpenCC",
206215
"state" : {
207216
"revision" : "1d8105a0f7199c90af722bff62728050c858e777",
208217
"version" : "2.0.0-beta"
@@ -211,7 +220,7 @@
211220
{
212221
"identity" : "ttprogresshud",
213222
"kind" : "remoteSourceControl",
214-
"location" : "https://github.com/EhPanda-Team/TTProgressHUD.git",
223+
"location" : "https://github.com/EhPanda-Team/TTProgressHUD",
215224
"state" : {
216225
"branch" : "custom",
217226
"revision" : "349b595c4f0ff86e8d3c8d65be206a02642fd525"
@@ -220,7 +229,7 @@
220229
{
221230
"identity" : "uiimagecolors",
222231
"kind" : "remoteSourceControl",
223-
"location" : "https://github.com/jathu/UIImageColors.git",
232+
"location" : "https://github.com/jathu/UIImageColors",
224233
"state" : {
225234
"revision" : "e49e6c32ea556e9fa0109dc79686bea4a10d41a2",
226235
"version" : "2.2.0"
@@ -229,7 +238,7 @@
229238
{
230239
"identity" : "waterfallgrid",
231240
"kind" : "remoteSourceControl",
232-
"location" : "https://github.com/paololeonardi/WaterfallGrid.git",
241+
"location" : "https://github.com/paololeonardi/WaterfallGrid",
233242
"state" : {
234243
"revision" : "c7c08652c3540adf8e48409c351879b4caea7e89",
235244
"version" : "1.1.0"
@@ -240,8 +249,8 @@
240249
"kind" : "remoteSourceControl",
241250
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
242251
"state" : {
243-
"revision" : "770f990d3e4eececb57ac04a6076e22f8c97daeb",
244-
"version" : "1.4.2"
252+
"revision" : "a3f634d1a409c7979cabc0a71b3f26ffa9fc8af1",
253+
"version" : "1.4.3"
245254
}
246255
}
247256
],

‎EhPanda/App/Generated/Strings.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ internal enum L10n {
164164
internal static let caxerx = L10n.tr("Constant", "app.translation_contributor.link.caxerx", fallback: "https://github.com/caxerx")
165165
/// https://github.com/Nebulosa-Cat
166166
internal static let nebulosaCat = L10n.tr("Constant", "app.translation_contributor.link.nebulosa-cat", fallback: "https://github.com/Nebulosa-Cat")
167-
/// https://github.com/nyaanim
168-
internal static let nyaanim = L10n.tr("Constant", "app.translation_contributor.link.nyaanim", fallback: "https://github.com/nyaanim")
167+
/// https://github.com/NeKoOuO
168+
internal static let neKoOuO = L10n.tr("Constant", "app.translation_contributor.link.NeKoOuO", fallback: "https://github.com/NeKoOuO")
169169
/// https://github.com/PaulHaeussler
170170
internal static let paulHaeussler = L10n.tr("Constant", "app.translation_contributor.link.paulHaeussler", fallback: "https://github.com/PaulHaeussler")
171171
/// https://github.com/tatsuz0u
@@ -176,8 +176,8 @@ internal enum L10n {
176176
internal static let caxerx = L10n.tr("Constant", "app.translation_contributor.text.caxerx", fallback: "caxerx")
177177
/// 雲豹 ΦωΦ
178178
internal static let nebulosaCat = L10n.tr("Constant", "app.translation_contributor.text.nebulosa-cat", fallback: "雲豹 ΦωΦ")
179-
/// nyaanim
180-
internal static let nyaanim = L10n.tr("Constant", "app.translation_contributor.text.nyaanim", fallback: "nyaanim")
179+
/// ɴᴇᴋᴏ
180+
internal static let neKoOuO = L10n.tr("Constant", "app.translation_contributor.text.NeKoOuO", fallback: "ɴᴇᴋᴏ")
181181
/// PaulHaeussler
182182
internal static let paulHaeussler = L10n.tr("Constant", "app.translation_contributor.text.paulHaeussler", fallback: "PaulHaeussler")
183183
/// Tatsuzo Araki

‎EhPanda/App/en.lproj/Constant.strings

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
"app.translation_contributor.link.nebulosa-cat" = "https://github.com/Nebulosa-Cat";
5353
"app.translation_contributor.link.paulHaeussler" = "https://github.com/PaulHaeussler";
5454
"app.translation_contributor.link.caxerx" = "https://github.com/caxerx";
55-
"app.translation_contributor.link.nyaanim" = "https://github.com/nyaanim";
55+
"app.translation_contributor.link.NeKoOuO" = "https://github.com/NeKoOuO";
5656
"app.translation_contributor.text.tatsuz0u" = "Tatsuzo Araki";
5757
"app.translation_contributor.text.nebulosa-cat" = "雲豹 ΦωΦ";
5858
"app.translation_contributor.text.paulHaeussler" = "PaulHaeussler";
5959
"app.translation_contributor.text.caxerx" = "caxerx";
60-
"app.translation_contributor.text.nyaanim" = "nyaanim";
60+
"app.translation_contributor.text.NeKoOuO" = "ɴᴇᴋᴏ";
6161

6262
// Acknowledgement link
6363
"app.acknowledgement.link.kanna" = "https://github.com/tid-kijyun/Kanna";

‎EhPanda/App/zh-Hant-HK.lproj/InfoPlist.strings

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66

77
*/
88

9-
"NSFaceIDUsageDescription" = "需要此權限以在解鎖 App 時提供 Face ID 選項";
10-
"NSPhotoLibraryAddUsageDescription" = "We need this permission to save images to your photo library.";
9+
"NSFaceIDUsageDescription" = "我們需要您提供 Face ID 權限來使用 Face ID 解鎖";
10+
"NSPhotoLibraryAddUsageDescription" = "我們需要您提供照片權限來保存圖片到照片";

0 commit comments

Comments
 (0)