From 9882b575deb488251cc39037f4ac2a026eb584a4 Mon Sep 17 00:00:00 2001 From: eraden Date: Fri, 20 May 2022 19:47:19 +0200 Subject: [PATCH] Locales --- Cargo.toml | 1 + actors/account_manager/Cargo.toml | 3 --- actors/cart_manager/Cargo.toml | 2 ++ actors/cart_manager/src/lib.rs | 8 +++----- api/locales/pl.yml => actors/lang_provider/Cargo.toml | 0 actors/lang_provider/locales/en/cart.ftl | 0 actors/lang_provider/locales/pl/cart.ftl | 0 actors/lang_provider/src/lib.rs | 1 + 8 files changed, 7 insertions(+), 8 deletions(-) rename api/locales/pl.yml => actors/lang_provider/Cargo.toml (100%) create mode 100644 actors/lang_provider/locales/en/cart.ftl create mode 100644 actors/lang_provider/locales/pl/cart.ftl create mode 100644 actors/lang_provider/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index f4ff1b9..3022ab9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ members = [ "actors/search_manager", "actors/token_manager", "actors/fs_manager", + "actors/lang_provider", # artifacts "db-seed", "api", diff --git a/actors/account_manager/Cargo.toml b/actors/account_manager/Cargo.toml index 5685bcf..1e6e2b3 100644 --- a/actors/account_manager/Cargo.toml +++ b/actors/account_manager/Cargo.toml @@ -14,8 +14,5 @@ actix-rt = { version = "2.7", features = [] } thiserror = { version = "1.0.31" } -uuid = { version = "0.8", features = ["serde"] } -chrono = { version = "0.4", features = ["serde"] } - log = { version = "0.4", features = [] } pretty_env_logger = { version = "0.4", features = [] } diff --git a/actors/cart_manager/Cargo.toml b/actors/cart_manager/Cargo.toml index df981c1..33f1e98 100644 --- a/actors/cart_manager/Cargo.toml +++ b/actors/cart_manager/Cargo.toml @@ -14,6 +14,8 @@ actix-rt = { version = "2.7", features = [] } thiserror = { version = "1.0.31" } +serde = { version = "1.0.137", features = ["derive"] } + uuid = { version = "0.8", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] } diff --git a/actors/cart_manager/src/lib.rs b/actors/cart_manager/src/lib.rs index 4383a87..7946b7d 100644 --- a/actors/cart_manager/src/lib.rs +++ b/actors/cart_manager/src/lib.rs @@ -4,6 +4,7 @@ use std::collections::HashSet; use database_manager::{query_db, Database}; use model::{PaymentMethod, ShoppingCartId}; +use serde::Serialize; #[macro_export] macro_rules! cart_async_handler { @@ -55,7 +56,8 @@ macro_rules! query_cart { }; } -#[derive(Debug, thiserror::Error)] +#[derive(Debug, thiserror::Error, Serialize)] +#[serde(rename_all = "kebab-case")] pub enum Error { #[error("System can't ensure shopping cart existence")] ShoppingCartFailed, @@ -69,10 +71,6 @@ pub enum Error { Db(#[from] database_manager::Error), #[error("Unable to update cart item")] UpdateFailed, - #[error("Failed to change quantity")] - ChangeQuantity, - #[error("Shopping cart item {0} does not exists")] - NotExists(model::ShoppingCartItemId), } pub type Result = std::result::Result; diff --git a/api/locales/pl.yml b/actors/lang_provider/Cargo.toml similarity index 100% rename from api/locales/pl.yml rename to actors/lang_provider/Cargo.toml diff --git a/actors/lang_provider/locales/en/cart.ftl b/actors/lang_provider/locales/en/cart.ftl new file mode 100644 index 0000000..e69de29 diff --git a/actors/lang_provider/locales/pl/cart.ftl b/actors/lang_provider/locales/pl/cart.ftl new file mode 100644 index 0000000..e69de29 diff --git a/actors/lang_provider/src/lib.rs b/actors/lang_provider/src/lib.rs new file mode 100644 index 0000000..8288a8e --- /dev/null +++ b/actors/lang_provider/src/lib.rs @@ -0,0 +1 @@ +pub struct LangProvider;