rust-lang-ja · noritada · Jul 5, 2023 · Jul 5, 2023 · Jul 5, 2023 · Mar 24, 2024
diff --git a/.github/workflows/rbe.yml b/.github/workflows/rbe.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 env:
   # Update the language picker in index.hbs to link new languages.
-  LANGUAGES: ja
+  LANGUAGES: ja zh es
 
 jobs:
   test:
@@ -27,12 +27,12 @@ jobs:
     - name: Install mdbook
       run: |
         mkdir bin
-        curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.15/mdbook-v0.4.15-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
+        curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.51/mdbook-v0.4.51-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
         echo "$(pwd)/bin" >> ${GITHUB_PATH}
 
     - name: Install mdbook-i18n-helpers
       run: |
-        cargo install mdbook-i18n-helpers --locked --version 0.3.1
+        cargo install mdbook-i18n-helpers --locked --version 0.3.4
 
     - name: Report versions
       run: |
@@ -55,27 +55,24 @@ jobs:
     - name: Build all translations
       run: |
         for po_lang in ${{ env.LANGUAGES }}; do
-          POT_CREATION_DATE=$(grep --max-count 1 '^"POT-Creation-Date:' po/$po_lang.po | sed -E 's/".*: (.*)\\n"/\1/')
-          if [[ $POT_CREATION_DATE == "" ]]; then
-              POT_CREATION_DATE=now
-          fi
-
-          echo "::group::Building $po_lang translation as of $POT_CREATION_DATE"
-          rm -r src/
-          git restore --source "$(git rev-list -n 1 --before "$POT_CREATION_DATE" @)" src/
-
+          echo "::group::Building $po_lang translation"
           # Set language and adjust site URL. Clear the redirects
           # since they are in sync with the source files, not the
           # translation.
           MDBOOK_BOOK__LANGUAGE=$po_lang \
-          MDBOOK_OUTPUT__HTML__SITE_URL=/rust-by-example/$po_lang/ \
-          MDBOOK_OUTPUT__HTML__REDIRECT='{}' \
           mdbook build -d book/$po_lang
           echo "::endgroup::"
         done
 
+    - name: Check all translations for broken links
+      run: |
+        for po_lang in ${{ env.LANGUAGES }}; do
+          MDBOOK_BOOK__LANGUAGE=$po_lang \
+          sh linkcheck.sh --all rust-by-example
+        done
+
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: rust-by-example
         path: book
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,7 @@ book
 
 po/messages.pot
 
+.vscode/
+
 # Auto-generated files from macOS
 .DS_Store
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ abide by the [Rust code of conduct], which you can find at that link or in the
 
 ## License
 
-RBE is dual licenced under the MIT and Apache 2.0 licenses, and so are all
+RBE is dual licensed under the MIT and Apache 2.0 licenses, and so are all
 contributions. Please see the [`LICENSE-MIT`] and [`LICENSE-APACHE`] files in
 this directory for more details.
 
@@ -55,7 +55,7 @@ $ mdbook build
 
 **The following warnings can be ignored safely.**
 
-```
+```text
 [WARN] (mdbook::preprocess::cmd): The command wasn't found, is the "gettext" preprocessor installed?
 [WARN] (mdbook::preprocess::cmd):   Command: mdbook-gettext
 ```

diff --git a/README.md b/README.md
@@ -1,9 +1,6 @@
 # Rust By Example
 
-[![Build Status][travis-badge]][travis-repo]
-
-[travis-badge]: https://travis-ci.com/rust-lang/rust-by-example.svg?branch=master
-[travis-repo]: https://travis-ci.com/rust-lang/rust-by-example
+[![Build Status](https://github.com/rust-lang/rust-by-example/actions/workflows/rbe.yml/badge.svg)](https://github.com/rust-lang/rust-by-example/actions)
 
 Learn Rust with examples (Live code editor included)
 
@@ -29,7 +26,7 @@ read all content offline, however!
 
 **The following warnings can be ignored safely.**
 
-```
+```text
 [WARN] (mdbook::preprocess::cmd): The command wasn't found, is the "gettext" preprocessor installed?
 [WARN] (mdbook::preprocess::cmd):   Command: mdbook-gettext
 ```
@@ -64,11 +61,13 @@ Please see the [TRANSLATING.md] file for more details.
 
 [TRANSLATING_JA.md]: https://github.com/rust-lang/rust-by-example/blob/master/TRANSLATING_JA.md
 
+* Chinese/中文: [TRANSLATING_ZH.md]
+
+[TRANSLATING_ZH.md]: https://github.com/rust-lang/rust-by-example/blob/master/TRANSLATING_ZH.md
+
 ## Translations to other languages
 
 * [Bulgarian](https://github.com/kberov/rust-by-example-bg)
-* [Chinese](https://github.com/rust-lang-cn/rust-by-example-cn)
-* [Japanese](https://github.com/rust-lang-ja/rust-by-example-ja)
 * [French](https://github.com/Songbird0/FR_RBE)
 * [Russian](https://github.com/ruRust/rust-by-example)
 * [Vietnamese](https://github.com/EyesCrypto-Insights/rust-by-example-vn)

diff --git a/TRANSLATING.md b/TRANSLATING.md
@@ -37,12 +37,18 @@ MDBOOK_OUTPUT='{"xgettext": {"pot-file": "messages.pot"}}' \
 msginit -i po/messages.pot -l xx -o po/xx.po
 ```
 
-#### Updating the exising translation resource
+#### Updating the existing translation resource
 
 ```bash
 msgmerge --update po/xx.po po/messages.pot
 ```
 
+#### Tracking translation progress
+
+```bash
+msgfmt --statistics po/xx.po
+```
+
 ### Editing translation resources
 
 After generating a translation resource `po/xx.po`, you can write translation messages in `msgstr` entry of `po/xx.po`.
@@ -55,7 +61,7 @@ MDBOOK_BOOK__LANGUAGE=xx mdbook serve
 
 ### Add a language entry
 
-Please add a language entry in `.github/workflows/rbe.yml` and `theme/index.hbs` like below:
+Please add a language entry in `.github/workflows/rbe.yml`, `theme/index.hbs`, and `src/bootstrap/src/core/build_steps/doc.rs` in [rust-lang/rust](https://github.com/rust-lang/rust) like below:
 
 * `rbe.yml`
 
@@ -83,3 +89,9 @@ env:
   </button></li>
 </ul>
 ```
+
+* `src/bootstrap/src/core/build_steps/doc.rs` in [rust-lang/rust](https://github.com/rust-lang/rust)
+
+```rust
+RustByExample, "src/doc/rust-by-example", "rust-by-example", &["xx", "yy", "zz"], submodule;
+```
diff --git a/TRANSLATING_ZH.md b/TRANSLATING_ZH.md
@@ -0,0 +1,32 @@
+# Rust by Example 中文版翻译指南
+
+Rust by Example 中文版的翻译在 https://github.com/rust-lang-cn/rust-by-example 仓库进行审核和校对。
+
+如果您希望参与翻译，请按照以下流程操作：
+
+1. 复刻（fork）https://github.com/rust-lang/rust-by-example 仓库。
+
+2. 在 `po/zh.po` 文件中添加或修改译文。
+
+3. 向 https://github.com/rust-lang-cn/rust-by-example 仓库的 `zh` 分支提交 PR（Pull Request）。
+   - 先在 rust-lang-cn 仓库进行审校，而非直接向原始仓库提交 PR，这样可以更方便进行译文讨论。
+   - 中文社区仓库的默认分支为 `zh`，因此正常创建 PR 时会自动指向该分支。
+
+rust-lang-cn 翻译组成员的维护流程：
+
+1. 审核并校对提交的 PR，先合并到 `zh` 分支。
+
+2. 向 https://github.com/rust-lang/rust-by-example 原始仓库提交 PR。
+
+## 翻译规范
+
+### 总体原则
+
+* 文风应保持正式、清晰、简洁
+* 标点符号原则上使用全角（如括号"（）"和冒号"："等）
+
+### 术语翻译指南
+
+* 对于已经广泛接受的技术术语，保留英文或使用通用的中文翻译
+* 避免生硬的直译，优先考虑符合中文语境的自然表达
+* 保持术语翻译的一致性，可参考 [Rust 语言术语中英文对照表](https://github.com/rust-lang-cn/english-chinese-glossary-of-rust/blob/master/rust-glossary.md)
diff --git a/book.toml b/book.toml
@@ -1,7 +1,7 @@
 [book]
 title = "Rust By Example"
 description = "Rust by Example (RBE) is a collection of runnable examples that illustrate various Rust concepts and standard libraries."
-author = "The Rust Community"
+authors = ["The Rust Community"]
 
 [output.html.playpen]
 editable = true
@@ -13,9 +13,12 @@ enable = true
 
 [output.html]
 git-repository-url = "https://github.com/rust-lang/rust-by-example"
+edit-url-template = "https://github.com/rust-lang/rust-by-example/edit/master/{path}"
+hash-files = true
 additional-css = [
   "theme/css/language-picker.css",
 ]
+additional-js = ["theme/js/language-picker.js"]
 
 [rust]
 edition = "2021"