From 7bf8e5ee7f8a684732095bee2017447291490864 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 4 Feb 2024 21:54:42 +0000 Subject: [PATCH 1/3] Add `CONTRIBUTING.md` file with information about how to localize --- docs/CONTRIBUTING.md | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 docs/CONTRIBUTING.md diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md new file mode 100644 index 00000000..5e84cb30 --- /dev/null +++ b/docs/CONTRIBUTING.md @@ -0,0 +1,47 @@ +# How to contribute to `rage` + +## Localization + +Locale files are stored in the `age/i18n/` and `rage/i18n/` directories. Check +there to see if your locale already exists! + +We use [Fluent](https://projectfluent.org/) for localization; check that website +for details about the format. In general, strings look like this: + +```fluent +some-unique-identifier = Translate the content on this side of the '=' symbol. +another-unique-identifier = + This is a multiline string that can contain one or more paragraphs. Like + above, the 'another-unique-identifier =' part is not translated, but this + text is. + + Individual paragraphs should be line-wrapped at roughly the same number of + characters as the corresponding English text, so that it looks roughly the + same. Remember that {-terms} and {$variables} won't necessarily be the same + length once filled in. +``` + +To update strings for an existing locale `your-locale`: +- Compare `age/i18n/en-US/age.ftl` with `age/i18n/your-locale/age.ftl`, and copy + over any missing strings (look for unique identifiers that don't appear in the + file for `your-locale`). +- Compare `rage/i18n/en-US/age.ftl` with `rage/i18n/your-locale/age.ftl`, and + copy over any missing strings. +- Edit `age/i18n/your-locale/age.ftl` and `rage/i18n/your-locale/age.ftl` to + replace the English text with the appropriate translations for your locale. + +To translate strings into a new locale `your-locale`: +- Create the directories `age/i18n/your-locale/` and `rage/i18n/your-locale/`. +- Copy `age/i18n/en-US/age.ftl` to `age/i18n/your-locale/age.ftl`. +- Copy `rage/i18n/en-US/age.ftl` to `rage/i18n/your-locale/age.ftl`. +- Edit `age/i18n/your-locale/age.ftl` and `rage/i18n/your-locale/age.ftl` to + replace the English text with the appropriate translations for your locale. + +To test locally, use `cargo run --bin BINARY_NAME -- ARGUMENTS`. If you don't +have `your-locale` enabled globally, set the `LANG` environment variable to +force it: +``` +$ LANG=your-locale cargo run --bin rage -- --help +$ LANG=your-locale cargo run --bin rage -- ARGUMENTS +$ LANG=your-locale cargo run --bin rage-keygen -- --help +``` From 5511d8cecbd2108aa9176ee3d28b4620b5c3d5d5 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 4 Feb 2024 22:24:22 +0000 Subject: [PATCH 2/3] docs: Remove references to now-removed generation scripts --- docs/debian.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/debian.md b/docs/debian.md index 8c260baf..6312543b 100644 --- a/docs/debian.md +++ b/docs/debian.md @@ -9,7 +9,5 @@ cargo install cargo-deb ## Process ``` -cargo run --example generate-completions -cargo run --example generate-docs cargo deb --package rage ``` From e833cd19e426a7e6951521315b206f678db6202a Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 4 Feb 2024 22:33:22 +0000 Subject: [PATCH 3/3] v0.10.0 --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- age-core/CHANGELOG.md | 2 ++ age-core/Cargo.toml | 2 +- age-plugin/CHANGELOG.md | 3 +++ age-plugin/Cargo.toml | 2 +- age/CHANGELOG.md | 2 ++ age/Cargo.toml | 2 +- age/README.md | 2 +- fuzz-afl/Cargo.lock | 4 ++-- fuzz/Cargo.lock | 4 ++-- rage/CHANGELOG.md | 3 +++ rage/Cargo.toml | 2 +- rage/tests/cmd/rage-keygen/version.toml | 2 +- rage/tests/cmd/rage-mount/version.toml | 2 +- rage/tests/cmd/rage/version.toml | 2 +- 16 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bdbdd83..a773cbee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,7 +54,7 @@ dependencies = [ [[package]] name = "age" -version = "0.9.2" +version = "0.10.0" dependencies = [ "aes", "aes-gcm", @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "age-core" -version = "0.9.0" +version = "0.10.0" dependencies = [ "base64", "chacha20poly1305", @@ -120,7 +120,7 @@ dependencies = [ [[package]] name = "age-plugin" -version = "0.4.0" +version = "0.5.0" dependencies = [ "age-core", "base64", @@ -2002,7 +2002,7 @@ dependencies = [ [[package]] name = "rage" -version = "0.9.2" +version = "0.10.0" dependencies = [ "age", "chrono", diff --git a/Cargo.toml b/Cargo.toml index ae8fcf28..dafdd9be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ repository = "https://github.com/str4d/rage" license = "MIT OR Apache-2.0" [workspace.dependencies] -age = { version = "0.9.2", path = "age" } -age-core = { version = "0.9.0", path = "age-core" } +age = { version = "0.10.0", path = "age" } +age-core = { version = "0.10.0", path = "age-core" } # Dependencies required by the age specification: # - Base64 from RFC 4648 diff --git a/age-core/CHANGELOG.md b/age-core/CHANGELOG.md index 5d2b9d8e..b0147f20 100644 --- a/age-core/CHANGELOG.md +++ b/age-core/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to Rust's notion of to 1.0.0 are beta releases. ## [Unreleased] + +## [0.10.0] - 2024-02-04 ### Added - `impl Eq for age_core::format::Stanza` diff --git a/age-core/Cargo.toml b/age-core/Cargo.toml index 6b82a933..5bab42bd 100644 --- a/age-core/Cargo.toml +++ b/age-core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "age-core" description = "[BETA] Common functions used across the age crates" -version = "0.9.0" +version = "0.10.0" authors.workspace = true repository.workspace = true readme = "README.md" diff --git a/age-plugin/CHANGELOG.md b/age-plugin/CHANGELOG.md index 982a52a7..b5afbe48 100644 --- a/age-plugin/CHANGELOG.md +++ b/age-plugin/CHANGELOG.md @@ -9,8 +9,11 @@ and this project adheres to Rust's notion of to 1.0.0 are beta releases. ## [Unreleased] + +## [0.5.0] - 2024-02-04 ### Changed - MSRV is now 1.65.0. +- Migrated to `age-core 0.10`. - `age_plugin::run_state_machine` now takes optional arguments, to enable the creation of recipient-only or identity-only plugins. diff --git a/age-plugin/Cargo.toml b/age-plugin/Cargo.toml index 12712258..30fe48de 100644 --- a/age-plugin/Cargo.toml +++ b/age-plugin/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "age-plugin" description = "[BETA] API for writing age plugins." -version = "0.4.0" +version = "0.5.0" authors.workspace = true repository.workspace = true readme = "README.md" diff --git a/age/CHANGELOG.md b/age/CHANGELOG.md index db0d1813..072dc72c 100644 --- a/age/CHANGELOG.md +++ b/age/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to Rust's notion of to 1.0.0 are beta releases. ## [Unreleased] + +## [0.10.0] - 2024-02-04 ### Added - Russian translation! - `age::cli_common`: diff --git a/age/Cargo.toml b/age/Cargo.toml index d3bb0a02..d2ef80a1 100644 --- a/age/Cargo.toml +++ b/age/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "age" description = "[BETA] A simple, secure, and modern encryption library." -version = "0.9.2" +version = "0.10.0" authors.workspace = true repository.workspace = true readme = "README.md" diff --git a/age/README.md b/age/README.md index e1eb2a0e..ea7c1886 100644 --- a/age/README.md +++ b/age/README.md @@ -23,7 +23,7 @@ The reference interoperable Go implementation is available at Add this line to your `Cargo.toml`: ``` -age = "0.9" +age = "0.10" ``` See the [documentation](https://docs.rs/age) for examples. diff --git a/fuzz-afl/Cargo.lock b/fuzz-afl/Cargo.lock index 6b07e378..20c55bc5 100644 --- a/fuzz-afl/Cargo.lock +++ b/fuzz-afl/Cargo.lock @@ -27,7 +27,7 @@ dependencies = [ [[package]] name = "age" -version = "0.9.2" +version = "0.10.0" dependencies = [ "age-core", "base64", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "age-core" -version = "0.9.0" +version = "0.10.0" dependencies = [ "base64", "chacha20poly1305", diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 90afb386..67f7e069 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ [[package]] name = "age" -version = "0.9.2" +version = "0.10.0" dependencies = [ "age-core", "base64", @@ -38,7 +38,7 @@ dependencies = [ [[package]] name = "age-core" -version = "0.9.0" +version = "0.10.0" dependencies = [ "base64", "chacha20poly1305", diff --git a/rage/CHANGELOG.md b/rage/CHANGELOG.md index e97638de..95e71ac0 100644 --- a/rage/CHANGELOG.md +++ b/rage/CHANGELOG.md @@ -9,7 +9,10 @@ and this project adheres to Rust's notion of to 1.0.0 are beta releases. ## [Unreleased] + +## [0.10.0] - 2024-02-04 ### Added +- Russian translation! - `rage-keygen -y IDENTITY_FILE` to convert identity files to recipients. - Elvish completions to the Debian package. These are not automatically discovered; Elvish users will need to manually import them. diff --git a/rage/Cargo.toml b/rage/Cargo.toml index 00f27d87..865cc432 100644 --- a/rage/Cargo.toml +++ b/rage/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rage" description = "[BETA] A simple, secure, and modern encryption tool." -version = "0.9.2" +version = "0.10.0" authors.workspace = true repository.workspace = true readme = "../README.md" diff --git a/rage/tests/cmd/rage-keygen/version.toml b/rage/tests/cmd/rage-keygen/version.toml index 73547761..e7ab5888 100644 --- a/rage/tests/cmd/rage-keygen/version.toml +++ b/rage/tests/cmd/rage-keygen/version.toml @@ -1,6 +1,6 @@ bin.name = "rage-keygen" args = "--version" stdout = """ -rage-keygen 0.9.2 +rage-keygen 0.10.0 """ stderr = "" diff --git a/rage/tests/cmd/rage-mount/version.toml b/rage/tests/cmd/rage-mount/version.toml index b41e9778..283726f3 100644 --- a/rage/tests/cmd/rage-mount/version.toml +++ b/rage/tests/cmd/rage-mount/version.toml @@ -1,6 +1,6 @@ bin.name = "rage-mount" args = "--version" stdout = """ -rage-mount 0.9.2 +rage-mount 0.10.0 """ stderr = "" diff --git a/rage/tests/cmd/rage/version.toml b/rage/tests/cmd/rage/version.toml index dd3a60ca..2d3ac3b9 100644 --- a/rage/tests/cmd/rage/version.toml +++ b/rage/tests/cmd/rage/version.toml @@ -1,6 +1,6 @@ bin.name = "rage" args = "--version" stdout = """ -rage 0.9.2 +rage 0.10.0 """ stderr = ""