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

Bugfixes #386

Merged
merged 11 commits into from
Oct 27, 2024
6 changes: 3 additions & 3 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:
pull-requests: write
jobs:
dependencies:
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -19,10 +19,10 @@ jobs:
with:
forceResolution: true
failWhenOutdated: false
xcodePath: '/Applications/Xcode_15.4.app'
xcodePath: '/Applications/Xcode_16.0.app'
- name: Create Pull Request
if: steps.resolution.outputs.dependenciesChanged == 'true'
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
branch: 'update-dependencies'
delete-branch: true
Expand Down
10 changes: 5 additions & 5 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_15.4.app
APP_VERSION: '2.7.5'
DEVELOPER_DIR: /Applications/Xcode_16.0.app
APP_VERSION: '2.7.6'
SCHEME_NAME: 'EhPanda'
ALTSTORE_JSON_PATH: './AltStore.json'
BUILDS_PATH: '/tmp/action-builds'
Expand All @@ -19,7 +19,7 @@ env:

jobs:
Deploy:
runs-on: macos-14
runs-on: macos-15
if: github.event.pull_request.merged == true && github.event.pull_request.user.login == 'chihchy'
steps:
- name: Checkout
Expand All @@ -34,7 +34,7 @@ jobs:
run: xcodebuild clean test
-skipMacroValidation
-scheme ${{ env.SCHEME_NAME }}
-destination 'platform=iOS Simulator,name=iPhone 15 Pro'
-destination 'platform=iOS Simulator,name=iPhone 16 Pro'
- name: Bump version
id: bump-version
uses: yanamura/ios-bump-version@v1
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
[[ ! -z "${{ steps.bump-version.outputs.version }}" ]] || exit 1
[[ ! -z "${{ steps.retrieve-data.outputs.version_date }}" ]] || exit 1
- name: Release to GitHub
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
fail_on_unmatched_files: true
files: ${{ env.IPA_OUTPUT_PATH }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Test
on: [push, workflow_dispatch]
env:
SCHEME_NAME: 'EhPanda'
DEVELOPER_DIR: /Applications/Xcode_15.4.app
DEVELOPER_DIR: /Applications/Xcode_16.0.app
jobs:
Test:
runs-on: macos-14
runs-on: macos-15
if: ${{ !contains(github.event.head_commit.message, '[skip test]') }}
steps:
- name: Checkout
Expand All @@ -16,4 +16,4 @@ jobs:
run: xcodebuild clean test
-skipMacroValidation
-scheme ${{ env.SCHEME_NAME }}
-destination 'platform=iOS Simulator,name=iPhone 15 Pro'
-destination 'platform=iOS Simulator,name=iPhone 16 Pro'
48 changes: 40 additions & 8 deletions EhPanda/App/Generated/Strings.swift

Large diffs are not rendered by default.

113 changes: 95 additions & 18 deletions EhPanda/App/Tools/Parser.swift

Large diffs are not rendered by default.

20 changes: 18 additions & 2 deletions EhPanda/App/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,10 @@
"enum.eh_setting.display_mode.value.minimal" = "Minimal";
"enum.eh_setting.display_mode.value.minimalPlus" = "Minimal+";

"eh_setting_view.section.title.optional_UI_elements" = "Optional UI Elements";
"eh_setting_view.description.optional_UI_elements" = "Some historic UI elements are now disabled by default. You can enable those here.";
"eh_setting_view.title.enable_gallery_thumbnail_selector" = "Enable thumbnail selector on gallery screen";

"eh_setting_view.section.title.favorites" = "Favorites";
"eh_setting_view.description.favorite_categories" = "Here you can choose and rename your favorite categories.";
"eh_setting_view.title.favorites_sort_order" = "Favorites sort order";
Expand Down Expand Up @@ -507,10 +511,14 @@
// EhSetting.ThumbnailSize
"enum.eh_setting.thumbnail_size.value.normal" = "Normal";
"enum.eh_setting.thumbnail_size.value.large" = "Large";
"enum.eh_setting.thumbnail_size.value.small" = "Small";
"enum.eh_setting.thumbnail_size.value.auto" = "Auto";

"eh_setting_view.section.title.thumbnail_scaling" = "Thumbnail Scaling";
"eh_setting_view.section.title.cover_scaling" = "Cover Scaling";
"eh_setting_view.title.scale_factor" = "Scale factor";
"eh_setting_view.description.scale_factor" = "Thumbnails on the thumbnail and extended gallery list views can be scaled to a custom value between 75%% and 150%%.";
"eh_setting_view.description.thumbnail_scale_factor" = "Thumbnails on the thumbnail and extended gallery list views can be scaled to a custom value between 75%% and 150%%.";
"eh_setting_view.description.cover_scale_factor" = "The cover size in gallery list views can be scaled to between 75%% and 150%% when using the Thumbnail or Extended display modes.";

"eh_setting_view.section.title.viewport_override" = "Viewport Override";
"eh_setting_view.title.virtual_width" = "Virtual width";
Expand All @@ -534,13 +542,15 @@
"enum.eh_setting.tags_sort_order.value.tag_power" = "By tag power";

"eh_setting_view.section.title.gallery_page_numbering" = "Gallery Page Numbering";
"eh_setting_view.section.title.gallery_page_thumbnail_labeling" = "Gallery Page Thumbnail Labeling";
"eh_setting_view.title.show_gallery_page_numbers" = "Show gallery page numbers";
"eh_setting_view.title.show_label_below_gallery_thumbnails" = "Show label below gallery thumbnails";

"eh_setting_view.section.title.hath_local_network_host" = "Hath Local Network Host";
"eh_setting_view.title.ip_address_port" = "IP address:Port";
"eh_setting_view.description.ip_address_port" = "This setting can be used if you have a H@H client running on your local network with the same public IP you browse the site with. Some routers are buggy and cannot route requests back to its own IP; this allows you to work around this problem.\nIf you are running the client on the same device you browse from, use the loopback address (127.0.0.1:port). If the client is running on another device on your network, use its local network IP. Some browser configurations prevent external web sites from accessing URLs with local network IPs, the site must then be whitelisted for this to work.";

"eh_setting_view.section.title.original_images" = "Original Images";
"eh_setting_view.section.title.original_images" = "Use original images instead of the resampled versions? Resampled images will still be used if you select a horizontal resolution different than \"Auto\" above and the image in question is wider, or if the original image is larger than 10 MiB (or 4 MiB for galleries older than one year).";
"eh_setting_view.title.use_original_images" = "Use original images";

"eh_setting_view.section.title.multi_page_viewer" = "Multi-Page Viewer";
Expand All @@ -551,6 +561,12 @@
"enum.eh_setting.multiple_page_viewer_style.value.align_left_scale_if_over_width" = "Align left, scale if overwidth";
"enum.eh_setting.multiple_page_viewer_style.value.align_center_scale_if_over_width" = "Align center, scale if overwidth";
"enum.eh_setting.multiple_page_viewer_style.value.align_center_always_scale" = "Align center, always scale";
// EhSetting.GalleryPageNumbering
"enum.eh_setting.gallery_page_numbering.value.none" = "None";
"enum.eh_setting.gallery_page_numbering.value.page_number_only" = "Page Number Only";
"enum.eh_setting.gallery_page_numbering.value.page_number_and_name" = "Page Number + Name";
"enum.eh_setting.gallery_page_numbering.value.yes" = "Yes";
"enum.eh_setting.gallery_page_numbering.value.no" = "No";

// MARK: Category
"enum.category.value.doujinshi" = "Doujinshi";
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 @@ -40,12 +40,12 @@
"app.code_level_contributor.link.chihchy" = "https://github.com/chihchy";
"app.code_level_contributor.link.Jimmy-Prime" = "https://github.com/Jimmy-Prime";
"app.code_level_contributor.link.xioxin" = "https://github.com/xioxin";
"app.code_level_contributor.link.remlostime" = "https://github.com/remlostime";
"app.code_level_contributor.link.vvbbnn00" = "https://github.com/vvbbnn00";
"app.code_level_contributor.text.tatsuz0u" = "Tatsuzo Araki";
"app.code_level_contributor.text.chihchy" = "Chihchy";
"app.code_level_contributor.text.Jimmy-Prime" = "Jimmy Prime";
"app.code_level_contributor.text.xioxin" = "xioxin";
"app.code_level_contributor.text.remlostime" = "Kai Chen";
"app.code_level_contributor.text.vvbbnn00" = "vvbbnn00";

// Translation contributor
"app.translation_contributor.link.tatsuz0u" = "https://github.com/tatsuz0u";
Expand Down
20 changes: 18 additions & 2 deletions EhPanda/App/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,10 @@
"enum.eh_setting.display_mode.value.minimal" = "Minimal";
"enum.eh_setting.display_mode.value.minimalPlus" = "Minimal+";

"eh_setting_view.section.title.optional_UI_elements" = "Optional UI Elements";
"eh_setting_view.description.optional_UI_elements" = "Some historic UI elements are now disabled by default. You can enable those here.";
"eh_setting_view.title.enable_gallery_thumbnail_selector" = "Enable thumbnail selector on gallery screen";

"eh_setting_view.section.title.favorites" = "Favorites";
"eh_setting_view.description.favorite_categories" = "Here you can choose and rename your favorite categories.";
"eh_setting_view.title.favorites_sort_order" = "Favorites sort order";
Expand Down Expand Up @@ -507,10 +511,14 @@
// EhSetting.ThumbnailSize
"enum.eh_setting.thumbnail_size.value.normal" = "Normal";
"enum.eh_setting.thumbnail_size.value.large" = "Large";
"enum.eh_setting.thumbnail_size.value.small" = "Small";
"enum.eh_setting.thumbnail_size.value.auto" = "Auto";

"eh_setting_view.section.title.thumbnail_scaling" = "Thumbnail Scaling";
"eh_setting_view.section.title.cover_scaling" = "Cover Scaling";
"eh_setting_view.title.scale_factor" = "Scale factor";
"eh_setting_view.description.scale_factor" = "Thumbnails on the thumbnail and extended gallery list views can be scaled to a custom value between 75%% and 150%%.";
"eh_setting_view.description.thumbnail_scale_factor" = "Thumbnails on the thumbnail and extended gallery list views can be scaled to a custom value between 75%% and 150%%.";
"eh_setting_view.description.cover_scale_factor" = "The cover size in gallery list views can be scaled to between 75%% and 150%% when using the Thumbnail or Extended display modes.";

"eh_setting_view.section.title.viewport_override" = "Viewport Override";
"eh_setting_view.title.virtual_width" = "Virtual width";
Expand All @@ -534,13 +542,15 @@
"enum.eh_setting.tags_sort_order.value.tag_power" = "By tag power";

"eh_setting_view.section.title.gallery_page_numbering" = "Gallery Page Numbering";
"eh_setting_view.section.title.gallery_page_thumbnail_labeling" = "Gallery Page Thumbnail Labeling";
"eh_setting_view.title.show_gallery_page_numbers" = "Show gallery page numbers";
"eh_setting_view.title.show_label_below_gallery_thumbnails" = "Show label below gallery thumbnails";

"eh_setting_view.section.title.hath_local_network_host" = "Hath Local Network Host";
"eh_setting_view.title.ip_address_port" = "IP address:Port";
"eh_setting_view.description.ip_address_port" = "This setting can be used if you have a H@H client running on your local network with the same public IP you browse the site with. Some routers are buggy and cannot route requests back to its own IP; this allows you to work around this problem.\nIf you are running the client on the same device you browse from, use the loopback address (127.0.0.1:port). If the client is running on another device on your network, use its local network IP. Some browser configurations prevent external web sites from accessing URLs with local network IPs, the site must then be whitelisted for this to work.";

"eh_setting_view.section.title.original_images" = "Original Images";
"eh_setting_view.section.title.original_images" = "Use original images instead of the resampled versions? Resampled images will still be used if you select a horizontal resolution different than \"Auto\" above and the image in question is wider, or if the original image is larger than 10 MiB (or 4 MiB for galleries older than one year).";
"eh_setting_view.title.use_original_images" = "Use original images";

"eh_setting_view.section.title.multi_page_viewer" = "Multi-Page Viewer";
Expand All @@ -551,6 +561,12 @@
"enum.eh_setting.multiple_page_viewer_style.value.align_left_scale_if_over_width" = "Align left, scale if overwidth";
"enum.eh_setting.multiple_page_viewer_style.value.align_center_scale_if_over_width" = "Align center, scale if overwidth";
"enum.eh_setting.multiple_page_viewer_style.value.align_center_always_scale" = "Align center, always scale";
// EhSetting.GalleryPageNumbering
"enum.eh_setting.gallery_page_numbering.value.none" = "None";
"enum.eh_setting.gallery_page_numbering.value.page_number_only" = "Page Number Only";
"enum.eh_setting.gallery_page_numbering.value.page_number_and_name" = "Page Number + Name";
"enum.eh_setting.gallery_page_numbering.value.yes" = "Yes";
"enum.eh_setting.gallery_page_numbering.value.no" = "No";

// MARK: Category
"enum.category.value.doujinshi" = "Doujinshi";
Expand Down
20 changes: 18 additions & 2 deletions EhPanda/App/ja.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,10 @@
"enum.eh_setting.display_mode.value.minimal" = "最小化";
"enum.eh_setting.display_mode.value.minimalPlus" = "最小化+";

"eh_setting_view.section.title.optional_UI_elements" = "UI の表示制御";
"eh_setting_view.description.optional_UI_elements" = "一部の従来の UI はデフォルトで無効になっています。ここで有効にすることができます。";
"eh_setting_view.title.enable_gallery_thumbnail_selector" = "ギャラリーのサムネイルセレクタ";

"eh_setting_view.section.title.favorites" = "お気に入り";
"eh_setting_view.description.favorite_categories" = "ここではお気に入りカテゴリー名の変更ができます。";
"eh_setting_view.title.favorites_sort_order" = "お気に入りの並び替え";
Expand Down Expand Up @@ -507,10 +511,14 @@
// EhSetting.ThumbnailSize
"enum.eh_setting.thumbnail_size.value.normal" = "普通";
"enum.eh_setting.thumbnail_size.value.large" = "大きめ";
"enum.eh_setting.thumbnail_size.value.small" = "小さめ";
"enum.eh_setting.thumbnail_size.value.auto" = "自動";

"eh_setting_view.section.title.thumbnail_scaling" = "サムネイルスケーリング";
"eh_setting_view.section.title.cover_scaling" = "カバースケーリング";
"eh_setting_view.title.scale_factor" = "スケール係数";
"eh_setting_view.description.scale_factor" = "サムネイル・拡張表示モードでのサムネイルを 75%% ~ 150%% のカスタム値にスケールすることができます。";
"eh_setting_view.description.thumbnail_scale_factor" = "サムネイル・拡張表示モードでのサムネイルを 75%% ~ 150%% のカスタム値にスケールすることができます。";
"eh_setting_view.description.cover_scale_factor" = "サムネイル・拡張表示モードでのカバーを 75%% ~ 150%% にスケールすることができます。";

"eh_setting_view.section.title.viewport_override" = "表示領域オーバーライド";
"eh_setting_view.title.virtual_width" = "仮想幅";
Expand All @@ -534,13 +542,15 @@
"enum.eh_setting.tags_sort_order.value.tag_power" = "タグパワーの高い順";

"eh_setting_view.section.title.gallery_page_numbering" = "ギャラリーページ数";
"eh_setting_view.section.title.gallery_page_thumbnail_labeling" = "ギャラリーサムネイルのラベル";
"eh_setting_view.title.show_gallery_page_numbers" = "ギャラリーページ数を表示";
"eh_setting_view.title.show_label_below_gallery_thumbnails" = "ギャラリーサムネイルの下にラベルを表示";

"eh_setting_view.section.title.hath_local_network_host" = "Hath ローカルネットワークホスト";
"eh_setting_view.title.ip_address_port" = "IP アドレス:ポート";
"eh_setting_view.description.ip_address_port" = "ローカルネットワークで今と同じパブリック IP を使う H@H クライアントがお持ちの場合、この設定が役立ちます。ルーターがバグが多くてリクエストを自分の IP にルートすることができないこともあります、それをこの設定で回避できます。\nH@H クライアントが今と同じデバイスで運行している場合はループバックアドレス(127.0.0.1:ポート)を使ってください。別のデバイスの場合はそのローカル IP を使ってください。かなりのブラウザの構成では外部サイトがローカル IP にアクセスすることをブロックしています、この設定を有効にするには本サイトをホワイトリストに入れてください。";

"eh_setting_view.section.title.original_images" = "オリジナル画像";
"eh_setting_view.section.title.original_images" = "オリジナル画像を使いますか?リサンプリングされた画像は、上記の解像度で「自動」以外を選択し、該当する画像の方が幅が広い場合、またはオリジナル画像が 10 MiB(一年以上前のギャラリーの場合は 4 MiB)より大きい場合に使用されます。";
"eh_setting_view.title.use_original_images" = "オリジナル画像を使う";

"eh_setting_view.section.title.multi_page_viewer" = "マルチページビューア";
Expand All @@ -551,6 +561,12 @@
"enum.eh_setting.multiple_page_viewer_style.value.align_left_scale_if_over_width" = "左寄せ、幅によってスケール";
"enum.eh_setting.multiple_page_viewer_style.value.align_center_scale_if_over_width" = "中央揃え、幅によってスケール";
"enum.eh_setting.multiple_page_viewer_style.value.align_center_always_scale" = "中央揃え、常時スケール";
// EhSetting.GalleryPageNumbering
"enum.eh_setting.gallery_page_numbering.value.none" = "表示しない";
"enum.eh_setting.gallery_page_numbering.value.page_number_only" = "ページ番号のみ表示";
"enum.eh_setting.gallery_page_numbering.value.page_number_and_name" = "ページ番号と名前を表示";
"enum.eh_setting.gallery_page_numbering.value.yes" = "表示する";
"enum.eh_setting.gallery_page_numbering.value.no" = "表示しない";

// MARK: Category
"enum.category.value.doujinshi" = "同人誌";
Expand Down
Loading
Loading