Skip to content

Merge 3.13 updates into json #1

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

Merged
merged 34 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ef59955
Translation of `library/json.po` done. (#945)
SkyLull Aug 13, 2024
2954f8c
Minor fixes regarding #771 dissusion (#948)
SkyLull Aug 14, 2024
eceafb1
Translate time (#921)
ken71301 Aug 14, 2024
485c468
Translate library/itertools.po (#950)
ken71301 Aug 16, 2024
5dbf657
Sync with CPython 3.12 (#927)
pydoc-zh-tw[bot] Aug 18, 2024
5a5f094
feat: translate `library/functools.po`
mattwang44 Dec 26, 2023
ff862d0
Apply suggestions from code review
mattwang44 Aug 24, 2024
492d224
Work on ssl (#952)
timmy0123 Aug 26, 2024
2a3a7ee
Translate `library/hashlib.po` (#510)
mattwang44 Aug 27, 2024
1c1c864
feat(library/stdtypes): translate Context Manager & Type Annotation T…
mattwang44 Aug 28, 2024
0c18738
Work on ssl (#953)
timmy0123 Aug 28, 2024
99fa2cc
Translate library/exceptions part 2/3 (#920)
mindihx Sep 9, 2024
eb77da2
Translate `c-api/perfmaps.po` (#899)
mattwang44 Sep 11, 2024
d30872c
Translate `howto/gdb_helpers.po` (#903)
mattwang44 Sep 11, 2024
570bbb1
Sync with CPython 3.12 (#951)
pydoc-zh-tw[bot] Sep 13, 2024
76ab204
Translate library/exceptions part 3/3 (#938)
mindihx Sep 18, 2024
7bdb519
Work on ssl (#956)
timmy0123 Sep 22, 2024
cce68aa
Sync with CPython 3.12 (#957)
pydoc-zh-tw[bot] Sep 22, 2024
d5a337b
chore: change project id to 3.13 globally (#961)
mattwang44 Sep 22, 2024
014a3f1
chore: pull 3.12-3.13 diff into the project (#962)
mattwang44 Sep 23, 2024
e0f7a22
build(deps): bump JamesIves/github-pages-deploy-action from 4.6.3 to …
dependabot[bot] Sep 23, 2024
0313a63
chore(gitignore): add venv artifacts to gitignore
mattwang44 Sep 23, 2024
23c3e90
Translate library/numeric.po (#964)
HsuehYi Sep 23, 2024
15714a9
Translate library/i18n.po (#965)
HsuehYi Sep 23, 2024
0f71569
Translate library/importLib (#966)
winniepopu Sep 23, 2024
8f1374e
translate c-api/float.po (#969)
PoChuan994 Sep 23, 2024
8d20b5d
Translate /c-api/dict.rst:48 (#968)
SamLiaoP Sep 23, 2024
55a0628
Translate library/development.po (#971)
HsuehYi Sep 23, 2024
879b6b9
Translate library/distribution.po (#972)
HsuehYi Sep 23, 2024
5399187
Sync with CPython 3.13 (#973)
pydoc-zh-tw[bot] Sep 24, 2024
b1e2866
translate reference/datamodel.po (#941)
kisaragi-hiu Sep 24, 2024
9fa7ace
translate `library/codeop.po`
mattwang44 Sep 24, 2024
94e3735
Apply suggestions from code review
mattwang44 Sep 30, 2024
d9a547a
Merge branch 'json' into json-3.13
SkyLull Oct 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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/
300 changes: 150 additions & 150 deletions .scripts/poetry.lock

Large diffs are not rendered by default.

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
10 changes: 5 additions & 5 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 @@ -178,7 +178,7 @@ the PSF for inclusion in the documentation.

cd ../cpython/Doc/build/html
python3 -m http.server

你也可以執行下列指令請瀏覽器打開編譯出來的文件\
以確認整份文件的語意通暢(翻譯別的檔案時將 library/math 換成別的檔名):

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
34 changes: 17 additions & 17 deletions 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 All @@ -36,7 +36,7 @@ msgid ""
"like to know of any deficiencies you find in Python."
msgstr ""
"Python 已經是一個以穩定著稱的成熟程式語言。為了維持「穩定」的信譽,開發者們想"
"知道任何您在 Python 中發現的缺失。"
"知道任何你在 Python 中發現的缺失。"

#: ../../bugs.rst:11
msgid ""
Expand All @@ -58,8 +58,8 @@ msgid ""
"improvement, please submit a bug report on the :ref:`tracker <using-the-"
"tracker>`. If you have a suggestion on how to fix it, include that as well."
msgstr ""
"如果您在這份說明文件中發現了錯誤並想要幫助我們改進,請將錯誤報告提交到\\ :"
"ref:`追蹤系統 (tracker) <using-the-tracker>`。如果您有相應的修正建議,請一併"
"如果你在這份說明文件中發現了錯誤並想要幫助我們改進,請將錯誤報告提交到\\ :"
"ref:`追蹤系統 (tracker) <using-the-tracker>`。如果你有相應的修正建議,請一併"
"提交。(譯者註:如果是繁體中文說明文件翻譯相關的錯誤,請提交到 https://"
"github.com/python/python-docs-zh-tw/issues。)"

Expand All @@ -85,9 +85,9 @@ msgid ""
"'docs@' is a mailing list run by volunteers; your request will be noticed, "
"though it may take a while to be processed."
msgstr ""
"如果您的時間有限,也可以將說明文件的錯誤報告以電子郵件寄到 docs@python.org\\ "
"如果你的時間有限,也可以將說明文件的錯誤報告以電子郵件寄到 docs@python.org\\ "
"(程式碼執行的錯誤可以寄到 python-list@python.org)。「docs@」是一個由志工們"
"所運行的郵寄清單;您的請求會被注意到,但可能需要一些時間才會被處理。"
"所運行的郵寄清單;你的請求會被注意到,但可能需要一些時間才會被處理。"

#: ../../bugs.rst:36
msgid "`Documentation bugs`_"
Expand Down Expand Up @@ -163,9 +163,9 @@ msgid ""
"page."
msgstr ""
"填寫報告的第一步,是確認該問題是否已經被回報過了。這樣做的好處,除了可以節省"
"開發者的時間,也能讓您了解目前關於該問題的處理進度;有可能已經在下一個發行版"
"開發者的時間,也能讓你了解目前關於該問題的處理進度;有可能已經在下一個發行版"
"本中修正了這個問題,也有可能需要更詳細的資訊(在這種情況下,如果可以,非常歡"
"迎您提供資訊!)。要確認是否重複回報,請使用頁面頂端的搜尋框來搜尋追蹤系統。"
"迎你提供資訊!)。要確認是否重複回報,請使用頁面頂端的搜尋框來搜尋追蹤系統。"

#: ../../bugs.rst:66
msgid ""
Expand All @@ -174,15 +174,15 @@ msgid ""
"using the \"Sign up\" link. It is not possible to submit a bug report "
"anonymously."
msgstr ""
"如果您想回報的問題還沒有在問題列表出現過,請登入 GitHub。如果您還沒有 GitHub "
"帳戶,請點選「Sign up」連結來建立一個新的帳戶。您無法以匿名方式提交錯誤報告。"
"如果你想回報的問題還沒有在問題列表出現過,請登入 GitHub。如果你還沒有 GitHub "
"帳戶,請點選「Sign up」連結來建立一個新的帳戶。你無法以匿名方式提交錯誤報告。"

#: ../../bugs.rst:71
msgid ""
"Being now logged in, you can submit an issue. Click on the \"New issue\" "
"button in the top bar to report a new issue."
msgstr ""
"如果已經登入,那您就可以提交問題了。請點選列表頂端區域的「New issue」按鈕,來"
"如果已經登入,那你就可以提交問題了。請點選列表頂端區域的「New issue」按鈕,來"
"回報一個新的問題。"

#: ../../bugs.rst:74
Expand All @@ -203,8 +203,8 @@ msgid ""
"extension modules were involved, and what hardware and software platform you "
"were using (including version information as appropriate)."
msgstr ""
"在「Comment」欄位,請詳細描述該問題,包括您預期發生的情況和實際發生的情況。請"
"確定說明中包含了涉及到的任何擴充模組,以及您當時所使用的硬體和軟體平台(視情"
"在「Comment」欄位,請詳細描述該問題,包括你預期發生的情況和實際發生的情況。請"
"確定說明中包含了涉及到的任何擴充模組,以及你當時所使用的硬體和軟體平台(視情"
"況而定,可以附上版本資訊)。"

#: ../../bugs.rst:84
Expand All @@ -214,7 +214,7 @@ msgid ""
"time an action is taken on the issue."
msgstr ""
"每一份問題報告都會被一位開發人員查核,並由他決定要做出什麼變更來修正這個問"
"題。每當該問題有修正動作時,您會收到更新回報。"
"題。每當該問題有修正動作時,你會收到更新回報。"

#: ../../bugs.rst:91
msgid ""
Expand Down Expand Up @@ -259,7 +259,7 @@ msgid ""
"the `core-mentorship mailing list`_ is a friendly place to get answers to "
"any and all questions pertaining to the process of fixing issues in Python."
msgstr ""
"除了只是回報您所發現的錯誤之外,同樣也歡迎您提交修正它們的修補程式 (patch)。"
"您可以在 `Python 開發者指南`_\\ 中找到如何開始修補 Python 的更多資訊。如果您"
"有任何問題,`核心導師郵寄清單`_\\ 是一個友善的地方,您可以在那裡得到,關於 "
"除了只是回報你所發現的錯誤之外,同樣也歡迎你提交修正它們的修補程式 (patch)。"
"你可以在 `Python 開發者指南`_\\ 中找到如何開始修補 Python 的更多資訊。如果你"
"有任何問題,`核心導師郵寄清單`_\\ 是一個友善的地方,你可以在那裡得到,關於 "
"Python 修正錯誤的過程中,所有問題的答案。"
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