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

working on ssl #770

Merged
merged 15 commits into from
Dec 26, 2023
Merged

working on ssl #770

merged 15 commits into from
Dec 26, 2023

Conversation

timmy0123
Copy link
Contributor

No description provided.

@mattwang44
Copy link
Collaborator

一樣請記得確認沒有 PR branch conflict(不用開新的 PR,直接 rebase 這個 branch 就好)

Copy link
Collaborator

@mattwang44 mattwang44 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 目前你對於 branch 的操作是 merge 不是 rebase,用 merge 也沒有關係(只是 PR review 會比較麻煩)
  • 對於 cipher 一詞的翻譯我還是有些疑慮,我開了一個 discussion (cipher 的翻譯 #771),如果你有任何想法也可以在那邊一起討論(或是之後遇到不確定的詞彙你也可以直接開一個 discussion)

Copy link
Collaborator

@mattwang44 mattwang44 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review part 1

library/ssl.po Outdated
Comment on lines 151 to 153
"使用預設內容及 IPv4/IPv6 雙協定堆疊的客戶端 socket 範例:\n"
"\n"
"::"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"使用預設內容及 IPv4/IPv6 雙協定堆疊的客戶端 socket 範例:\n"
"\n"
"::"
"使用預設內容及 IPv4/IPv6 雙協定堆疊的客戶端 socket 範例: ::"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

目前查樂詞網的翻譯為上下文,只是這邊的context好像是一個新的解釋
https://docs.python.org/3.12/library/ssl.html#ssl.SSLContext

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

目前現有翻譯是翻成「情境」(例如 context manager -> 情境管理器,也請見 #400)或「語境」,你覺得合適嗎?

library/ssl.po Outdated Show resolved Hide resolved
library/ssl.po Outdated Show resolved Hide resolved
library/ssl.po Outdated Show resolved Hide resolved
library/ssl.po Outdated Show resolved Hide resolved
library/ssl.po Outdated Show resolved Hide resolved
library/ssl.po Outdated Show resolved Hide resolved
library/ssl.po Outdated Show resolved Hide resolved
timmy0123 and others added 7 commits December 25, 2023 11:48
Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
@mattwang44
Copy link
Collaborator

提醒一下,如果是在 GitHub UI 上修正 review comment 的話,可以考慮用 add suggestion to batch 再 commit,這樣就不會產生太多 commit
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request

library/ssl.po Outdated Show resolved Hide resolved
@mattwang44 mattwang44 enabled auto-merge (squash) December 26, 2023 07:30
@mattwang44 mattwang44 merged commit 6657eb7 into python:3.12 Dec 26, 2023
1 check passed
@timmy0123 timmy0123 deleted the ssl branch December 27, 2023 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants