diff --git a/Cargo.lock b/Cargo.lock index f2ce94e2c4..9dec3b09fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6683,8 +6683,8 @@ dependencies = [ "veloren-common-state", "veloren-common-systems", "veloren-network", - "veloren-voxygen-chat-i18n", "veloren-voxygen-i18n", + "veloren-voxygen-i18n-helpers", ] [[package]] @@ -7091,9 +7091,9 @@ dependencies = [ "veloren-common-systems", "veloren-server", "veloren-voxygen-anim", - "veloren-voxygen-chat-i18n", "veloren-voxygen-egui", "veloren-voxygen-i18n", + "veloren-voxygen-i18n-helpers", "veloren-world", "wgpu", "wgpu-profiler", @@ -7114,16 +7114,6 @@ dependencies = [ "veloren-common-dynlib", ] -[[package]] -name = "veloren-voxygen-chat-i18n" -version = "0.10.0" -dependencies = [ - "tracing", - "veloren-common", - "veloren-common-net", - "veloren-voxygen-i18n", -] - [[package]] name = "veloren-voxygen-egui" version = "0.9.0" @@ -7154,6 +7144,16 @@ dependencies = [ "veloren-common-assets", ] +[[package]] +name = "veloren-voxygen-i18n-helpers" +version = "0.10.0" +dependencies = [ + "tracing", + "veloren-common", + "veloren-common-net", + "veloren-voxygen-i18n", +] + [[package]] name = "veloren-world" version = "0.10.0" diff --git a/Cargo.toml b/Cargo.toml index 532b277454..70cc7c35cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ members = [ "server-cli", "voxygen", "voxygen/anim", - "voxygen/chat-i18n", + "voxygen/i18n-helpers", "voxygen/i18n", "voxygen/egui", "world", diff --git a/client/Cargo.toml b/client/Cargo.toml index 63487f105b..b20d289588 100644 --- a/client/Cargo.toml +++ b/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-chat-i18n", "voxygen-i18n"] +bin_bot = ["common-ecs", "serde", "ron", "clap", "structopt", "rustyline", "common-frontend", "async-channel", "voxygen-i18n-helpers", "voxygen-i18n"] tracy = ["common-base/tracy"] tick_network = [] @@ -37,7 +37,7 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253 #bot only async-channel = { version = "1.6", optional = true } common-ecs = { package = "veloren-common-ecs", path = "../common/ecs", optional = true } -voxygen-chat-i18n = { package = "veloren-voxygen-chat-i18n", path = "../voxygen/chat-i18n", 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 } serde = { version = "1.0", features = [ "rc", "derive" ], optional = true } ron = { version = "0.8", default-features = false, optional = true } @@ -49,7 +49,7 @@ termcolor = { version = "1.1", optional = true } common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true } [dev-dependencies] -voxygen-chat-i18n = { package = "veloren-voxygen-chat-i18n", path = "../voxygen/chat-i18n" } +voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../voxygen/i18n-helpers" } voxygen-i18n = { package = "veloren-voxygen-i18n", path = "../voxygen/i18n" } [[example]] diff --git a/client/examples/chat-cli/main.rs b/client/examples/chat-cli/main.rs index 38de9e806e..832eba4cab 100644 --- a/client/examples/chat-cli/main.rs +++ b/client/examples/chat-cli/main.rs @@ -11,7 +11,7 @@ use std::{ use tokio::runtime::Runtime; use tracing::{error, info}; use veloren_client::{addr::ConnectionArgs, Client, Event}; -use voxygen_chat_i18n::internationalisate_chat_message; +use voxygen_i18n_helpers::internationalisate_chat_message; const TPS: u64 = 10; // Low value is okay, just reading messages. diff --git a/client/src/lib.rs b/client/src/lib.rs index 0017881959..36cabc7386 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -2825,7 +2825,7 @@ mod tests { /// CONTACT @Core Developer BEFORE MERGING CHANGES TO THIS TEST fn constant_api_test() { use common::clock::Clock; - use voxygen_chat_i18n::internationalisate_chat_message; + use voxygen_i18n_helpers::internationalisate_chat_message; const SPT: f64 = 1.0 / 60.0; diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index e821f68ece..04ce8e36df 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -50,7 +50,7 @@ common-state = {package = "veloren-common-state", path = "../common/state"} anim = {package = "veloren-voxygen-anim", path = "anim"} i18n = {package = "veloren-voxygen-i18n", path = "i18n"} -chat-i18n = {package = "veloren-voxygen-chat-i18n", path = "chat-i18n"} +i18n-helpers = {package = "veloren-voxygen-i18n-helpers", path = "i18n-helpers"} voxygen-egui = {package = "veloren-voxygen-egui", path = "egui", optional = true } # Graphics diff --git a/voxygen/chat-i18n/Cargo.toml b/voxygen/i18n-helpers/Cargo.toml similarity index 88% rename from voxygen/chat-i18n/Cargo.toml rename to voxygen/i18n-helpers/Cargo.toml index e48e8e093c..cb2f44ec1b 100644 --- a/voxygen/chat-i18n/Cargo.toml +++ b/voxygen/i18n-helpers/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["juliancoffee "] edition = "2021" -name = "veloren-voxygen-chat-i18n" +name = "veloren-voxygen-i18n-helpers" description = "Crate for internalization and diagnostic of existing localizations." version = "0.10.0" diff --git a/voxygen/chat-i18n/src/lib.rs b/voxygen/i18n-helpers/src/lib.rs similarity index 100% rename from voxygen/chat-i18n/src/lib.rs rename to voxygen/i18n-helpers/src/lib.rs diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs index 7d3539d830..a2782787e7 100644 --- a/voxygen/src/hud/chat.rs +++ b/voxygen/src/hud/chat.rs @@ -3,7 +3,6 @@ use super::{ OFFLINE_COLOR, ONLINE_COLOR, REGION_COLOR, SAY_COLOR, TELL_COLOR, TEXT_COLOR, WORLD_COLOR, }; use crate::{cmd::complete, settings::chat::MAX_CHAT_TABS, ui::fonts::Fonts, GlobalState}; -use chat_i18n::internationalisate_chat_message; use client::Client; use common::comp::{group::Role, ChatMode, ChatMsg, ChatType}; use conrod_core::{ @@ -19,6 +18,7 @@ use conrod_core::{ WidgetCommon, }; use i18n::Localization; +use i18n_helpers::internationalisate_chat_message; use std::collections::{HashSet, VecDeque}; widget_ids! {