Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix & I18n improvement #405

Merged
merged 14 commits into from
Dec 15, 2024
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
with:
forceResolution: true
failWhenOutdated: false
xcodePath: '/Applications/Xcode_16.1.app'
xcodePath: '/Applications/Xcode_16.2.app'
- name: Create Pull Request
if: steps.resolution.outputs.dependenciesChanged == 'true'
uses: peter-evans/create-pull-request@v7
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
- main
types: [closed]
env:
DEVELOPER_DIR: /Applications/Xcode_16.1.app
APP_VERSION: '2.7.8'
DEVELOPER_DIR: /Applications/Xcode_16.2.app
APP_VERSION: '2.7.9'
SCHEME_NAME: 'EhPanda'
ALTSTORE_JSON_PATH: './AltStore.json'
BUILDS_PATH: '/tmp/action-builds'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test
on: [push, workflow_dispatch]
env:
SCHEME_NAME: 'EhPanda'
DEVELOPER_DIR: /Applications/Xcode_16.1.app
DEVELOPER_DIR: /Applications/Xcode_16.2.app
jobs:
Test:
runs-on: macos-15
Expand Down
2 changes: 1 addition & 1 deletion EhPanda.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2487,7 +2487,7 @@
repositoryURL = "https://github.com/pointfreeco/swift-composable-architecture";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.15.2;
minimumVersion = 1.17.0;
};
};
ABAC82FC26BC4866009F5026 /* XCRemoteSwiftPackageReference "SwiftyOpenCC" */ = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"identity" : "alertkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/EhPanda-Team/AlertKit.git",
"location" : "https://github.com/EhPanda-Team/AlertKit",
"state" : {
"branch" : "custom",
"revision" : "39b01c53ffadf3dab9871dd4c960cd81af5246b6"
Expand All @@ -13,7 +13,7 @@
{
"identity" : "colorful",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Co2333/Colorful.git",
"location" : "https://github.com/Co2333/Colorful",
"state" : {
"revision" : "eb5a350aec759bd413615273cb6d64553aead4d5",
"version" : "1.0.1"
Expand All @@ -31,7 +31,7 @@
{
"identity" : "deprecatedapi",
"kind" : "remoteSourceControl",
"location" : "https://github.com/EhPanda-Team/DeprecatedAPI.git",
"location" : "https://github.com/EhPanda-Team/DeprecatedAPI",
"state" : {
"branch" : "main",
"revision" : "021e29675457a9b4b7859a46afbb5d0e37574e84"
Expand All @@ -40,7 +40,7 @@
{
"identity" : "filepicker",
"kind" : "remoteSourceControl",
"location" : "https://github.com/markrenaud/FilePicker.git",
"location" : "https://github.com/markrenaud/FilePicker",
"state" : {
"revision" : "720f8cb5ca0c0efc982ed381afc84ba3e8b3214e",
"version" : "1.0.1"
Expand All @@ -49,7 +49,7 @@
{
"identity" : "kanna",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tid-kijyun/Kanna.git",
"location" : "https://github.com/tid-kijyun/Kanna",
"state" : {
"revision" : "41c3d28ea0eac07e4551b28def9de1ede702e739",
"version" : "5.3.0"
Expand All @@ -58,7 +58,7 @@
{
"identity" : "kingfisher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Kingfisher.git",
"location" : "https://github.com/onevcat/Kingfisher",
"state" : {
"revision" : "2ef543ee21d63734e1c004ad6c870255e8716c50",
"version" : "7.12.0"
Expand All @@ -67,7 +67,7 @@
{
"identity" : "sfsafesymbols",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SFSafeSymbols/SFSafeSymbols.git",
"location" : "https://github.com/SFSafeSymbols/SFSafeSymbols",
"state" : {
"revision" : "7cca2d60925876b5953a2cf7341cd80fbeac983c",
"version" : "4.1.1"
Expand Down Expand Up @@ -103,19 +103,19 @@
{
"identity" : "swift-composable-architecture",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
"location" : "https://github.com/pointfreeco/swift-composable-architecture",
"state" : {
"revision" : "56149436a3c3dbf605a89a204aaa904de8ba4580",
"version" : "1.15.2"
"revision" : "d602618c628e5123f66643437151079d3664970d",
"version" : "1.17.0"
}
},
{
"identity" : "swift-concurrency-extras",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "6054df64b55186f08b6d0fd87152081b8ad8d613",
"version" : "1.2.0"
"revision" : "163409ef7dae9d960b87f34b51587b6609a76c1f",
"version" : "1.3.0"
}
},
{
Expand All @@ -132,8 +132,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "0fc0255e780bf742abeef29dec80924f5f0ae7b9",
"version" : "1.4.1"
"revision" : "5526c8a27675dc7b18d6fa643abfb64bcb200b77",
"version" : "1.6.2"
}
},
{
Expand All @@ -159,8 +159,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-perception",
"state" : {
"revision" : "bc67aa8e461351c97282c2419153757a446ae1c9",
"version" : "1.3.5"
"revision" : "8d52279b9809ef27eabe7d5420f03734528f19da",
"version" : "1.4.1"
}
},
{
"identity" : "swift-sharing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-sharing",
"state" : {
"revision" : "b68bf99b05cb974392f6ffa380351e9b7391e233",
"version" : "1.1.0"
}
},
{
Expand All @@ -175,7 +184,7 @@
{
"identity" : "swiftcommonmark",
"kind" : "remoteSourceControl",
"location" : "https://github.com/gonzalezreal/SwiftCommonMark.git",
"location" : "https://github.com/gonzalezreal/SwiftCommonMark",
"state" : {
"revision" : "ed252beaddecce28ea6363f800c773d6169011b8",
"version" : "1.0.0"
Expand All @@ -184,7 +193,7 @@
{
"identity" : "swiftuipager",
"kind" : "remoteSourceControl",
"location" : "https://github.com/fermoya/SwiftUIPager.git",
"location" : "https://github.com/fermoya/SwiftUIPager",
"state" : {
"revision" : "4ddc04c801aac143090bb14cf26603a3bf9c74cb",
"version" : "2.5.0"
Expand All @@ -193,7 +202,7 @@
{
"identity" : "swiftybeaver",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SwiftyBeaver/SwiftyBeaver.git",
"location" : "https://github.com/SwiftyBeaver/SwiftyBeaver",
"state" : {
"revision" : "8cba041db09596183331d123f337d0eb2e6e8e91",
"version" : "2.1.1"
Expand All @@ -202,7 +211,7 @@
{
"identity" : "swiftyopencc",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ddddxxx/SwiftyOpenCC.git",
"location" : "https://github.com/ddddxxx/SwiftyOpenCC",
"state" : {
"revision" : "1d8105a0f7199c90af722bff62728050c858e777",
"version" : "2.0.0-beta"
Expand All @@ -211,7 +220,7 @@
{
"identity" : "ttprogresshud",
"kind" : "remoteSourceControl",
"location" : "https://github.com/EhPanda-Team/TTProgressHUD.git",
"location" : "https://github.com/EhPanda-Team/TTProgressHUD",
"state" : {
"branch" : "custom",
"revision" : "349b595c4f0ff86e8d3c8d65be206a02642fd525"
Expand All @@ -220,7 +229,7 @@
{
"identity" : "uiimagecolors",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jathu/UIImageColors.git",
"location" : "https://github.com/jathu/UIImageColors",
"state" : {
"revision" : "e49e6c32ea556e9fa0109dc79686bea4a10d41a2",
"version" : "2.2.0"
Expand All @@ -229,7 +238,7 @@
{
"identity" : "waterfallgrid",
"kind" : "remoteSourceControl",
"location" : "https://github.com/paololeonardi/WaterfallGrid.git",
"location" : "https://github.com/paololeonardi/WaterfallGrid",
"state" : {
"revision" : "c7c08652c3540adf8e48409c351879b4caea7e89",
"version" : "1.1.0"
Expand All @@ -240,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "770f990d3e4eececb57ac04a6076e22f8c97daeb",
"version" : "1.4.2"
"revision" : "a3f634d1a409c7979cabc0a71b3f26ffa9fc8af1",
"version" : "1.4.3"
}
}
],
Expand Down
8 changes: 4 additions & 4 deletions EhPanda/App/Generated/Strings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ internal enum L10n {
internal static let caxerx = L10n.tr("Constant", "app.translation_contributor.link.caxerx", fallback: "https://github.com/caxerx")
/// https://github.com/Nebulosa-Cat
internal static let nebulosaCat = L10n.tr("Constant", "app.translation_contributor.link.nebulosa-cat", fallback: "https://github.com/Nebulosa-Cat")
/// https://github.com/nyaanim
internal static let nyaanim = L10n.tr("Constant", "app.translation_contributor.link.nyaanim", fallback: "https://github.com/nyaanim")
/// https://github.com/NeKoOuO
internal static let neKoOuO = L10n.tr("Constant", "app.translation_contributor.link.NeKoOuO", fallback: "https://github.com/NeKoOuO")
/// https://github.com/PaulHaeussler
internal static let paulHaeussler = L10n.tr("Constant", "app.translation_contributor.link.paulHaeussler", fallback: "https://github.com/PaulHaeussler")
/// https://github.com/tatsuz0u
Expand All @@ -176,8 +176,8 @@ internal enum L10n {
internal static let caxerx = L10n.tr("Constant", "app.translation_contributor.text.caxerx", fallback: "caxerx")
/// 雲豹 ΦωΦ
internal static let nebulosaCat = L10n.tr("Constant", "app.translation_contributor.text.nebulosa-cat", fallback: "雲豹 ΦωΦ")
/// nyaanim
internal static let nyaanim = L10n.tr("Constant", "app.translation_contributor.text.nyaanim", fallback: "nyaanim")
/// ɴᴇᴋᴏ
internal static let neKoOuO = L10n.tr("Constant", "app.translation_contributor.text.NeKoOuO", fallback: "ɴᴇᴋᴏ")
/// PaulHaeussler
internal static let paulHaeussler = L10n.tr("Constant", "app.translation_contributor.text.paulHaeussler", fallback: "PaulHaeussler")
/// Tatsuzo Araki
Expand Down
4 changes: 2 additions & 2 deletions EhPanda/App/en.lproj/Constant.strings
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@
"app.translation_contributor.link.nebulosa-cat" = "https://github.com/Nebulosa-Cat";
"app.translation_contributor.link.paulHaeussler" = "https://github.com/PaulHaeussler";
"app.translation_contributor.link.caxerx" = "https://github.com/caxerx";
"app.translation_contributor.link.nyaanim" = "https://github.com/nyaanim";
"app.translation_contributor.link.NeKoOuO" = "https://github.com/NeKoOuO";
"app.translation_contributor.text.tatsuz0u" = "Tatsuzo Araki";
"app.translation_contributor.text.nebulosa-cat" = "雲豹 ΦωΦ";
"app.translation_contributor.text.paulHaeussler" = "PaulHaeussler";
"app.translation_contributor.text.caxerx" = "caxerx";
"app.translation_contributor.text.nyaanim" = "nyaanim";
"app.translation_contributor.text.NeKoOuO" = "ɴᴇᴋᴏ";

// Acknowledgement link
"app.acknowledgement.link.kanna" = "https://github.com/tid-kijyun/Kanna";
Expand Down
4 changes: 2 additions & 2 deletions EhPanda/App/zh-Hant-HK.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

*/

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