Skip to content

Commit

Permalink
Merge branch '3.13' into howto-regex
Browse files Browse the repository at this point in the history
  • Loading branch information
josix authored Oct 9, 2024
2 parents 4fa5416 + 7949b02 commit e400ecb
Show file tree
Hide file tree
Showing 510 changed files with 49,581 additions and 40,904 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-gh-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: deploy-gh-page
on:
push:
branches:
- "3.12"
- "3.13"

jobs:
cd:
Expand All @@ -18,7 +18,7 @@ jobs:
run: make all

- name: Deploy to gh page
uses: JamesIves/github-pages-deploy-action@v4.6.3
uses: JamesIves/github-pages-deploy-action@v4.6.4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: python-3.12-sync-with-cpython
name: python-3.13-sync-with-cpython

on:
push:
branches:
- "3.12"
- "3.13"
schedule:
- cron: "0 0 * * *"

jobs:
sync:
runs-on: ubuntu-latest
env:
VERSION: "3.12"
BRANCH: "cron/sync/3.12"
VERSION: "3.13"
BRANCH: "cron/sync/3.13"
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -50,15 +50,15 @@ jobs:
base: ${{ env.VERSION }}
branch: ${{ env.BRANCH }}
delete-branch: false
title: 'Sync with CPython ${{ env.VERSION }}'
title: "Sync with CPython ${{ env.VERSION }}"
body: |
Sync with CPython ${{ env.VERSION }}
draft: true
labels: |
sync-cpython
automation
- name: Check outputs
run: |
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
*.mo
__pycache__
.DS_Store

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/
12 changes: 6 additions & 6 deletions .scripts/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ endef
export PRINT_HELP_PYSCRIPT # End of python section

CPYTHON_CLONE := ../cpython
VERSION := $(or $(VERSION), 3.12)
VERSION := $(or $(VERSION), 3.13)
SPHINX_CONF := $(CPYTHON_CLONE)/Doc/conf.py
LANGUAGE := zh_TW
LC_MESSAGES := $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/LC_MESSAGES
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Python 官方說明文件臺灣繁體中文翻譯計畫
:target: https://discord.gg/44XheGXhWH
:alt: Join Chat on Discord

這是 Python 3.12 官方說明文件的臺灣繁體中文(zh_TW)翻譯。
這是 Python 3.13 官方說明文件的臺灣繁體中文(zh_TW)翻譯。

翻譯之前,請務必詳讀並同意\ `授權與 License`_。參與方式請參考\ `參與翻譯`_。

Expand Down Expand Up @@ -132,13 +132,13 @@ the PSF for inclusion in the documentation.

接著在 terminal 裡按照以下步驟:

1. 基於最新版本的 ``upstream/3.12`` 開啟一個 branch,現在假設我們想要翻譯 library/math.po \
1. 基於最新版本的 ``upstream/3.13`` 開啟一個 branch,現在假設我們想要翻譯 library/math.po \
所以把這個 branch 叫做 ``library/math``:

.. code-block:: bash
git fetch upstream
git checkout -b library/math upstream/3.12
git checkout -b library/math upstream/3.13
2. 接著就可以開始翻譯(翻譯時可參考\ `翻譯守則`_),你可以手動開啟 Poedit 應用程式再選 \
library/math.po 檔案打開
Expand Down Expand Up @@ -222,7 +222,7 @@ the PSF for inclusion in the documentation.

- 從 upstream(我們的主要 GitHub repo)做 fetch 的動作
- 對 origin(你的 fork)做 push
- 永遠不對 ``3.12`` branch 進行修改,請保持讓這個 branch 唯讀,可以避免掉很多問題。
- 永遠不對 ``3.13`` branch 進行修改,請保持讓這個 branch 唯讀,可以避免掉很多問題。

要翻譯哪些東西
--------------
Expand Down
2 changes: 1 addition & 1 deletion about.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# hsiao yi <hsiaoyi0504@gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Python 3.12\n"
"Project-Id-Version: Python 3.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-08-05 00:19+0000\n"
"PO-Revision-Date: 2022-05-12 00:11+0800\n"
Expand Down
2 changes: 1 addition & 1 deletion bugs.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Steven Hsu <hsuhaochun@gmail.com>, 2021-2022
msgid ""
msgstr ""
"Project-Id-Version: Python 3.12\n"
"Project-Id-Version: Python 3.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-18 19:45+0000\n"
"PO-Revision-Date: 2022-08-31 12:34+0800\n"
Expand Down
2 changes: 1 addition & 1 deletion c-api/abstract.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Python 3.12\n"
"Project-Id-Version: Python 3.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-26 18:54+0800\n"
"PO-Revision-Date: 2021-12-09 21:20+0800\n"
Expand Down
2 changes: 1 addition & 1 deletion c-api/allocation.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Python 3.12\n"
"Project-Id-Version: Python 3.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-09 00:03+0000\n"
"PO-Revision-Date: 2022-10-16 15:35+0800\n"
Expand Down
2 changes: 1 addition & 1 deletion c-api/apiabiversion.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Matt Wang <mattwang44@gmail.com>, 2022
msgid ""
msgstr ""
"Project-Id-Version: Python 3.12\n"
"Project-Id-Version: Python 3.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-29 00:03+0000\n"
"PO-Revision-Date: 2022-01-24 22:34+0800\n"
Expand Down
Loading

0 comments on commit e400ecb

Please sign in to comment.