Extract server locale code to own crate

10 files changed, 12 insertions, 166 deletions

diff --git a/server/src/commands.rs b/server/src/commands.rs
index 2a922e3f..2f0902ba 100644
--- a/server/src/commands.rs
+++ b/server/src/commands.rs
@@ -17,13 +17,12 @@
 */
 use crate::{
     entity::{bot::BotDriver, tutorial::Tutorial},
-    message::TrError,
     server::{AnnounceState, Server},
-    tre, trm,
 };
 use anyhow::Result;
 use clap::{Parser, ValueEnum};
 use hurrycurry_bot::algos::ALGO_CONSTRUCTORS;
+use hurrycurry_locale::{tre, trm, TrError};
 use hurrycurry_protocol::{Character, Menu, Message, PacketC, PlayerClass, PlayerID};
 use std::{fmt::Write, time::Duration};
 
diff --git a/server/src/entity/book.rs b/server/src/entity/book.rs
index 566eb0a9..4b87aa44 100644
--- a/server/src/entity/book.rs
+++ b/server/src/entity/book.rs
@@ -16,8 +16,8 @@
 
 */
 use super::{Entity, EntityContext};
-use crate::message::TrError;
 use anyhow::Result;
+use hurrycurry_locale::TrError;
 use hurrycurry_protocol::{glam::IVec2, Menu, PacketC, PlayerID};
 
 #[derive(Debug, Clone)]
diff --git a/server/src/entity/campaign.rs b/server/src/entity/campaign.rs
index 03136869..53ea6582 100644
--- a/server/src/entity/campaign.rs
+++ b/server/src/entity/campaign.rs
@@ -16,8 +16,9 @@
 
 */
 use super::{Entity, EntityContext};
-use crate::{message::TrError, scoreboard::ScoreboardStore, server::GameServerExt, trm};
+use crate::{scoreboard::ScoreboardStore, server::GameServerExt};
 use anyhow::Result;
+use hurrycurry_locale::{trm, TrError};
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     Message, PacketC, PlayerID, TileIndex,
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index c42ebd65..928910bc 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -30,7 +30,6 @@ pub mod tutorial;
 use crate::{
     data::{ItemTileRegistry, Serverdata},
     entity::pedestrians::Pedestrians,
-    message::TrError,
     scoreboard::ScoreboardStore,
 };
 use anyhow::{anyhow, Result};
@@ -40,6 +39,7 @@ use conveyor::Conveyor;
 use customers::Customers;
 use environment_effect::{EnvironmentController, EnvironmentEffect, EnvironmentEffectController};
 use hurrycurry_client_lib::Game;
+use hurrycurry_locale::TrError;
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     Character, PacketC, PacketS, PlayerID,
diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs
index 7da50417..bc4e3e7d 100644
--- a/server/src/entity/tutorial.rs
+++ b/server/src/entity/tutorial.rs
@@ -16,8 +16,8 @@
 
 */
 use super::{Entity, EntityContext};
-use crate::{message::TrError, trm};
 use anyhow::Result;
+use hurrycurry_locale::{TrError, trm};
 use hurrycurry_protocol::{
     glam::IVec2, ItemIndex, Message, PacketC, PlayerID, Recipe, RecipeIndex, TileIndex,
 };
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 085ae64a..3e01ba36 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -20,7 +20,6 @@ pub mod commands;
 pub mod data;
 pub mod entity;
 pub mod interaction;
-pub mod message;
 pub mod network;
 pub mod scoreboard;
 pub mod server;
diff --git a/server/src/main.rs b/server/src/main.rs
index 2c47db7d..5514e7d0 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -18,8 +18,9 @@
 use anyhow::{bail, Result};
 use clap::Parser;
 use futures_util::{SinkExt, StreamExt};
+use hurrycurry_locale::trm;
 use hurrycurry_protocol::{PacketC, PacketS};
-use hurrycurry_server::{data::DATA_DIR, server::Server, trm, ConnectionID};
+use hurrycurry_server::{data::DATA_DIR, server::Server, ConnectionID};
 use log::{debug, info, trace, warn, LevelFilter};
 use std::{
     env::var, net::SocketAddr, path::PathBuf, process::exit, str::FromStr, sync::Arc,
diff --git a/server/src/message.rs b/server/src/message.rs
deleted file mode 100644
index 31084ada..00000000
--- a/server/src/message.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-    Hurry Curry! - a game about cooking
-    Copyright (C) 2025 Hurry Curry! Contributors
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, version 3 of the License only.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-*/
-
-use anyhow::{anyhow, Result};
-use hurrycurry_protocol::Message;
-use std::{
-    collections::HashMap,
-    fmt::{Debug, Display},
-    ops::Index,
-    sync::LazyLock,
-};
-
-#[macro_export]
-macro_rules! trm {
-    ($id:literal $(, $typ:ident = $param:expr)*) => {
-        hurrycurry_protocol::Message::Translation {
-            id: $id.to_owned(),
-            params: vec![$($crate::trm_param!($typ, $param)),*]
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! trm_param {
-    (s, $x:expr) => {
-        hurrycurry_protocol::Message::Text($x)
-    };
-    (i, $x:expr) => {
-        hurrycurry_protocol::Message::Item($x)
-    };
-    (t, $x:expr) => {
-        hurrycurry_protocol::Message::Tile($x)
-    };
-    (m, $x:expr) => {
-        $x
-    };
-}
-
-pub enum TrError {
-    Tr {
-        id: &'static str,
-        params: Vec<Message>,
-    },
-    Plain(String),
-}
-impl From<TrError> for Message {
-    fn from(value: TrError) -> Self {
-        match value {
-            TrError::Tr { id, params } => Self::Translation {
-                id: id.to_owned(),
-                params,
-            },
-            TrError::Plain(s) => Self::Text(s),
-        }
-    }
-}
-impl Debug for TrError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TrError::Tr { id, params } => write!(f, "{} {:?}", tr(id), params),
-            TrError::Plain(s) => write!(f, "{s}"),
-        }
-    }
-}
-impl Display for TrError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TrError::Tr { id, params } => {
-                if params.is_empty() {
-                    write!(f, "{}", tr(id))
-                } else {
-                    let mut s = tr(id).to_string();
-                    for (i, p) in params.iter().enumerate() {
-                        s = s.replace(&format!("{{{i}}}"), &format!("{p:?}"));
-                    }
-                    write!(f, "{s}")
-                }
-            }
-            TrError::Plain(s) => write!(f, "{s}"),
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! tre {
-    ($id:literal $(, $typ:ident = $param:expr)*) => {
-        $crate::message::TrError::Tr {
-            id: $id,
-            params: vec![$($crate::tre_param!($typ, $param)),*]
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! tre_param {
-    (s, $x:expr) => {
-        hurrycurry_protocol::Message::Text($x)
-    };
-    (i, $x:expr) => {
-        hurrycurry_protocol::Message::Item($x)
-    };
-    (t, $x:expr) => {
-        hurrycurry_protocol::Message::Tile($x)
-    };
-    (m, $x:expr) => {
-        $x
-    };
-}
-
-pub struct Strings(HashMap<String, String>);
-impl Index<&'static str> for Strings {
-    type Output = str;
-    fn index(&self, index: &'static str) -> &Self::Output {
-        self.0.get(index).map(|s| s.as_str()).unwrap_or(index)
-    }
-}
-
-impl Strings {
-    pub fn load() -> Result<Self> {
-        Ok(Self(
-            include_str!("../../locale/en.ini")
-                .lines()
-                .skip(1)
-                .map(|l| {
-                    let (k, v) = l.split_once("=").ok_or(anyhow!("'=' missing"))?;
-                    Ok::<_, anyhow::Error>((
-                        k.trim_end().to_owned(),
-                        v.trim_start().replace("%n", "\n"),
-                    ))
-                })
-                .try_collect()?,
-        ))
-    }
-}
-
-static TR: LazyLock<Strings> = LazyLock::new(|| Strings::load().unwrap());
-pub fn tr(s: &'static str) -> &'static str {
-    &TR[s]
-}
diff --git a/server/src/server.rs b/server/src/server.rs
index d074bedd..363afc7b 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -19,12 +19,12 @@ use crate::{
     data::{DataIndex, Serverdata},
     entity::{Entities, EntityContext},
     interaction::{interact, tick_slot},
-    message::TrError,
     scoreboard::ScoreboardStore,
-    tre, ConnectionID,
+    ConnectionID,
 };
 use anyhow::{Context, Result};
 use hurrycurry_client_lib::{gamedata_index::GamedataIndex, Game, Involvement, Item, Player, Tile};
+use hurrycurry_locale::{tre, TrError};
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     movement::MovementBase,
diff --git a/server/src/state.rs b/server/src/state.rs
index 45e928aa..6cdaa8f1 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -16,11 +16,11 @@
 
 */
 use crate::{
-    message::TrError,
     server::{AnnounceState, ConnectionData, GameServerExt, Server},
-    tre, trm, ConnectionID,
+    ConnectionID,
 };
 use anyhow::Result;
+use hurrycurry_locale::{tre, trm, TrError};
 use hurrycurry_protocol::{Menu, Message, PacketC, PacketS, PlayerID, VERSION};
 use log::{debug, info, trace};