diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml index 53c74124..7314cbb8 100644 --- a/.github/workflows/crowdin-upload.yml +++ b/.github/workflows/crowdin-upload.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v3 - name: crowdin action - uses: crowdin/github-action@v1.11.0 + uses: crowdin/github-action@v1.12.0 with: upload_sources: true upload_sources_args: '--auto-update --delete-obsolete' diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 22b35a90..34f1216a 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -53,6 +53,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.8' + cache: 'pipenv' - name: Cache files uses: actions/cache@v3.3.1 @@ -64,6 +65,7 @@ jobs: run: | pip install pipenv pipenv install + sudo apt install pngquant - name: Build website env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 29d4569b..55d91601 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,14 +55,12 @@ jobs: fetch-depth: '0' ssh-key: ${{ secrets.ACTIONS_SSH_KEY }} submodules: 'true' - - - name: Pages setup - uses: actions/configure-pages@v3 - name: Python setup uses: actions/setup-python@v4 with: python-version: '3.8' + cache: 'pipenv' - name: Cache files uses: actions/cache@v3.3.1 diff --git a/Pipfile b/Pipfile index 70d32657..bc24e493 100644 --- a/Pipfile +++ b/Pipfile @@ -1,15 +1,15 @@ # Copyright (c) 2022-2023 Jonah Aragon - +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to # deal in the Software without restriction, including without limitation the # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or # sell copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: - +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. - +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE diff --git a/Pipfile.lock b/Pipfile.lock index ddb77cb3..b252d456 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -34,11 +34,11 @@ }, "cairocffi": { "hashes": [ - "sha256:e7f21ea1546a5d490ceba77b6216c1393d7e0a7856e292864a88a7506092bf4d", - "sha256:fec979f3e904c1a38350b06dcc91d3c15f9a4954e618a068761622e3a0d5058c" + "sha256:78e6bbe47357640c453d0be929fa49cd05cce2e1286f3d2a1ca9cbda7efdb8b7", + "sha256:aa78ee52b9069d7475eeac457389b6275aa92111895d78fbaa2202a52dac112e" ], "markers": "python_version >= '3.7'", - "version": "==1.6.0" + "version": "==1.6.1" }, "cairosvg": { "hashes": [ @@ -50,11 +50,11 @@ }, "certifi": { "hashes": [ - "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7", - "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716" + "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082", + "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9" ], "markers": "python_version >= '3.6'", - "version": "==2023.5.7" + "version": "==2023.7.22" }, "cffi": { "hashes": [ @@ -393,19 +393,19 @@ }, "markdown": { "hashes": [ - "sha256:cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874", - "sha256:f5da449a6e1c989a4cea2631aa8ee67caa5a2ef855d551c88f9e309f4634c621" + "sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6", + "sha256:a4c1b65c0957b4bd9e7d86ddc7b3c9868fb9670660f6f99f6d1bca8954d5a941" ], - "markers": "python_version >= '3.6'", - "version": "==3.3.7" + "markers": "python_version >= '3.7'", + "version": "==3.4.4" }, "markdown2": { "hashes": [ - "sha256:58e1789543f47cdd4197760b04771671411f07699f958ad40a4b56c55ba3e668", - "sha256:7a1742dade7ec29b90f5c1d5a820eb977eee597e314c428e6b0aa7929417cd1b" + "sha256:cdba126d90dc3aef6f4070ac342f974d63f415678959329cc7909f96cc235d72", + "sha256:e6105800483783831f5dc54f827aa5b44eb137ecef5a70293d8ecfbb4109ecc6" ], "markers": "python_version >= '3.5' and python_version < '4'", - "version": "==2.4.9" + "version": "==2.4.10" }, "markupsafe": { "hashes": [ @@ -473,11 +473,11 @@ }, "mkdocs": { "hashes": [ - "sha256:5955093bbd4dd2e9403c5afaf57324ad8b04f16886512a3ee6ef828956481c57", - "sha256:6ee46d309bda331aac915cd24aab882c179a933bd9e77b80ce7d2eaaa3f689dd" + "sha256:67e889f8d8ba1fe5decdfc59f5f8f21d6a8925a129339e93dede303bdea03a98", + "sha256:f2f323c62fffdf1b71b84849e39aef56d6852b3f0a5571552bca32cefc650209" ], "markers": "python_version >= '3.7'", - "version": "==1.4.3" + "version": "==1.5.1" }, "mkdocs-git-committers-plugin-2": { "hashes": [ @@ -505,7 +505,7 @@ }, "mkdocs-material": { "path": "./modules/mkdocs-material", - "version": "==9.1.18+insiders.4.37.0" + "version": "==9.1.21+insiders.4.37.1" }, "mkdocs-material-extensions": { "hashes": [ @@ -529,6 +529,14 @@ ], "version": "==0.5.6" }, + "pathspec": { + "hashes": [ + "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20", + "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3" + ], + "markers": "python_version >= '3.7'", + "version": "==0.11.2" + }, "pillow": { "hashes": [ "sha256:00e65f5e822decd501e374b0650146063fbb30a7264b4d2744bdd7b913e0cab5", @@ -593,11 +601,19 @@ }, "pipdeptree": { "hashes": [ - "sha256:0d64fe4e9573d3e992fc84f8dc025bd9cfdf00ce9850c1252dcbdbd1734d324d", - "sha256:6bcc50ad4c06f05996e2fad3dc56585c323c9a7aa18694ca5b2d8115db183e80" + "sha256:7d728dae42e13e02e7d45f13e3e1aa7cb3db30ed2d57a49861ff41056d93a3c0", + "sha256:8a3421a8238bb11e64ee6fd5ed0b65a441734a66d1a25c13bc38c0b66e6167a3" ], "markers": "python_version >= '3.8'", - "version": "==2.10.2" + "version": "==2.11.0" + }, + "platformdirs": { + "hashes": [ + "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d", + "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d" + ], + "markers": "python_version >= '3.7'", + "version": "==3.10.0" }, "pycparser": { "hashes": [ @@ -701,10 +717,9 @@ }, "readtime": { "hashes": [ - "sha256:0a67e29adfcfb25488b1edd6f08e158de5f832e84fe8e35cf83e639208ce0b97", - "sha256:ddf221ed5b004c97ee350bc782dda1139ea6dfb817a404cdcc251ac33c11aa28" + "sha256:76c5a0d773ad49858c53b42ba3a942f62fbe20cc8c6f07875797ac7dc30963a9" ], - "version": "==2.0.0" + "version": "==3.0.0" }, "regex": { "hashes": [ diff --git a/config/mkdocs.zh-Hant.yml b/config/mkdocs.zh-Hant.yml index 4f8eb082..0b1babb2 100644 --- a/config/mkdocs.zh-Hant.yml +++ b/config/mkdocs.zh-Hant.yml @@ -20,8 +20,8 @@ INHERIT: mkdocs-common.yml docs_dir: '../i18n/zh-Hant' -site_url: "https://www.privacyguides.org/zh-hant/" -site_dir: '../site/zh-hant' +site_url: "https://www.privacyguides.org/zh-Hant/" +site_dir: '../site/zh-Hant' site_name: Privacy Guides site_description: | diff --git a/modules/mkdocs-material b/modules/mkdocs-material index d2033e5a..8fd8ceb5 160000 --- a/modules/mkdocs-material +++ b/modules/mkdocs-material @@ -1 +1 @@ -Subproject commit d2033e5aee7d006f15b5d872834875f221bc6d23 +Subproject commit 8fd8ceb5b1772a40eb4de32300122103b17a28d1