From 8793560e121b0255eaac6f21143562f9d1c8287b Mon Sep 17 00:00:00 2001
From: "Sijie.Sun" <sunsijie@buaa.edu.cn>
Date: Tue, 20 Aug 2024 00:38:59 +0800
Subject: [PATCH] fix i18n, revert rust-i18n to v3.0.1 (#267)

---
 Cargo.lock                    | 38 ++++++++++++++++++++++++++++++-----
 easytier/Cargo.toml           |  3 ++-
 easytier/src/easytier-core.rs |  2 +-
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b47fccc..e63ee7c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1647,6 +1647,7 @@ dependencies = [
  "ring 0.17.8",
  "rstest",
  "rust-i18n",
+ "rust-i18n-macro",
  "rustls",
  "serde",
  "serial_test",
@@ -3292,6 +3293,12 @@ version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64804cc6a5042d4f05379909ba25b503ec04e2c082151d62122d5dcaa274b961"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -5065,9 +5072,9 @@ dependencies = [
 
 [[package]]
 name = "rust-i18n"
-version = "3.1.1"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86c962de4e085155073c9ea6b00d8a8049f7dadfb63c62677615a248dd7b0443"
+checksum = "9dcd94370631e5658a0a23635f7f47e43d06a00ad948e0bb5de79b00d85b880c"
 dependencies = [
  "globwalk",
  "once_cell",
@@ -5079,9 +5086,9 @@ dependencies = [
 
 [[package]]
 name = "rust-i18n-macro"
-version = "3.1.1"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b727e4fde7339b901ed0a0d494c6ea576b5273c9692ff18db716b147b08dc68"
+checksum = "355763801dcf287e777e42def7c578410783477b804b1107852119e0b2518396"
 dependencies = [
  "glob",
  "once_cell",
@@ -5090,7 +5097,7 @@ dependencies = [
  "rust-i18n-support",
  "serde",
  "serde_json",
- "serde_yml",
+ "serde_yaml",
  "syn 2.0.74",
 ]
 
@@ -5493,6 +5500,18 @@ dependencies = [
  "syn 2.0.74",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+dependencies = [
+ "indexmap 1.9.3",
+ "ryu",
+ "serde",
+ "yaml-rust",
+]
+
 [[package]]
 name = "serde_yml"
 version = "0.0.11"
@@ -7917,6 +7936,15 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
 [[package]]
 name = "yasna"
 version = "0.5.2"
diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml
index 4f484d38..8d02494e 100644
--- a/easytier/Cargo.toml
+++ b/easytier/Cargo.toml
@@ -174,7 +174,8 @@ parking_lot = { version = "0.12.0", optional = true }
 
 wildmatch = "2.3.4"
 
-rust-i18n = "3"
+rust-i18n = "=3.0.1"
+rust-i18n-macro = "=3.0.0"
 sys-locale = "0.3"
 
 [target.'cfg(windows)'.dependencies]
diff --git a/easytier/src/easytier-core.rs b/easytier/src/easytier-core.rs
index 5e6e5e71..e5f735cd 100644
--- a/easytier/src/easytier-core.rs
+++ b/easytier/src/easytier-core.rs
@@ -281,7 +281,7 @@ struct Cli {
     socks5: Option<u16>,
 }
 
-rust_i18n::i18n!("locales");
+rust_i18n::i18n!("locales", fallback = "en");
 
 impl Cli {
     fn parse_listeners(&self) -> Vec<String> {