Introduced the minify_key feature for i18n! and added support for format specifiers in t!

Cargo.toml

@@ -53,6 +53,7 @@ members = [
     "crates/macro",
     "examples/app-egui",
     "examples/app-load-path",
+    "examples/app-metadata",
     "examples/app-minify-key",
     "examples/foo",
 ]

README.md

@@ -70,6 +70,10 @@ i18n!("locales",
 );
 // Now, if the message length exceeds 64, the `t!` macro will automatically generate
 // a 12-byte short hashed key with a "T." prefix for it, if not, it will use the original.
+
+// Configuration using the `[package.metadata.i18n]` section in `Cargo.toml`,
+// Useful for the `cargo i18n` command line tool.
+i18n!(metadata = true);
 ```
 
 Or you can import by use directly:

crates/cli/Cargo.toml

@@ -10,11 +10,8 @@ version = "3.0.0"
 [dependencies]
 anyhow = "1"
 clap = { version = "4.1.14", features = ["derive"] }
-itertools = "0.11.0"
 rust-i18n-support = { path = "../support", version = "3.0.0" }
 rust-i18n-extract = { path = "../extract", version = "3.0.0" }
-serde = { version = "1", features = ["derive"] }
-toml = "0.7.4"
 
 [[bin]]
 name = "cargo-i18n"

crates/cli/src/main.rs

@@ -1,13 +1,9 @@
 use anyhow::Error;
 use clap::{Args, Parser};
-use rust_i18n_extract::attrs::I18nAttrs;
-use rust_i18n_support::MinifyKey;
-
-use std::{collections::HashMap, path::Path};
-
 use rust_i18n_extract::extractor::Message;
 use rust_i18n_extract::{extractor, generator, iter};
-mod config;
+use rust_i18n_support::{I18nConfig, MinifyKey};
+use std::{collections::HashMap, path::Path};
 
 #[derive(Parser)]
 #[command(name = "cargo")]
@@ -71,14 +67,16 @@ fn translate_value_parser(s: &str) -> Result<(String, String), std::io::Error> {
 fn add_translations(
     list: &[(String, String)],
     results: &mut HashMap<String, Message>,
-    attrs: &I18nAttrs,
+    cfg: &I18nConfig,
 ) {
-    let I18nAttrs {
+    let I18nConfig {
         minify_key,
         minify_key_len,
         minify_key_prefix,
         minify_key_thresh,
-    } = attrs;
+        ..
+    } = cfg;
+
     for item in list {
         let index = results.len();
         let key = if *minify_key {
@@ -105,14 +103,14 @@ fn main() -> Result<(), Error> {
 
     let source_path = args.source.expect("Missing source path");
 
-    let cfg = config::load(std::path::Path::new(&source_path))?;
+    let cfg = I18nConfig::load(std::path::Path::new(&source_path))?;
 
     iter::iter_crate(&source_path, |path, source| {
-        extractor::extract(&mut results, path, source, cfg.attrs.clone())
+        extractor::extract(&mut results, path, source, cfg.clone())
     })?;
 
     if let Some(list) = args.translate {
-        add_translations(&list, &mut results, &cfg.attrs);
+        add_translations(&list, &mut results, &cfg);
     }
 
     let mut messages: Vec<_> = results.iter().collect();

crates/extract/Cargo.toml

@@ -16,7 +16,7 @@ proc-macro2 = { version = "1", features = ["span-locations"] }
 quote = "1"
 regex = "1"
 rust-i18n-support = { path = "../support", version = "3.0.0" }
-serde = { version = "1", features = ["derive"] }
+serde = "1"
 serde_json = "1"
 serde_yaml = "0.8"
 syn = { version = "2.0.18", features = ["full"] }

crates/extract/src/extractor.rs

@@ -1,7 +1,7 @@
-use crate::attrs::I18nAttrs;
 use anyhow::Error;
 use proc_macro2::{TokenStream, TokenTree};
 use quote::ToTokens;
+use rust_i18n_support::I18nConfig;
 use std::collections::HashMap;
 use std::path::PathBuf;
 
@@ -39,13 +39,9 @@ pub fn extract(
     results: &mut Results,
     path: &PathBuf,
     source: &str,
-    attrs: I18nAttrs,
+    cfg: I18nConfig,
 ) -> Result<(), Error> {
-    let mut ex = Extractor {
-        results,
-        path,
-        attrs,
-    };
+    let mut ex = Extractor { results, path, cfg };
 
     let file = syn::parse_file(source)
         .unwrap_or_else(|_| panic!("Failed to parse file, file: {}", path.display()));
@@ -57,7 +53,7 @@ pub fn extract(
 struct Extractor<'a> {
     results: &'a mut Results,
     path: &'a PathBuf,
-    attrs: I18nAttrs,
+    cfg: I18nConfig,
 }
 
 impl<'a> Extractor<'a> {
@@ -99,12 +95,13 @@ impl<'a> Extractor<'a> {
             return;
         };
 
-        let I18nAttrs {
+        let I18nConfig {
             minify_key,
             minify_key_len,
             minify_key_prefix,
             minify_key_thresh,
-        } = &self.attrs;
+            ..
+        } = &self.cfg;
         let key: Option<proc_macro2::Literal> = Some(literal);
 
         if let Some(lit) = key {
@@ -242,7 +239,7 @@ mod tests {
         let mut ex = Extractor {
             results: &mut results,
             path: &"hello.rs".to_owned().into(),
-            attrs: I18nAttrs::default(),
+            cfg: I18nConfig::default(),
         };
 
         ex.invoke(stream).unwrap();

crates/extract/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod attrs;
 pub mod extractor;
 pub mod generator;
 pub mod iter;