move voxygen/i18n to client/i18n to indicate that it can be used by more frontends if they want to make use of our helpers

Cargo.lock

@@ -6675,6 +6675,7 @@ dependencies = [
  "tokio",
  "tracing",
  "vek 0.15.8",
+ "veloren-client-i18n",
  "veloren-common",
  "veloren-common-base",
  "veloren-common-ecs",
@@ -6683,10 +6684,27 @@ dependencies = [
  "veloren-common-state",
  "veloren-common-systems",
  "veloren-network",
- "veloren-voxygen-i18n",
  "veloren-voxygen-i18n-helpers",
 ]
 
+[[package]]
+name = "veloren-client-i18n"
+version = "0.13.0"
+dependencies = [
+ "clap 3.2.22",
+ "deunicode",
+ "fluent",
+ "fluent-bundle",
+ "fluent-syntax",
+ "hashbrown 0.12.3",
+ "intl-memoizer",
+ "ron 0.8.0",
+ "serde",
+ "tracing",
+ "unic-langid",
+ "veloren-common-assets",
+]
+
 [[package]]
 name = "veloren-common"
 version = "0.10.0"
@@ -7082,6 +7100,7 @@ dependencies = [
  "treeculler",
  "vek 0.15.8",
  "veloren-client",
+ "veloren-client-i18n",
  "veloren-common",
  "veloren-common-base",
  "veloren-common-ecs",
@@ -7092,7 +7111,6 @@ dependencies = [
  "veloren-server",
  "veloren-voxygen-anim",
  "veloren-voxygen-egui",
- "veloren-voxygen-i18n",
  "veloren-voxygen-i18n-helpers",
  "veloren-world",
  "wgpu",
@@ -7126,32 +7144,14 @@ dependencies = [
  "veloren-common-dynlib",
 ]
 
-[[package]]
-name = "veloren-voxygen-i18n"
-version = "0.13.0"
-dependencies = [
- "clap 3.2.22",
- "deunicode",
- "fluent",
- "fluent-bundle",
- "fluent-syntax",
- "hashbrown 0.12.3",
- "intl-memoizer",
- "ron 0.8.0",
- "serde",
- "tracing",
- "unic-langid",
- "veloren-common-assets",
-]
-
 [[package]]
 name = "veloren-voxygen-i18n-helpers"
 version = "0.10.0"
 dependencies = [
  "tracing",
+ "veloren-client-i18n",
  "veloren-common",
  "veloren-common-net",
- "veloren-voxygen-i18n",
 ]
 
 [[package]]

Cargo.toml

@@ -12,6 +12,7 @@ members = [
     "common/systems",
     "common/frontend",
     "client",
+    "client/i18n",
     "plugin/api",
     "plugin/derive",
     "plugin/rt",
@@ -21,7 +22,6 @@ members = [
     "voxygen",
     "voxygen/anim",
     "voxygen/i18n-helpers",
-    "voxygen/i18n",
     "voxygen/egui",
     "world",
     "network",

client/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 [features]
 simd = ["vek/platform_intrinsics"]
 plugins = ["common-state/plugins"]
-bin_bot = ["common-ecs", "serde", "ron", "clap", "structopt", "rustyline", "common-frontend", "async-channel", "voxygen-i18n-helpers", "voxygen-i18n"]
+bin_bot = ["common-ecs", "serde", "ron", "clap", "structopt", "rustyline", "common-frontend", "async-channel", "voxygen-i18n-helpers", "client-i18n"]
 tracy = ["common-base/tracy"]
 tick_network = []
 
@@ -38,7 +38,7 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253
 async-channel = { version = "1.6", optional = true }
 common-ecs = { package = "veloren-common-ecs", path = "../common/ecs", optional = true }
 voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../voxygen/i18n-helpers", optional = true }
-voxygen-i18n = { package = "veloren-voxygen-i18n", path = "../voxygen/i18n", optional = true }
+client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true }
 serde = { version = "1.0", features = [ "rc", "derive" ], optional = true }
 ron = { version = "0.8", default-features = false, optional = true }
 clap = { version = "3.1.8", optional = true, features = ["color", "std"] }
@@ -50,7 +50,7 @@ common-frontend = { package = "veloren-common-frontend", path = "../common/front
 
 [dev-dependencies]
 voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../voxygen/i18n-helpers" }
-voxygen-i18n = { package = "veloren-voxygen-i18n", path = "../voxygen/i18n" }
+client-i18n = { package = "veloren-client-i18n", path = "i18n" }
 
 [[example]]
 name = "chat-cli"

client/examples/chat-cli/main.rs

@@ -1,6 +1,7 @@
 #![deny(unsafe_code)]
 #![deny(clippy::clone_on_ref_ptr)]
 
+use client_i18n::LocalizationHandle;
 use common::{clock::Clock, comp};
 use std::{
     io,
@@ -31,7 +32,7 @@ fn main() {
 
     info!("loading localisation");
 
-    let localisation = voxygen_i18n::LocalizationHandle::load_expect("en");
+    let localisation = LocalizationHandle::load_expect("en");
 
     info!("Starting chat-cli...");
 

client/i18n/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 authors = ["juliancoffee <lightdarkdaughter@gmail.com>"]
 edition = "2021"
-name = "veloren-voxygen-i18n"
+name = "veloren-client-i18n"
-description = "Crate for internalization and diagnostic of existing localizations."
+description = "Optional crate for internalization and diagnostic of existing localizations for frontends to consume"
 version = "0.13.0"
 
 [dependencies]

client/src/lib.rs

@@ -2816,6 +2816,7 @@ impl Drop for Client {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use client_i18n::LocalizationHandle;
 
     #[test]
     /// THIS TEST VERIFIES THE CONSTANT API.
@@ -2845,7 +2846,7 @@ mod tests {
             password,
             |suggestion: &str| suggestion == auth_server,
         ));
-        let localisation = voxygen_i18n::LocalizationHandle::load_expect("en");
+        let localisation = LocalizationHandle::load_expect("en");
 
         let _ = veloren_client.map(|mut client| {
             //clock

voxygen/Cargo.toml

@@ -49,7 +49,7 @@ common-systems = {package = "veloren-common-systems", path = "../common/systems"
 common-state = {package = "veloren-common-state", path = "../common/state"}
 
 anim = {package = "veloren-voxygen-anim", path = "anim"}
-i18n = {package = "veloren-voxygen-i18n", path = "i18n"}
+i18n = {package = "veloren-client-i18n", path = "../client/i18n"}
 i18n-helpers = {package = "veloren-voxygen-i18n-helpers", path = "i18n-helpers"}
 voxygen-egui = {package = "veloren-voxygen-egui", path = "egui", optional = true }
 

voxygen/i18n-helpers/Cargo.toml

@@ -8,6 +8,6 @@ version = "0.10.0"
 [dependencies]
 common-net = {package = "veloren-common-net", path = "../../common/net"}
 common = {package = "veloren-common", path = "../../common"}
-i18n = {package = "veloren-voxygen-i18n", path = "../i18n"}
+i18n = {package = "veloren-client-i18n", path = "../../client/i18n"}
 # Utility
 tracing = "0.1"