Merge branch 'main' into renderer

Author: sakex

.github/workflows/test.yml

@@ -19,6 +19,8 @@ jobs:
         uses: actions/checkout@v3
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
 
       - name: Test
         run: cargo test
@@ -35,19 +37,18 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: fuzz -> target
+          # Default is "v0-rust"
+          # Use a separate key to prevent collision with main cache
+          prefix-key: "fuzz"
+          # Cache only on main build
+          save-if: ${{ github.ref == 'refs/heads/main' }}
+          cache-directories: |
+            i18n-helpers/fuzz/target
+            i18n-helpers/fuzz/corpus
 
       - name: Install cargo-fuzz
         run: cargo install cargo-fuzz
 
-      - name: Cache fuzz corpus
-        uses: actions/cache@v3
-        with:
-          path: fuzz/corpus
-          key: fuzz-corpus-${{ github.run_id }}
-          restore-keys: |
-            fuzz-corpus
-
       - name: Run group_events fuzzer and minimize corpus
         run: |
           cd i18n-helpers
@@ -60,6 +61,12 @@ jobs:
           cargo fuzz run normalize -- -only_ascii=1 -max_total_time=30
           cargo fuzz cmin normalize
 
+      - name: Run gettext fuzzer and minimize corpus
+        run: |
+          cd i18n-helpers
+          cargo fuzz run gettext -- -only_ascii=1 -max_total_time=30
+          cargo fuzz cmin normalize
+
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
@@ -70,7 +77,11 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Clippy
-        run: cargo clippy -- -D clippy::dbg_macro -D clippy::print_stdout -D clippy::print_stderr
+        run: cargo clippy -- -D clippy::dbg_macro -D clippy::print_stdout -D clippy::print_stderr -D clippy::all
+
+      - name: Clippy on fuzzers
+        working-directory: ./i18n-helpers/fuzz
+        run: cargo clippy -- -D clippy::dbg_macro -D clippy::print_stdout -D clippy::print_stderr -D clippy::all
 
   format:
     name: Format

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This lists the most important changes between releases.
 
+## Version 0.2.4 (2023-09-27)
+
+- [#87]: Set the POT-Creation-Date field in newly generated POT files.
+
 ## Version 0.2.3 (2023-09-19)
 
 - [#75]: Automatically ignore code blocks without string literals and line
@@ -19,7 +23,7 @@ This lists the most important changes between releases.
 ## Version 0.2.0 (2023-08-15)
 
 > This is a breaking release. Please make sure to
-> [run `mdbook-i18n-normalize` on your existing PO files](USAGE.md)!
+> [run `mdbook-i18n-normalize` on your existing PO files](i18n-helpers/USAGE.md)!
 
 - [#49]: Link to other projects which use mdbook-i18n-helpers.
 - [#46]: Add `mdbook-i18n-normalize` to convert existing PO files.
@@ -30,6 +34,7 @@ This lists the most important changes between releases.
 
 First release as a stand-alone crate.
 
+[#87]: https://github.com/google/mdbook-i18n-helpers/pull/87
 [#75]: https://github.com/google/mdbook-i18n-helpers/pull/75
 [#69]: https://github.com/google/mdbook-i18n-helpers/pull/69
 [#59]: https://github.com/google/mdbook-i18n-helpers/pull/59

Cargo.lock

@@ -8,8 +8,8 @@
 This repository contains the following crates that provide extensions and
 infrastructure for [mdbook](https://github.com/rust-lang/mdBook/):
 
-- [mdbook-i18n-helpers](./i18n-helpers/README.md): Gettext translation support
-  for [mdbook](https://github.com/rust-lang/mdBook/)
+- [mdbook-i18n-helpers](i18n-helpers/README.md): Gettext translation support for
+  [mdbook](https://github.com/rust-lang/mdBook/)
 - [mdbook-tera-backend](./mdbook-tera-backend/README.md): Tera templates extension
   for [mdbook](https://github.com/rust-lang/mdBook/)'s HTML renderer.
 
@@ -35,10 +35,10 @@ Please add your project below if it uses
 Run
 
 ```shell
-$ cargo install mdbook-i18n-helpers
+cargo install mdbook-i18n-helpers
 ```
 
-Please see [USAGE](./i18n-helpers/USAGE.md) for how to translate your
+Please see [USAGE](i18n-helpers/USAGE.md) for how to translate your
 [mdbook](https://github.com/rust-lang/mdBook/) project.
 
 ### `mdbook-tera-backend`

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "mdbook-i18n-helpers"
-version = "0.2.3"
+version = "0.2.4"
 authors = ["Martin Geisler <[email protected]>"]
 categories = ["command-line-utilities", "localization"]
 edition = "2021"
@@ -19,6 +19,7 @@ pulldown-cmark-to-cmark = "11.0.0"
 regex = "1.9.4"
 semver = "1.0.16"
 serde_json = "1.0.91"
+textwrap = { version = "0.16.0", default-features = false }
 
 [dev-dependencies]
 pretty_assertions = "1.3.0"