From 63a414a7bb82c823150cae7a4324fa178ca873ee Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Fri, 13 May 2022 19:42:43 +0300 Subject: [PATCH] db: rename lang codes --- api/src/domain/ingredient/types.rs | 6 ++-- api/src/repo/ingredient.rs | 16 ++++----- db/build.rs | 16 ++++----- db/data/ingredients/fruit.toml | 12 +++---- db/data/ingredients/liquid.toml | 4 +-- db/data/ingredients/product.toml | 12 +++---- db/data/ingredients/seasoning.toml | 8 ++--- db/data/ingredients/vegetable.toml | 8 ++--- db/data/recipes/pizza.toml | 2 +- db/src/data.rs | 56 +++++++++++++++--------------- 10 files changed, 70 insertions(+), 70 deletions(-) diff --git a/api/src/domain/ingredient/types.rs b/api/src/domain/ingredient/types.rs index 4cab0e4..5af904b 100644 --- a/api/src/domain/ingredient/types.rs +++ b/api/src/domain/ingredient/types.rs @@ -42,13 +42,13 @@ impl From<(&db::data::Ingredient, Lang)> for Ingredient { fn from((db, lang): (&db::data::Ingredient, Lang)) -> Self { let tr = &db.translates; let name = match lang { - Lang::Rus => tr.ru, - Lang::Eng => tr.en.unwrap_or(tr.ru), + Lang::Rus => tr.rus, + Lang::Eng => tr.eng.unwrap_or(tr.rus), }; Self { key: db.key.to_string(), - lang: if name == tr.ru { Lang::Rus } else { lang }, + lang: if name == tr.rus { Lang::Rus } else { lang }, name: name.to_string(), } } diff --git a/api/src/repo/ingredient.rs b/api/src/repo/ingredient.rs index 0dbb1fd..2684998 100644 --- a/api/src/repo/ingredient.rs +++ b/api/src/repo/ingredient.rs @@ -71,29 +71,29 @@ impl InMemoryIngredientRepo { db::data::Ingredient { key: "apple", translates: db::data::IngredientTranslate { - ru: "Яблоко", - en: Some("Apple"), + rus: "Яблоко", + eng: Some("Apple"), }, }, db::data::Ingredient { key: "orange", translates: db::data::IngredientTranslate { - ru: "Апельсин", - en: None, + rus: "Апельсин", + eng: None, }, }, db::data::Ingredient { key: "salt", translates: db::data::IngredientTranslate { - ru: "Соль", - en: Some("Salt"), + rus: "Соль", + eng: Some("Salt"), }, }, db::data::Ingredient { key: "sugar", translates: db::data::IngredientTranslate { - ru: "Сахар", - en: None, + rus: "Сахар", + eng: None, }, }, ], diff --git a/db/build.rs b/db/build.rs index 78364db..8311c4a 100644 --- a/db/build.rs +++ b/db/build.rs @@ -33,8 +33,8 @@ pub struct Ingredient { #[derive(Debug)] pub struct IngredientTranslate { - pub ru: &'static str, - pub en: Option<&'static str>, + pub rus: &'static str, + pub eng: Option<&'static str>, } #[derive(Debug)] @@ -61,8 +61,8 @@ pub enum RecipeIngredientMeasure { #[derive(Debug)] pub struct RecipeTranslates { - ru: RecipeTranslate, - en: Option, + rus: RecipeTranslate, + eng: Option, } #[derive(Debug)] @@ -93,8 +93,8 @@ pub struct Ingredient { #[allow(dead_code)] #[derive(Deserialize, Debug)] pub struct IngredientTranslate { - ru: String, - en: Option, + rus: String, + eng: Option, } #[derive(Deserialize)] @@ -150,8 +150,8 @@ pub enum RecipeIngredientMeasure { #[allow(dead_code)] #[derive(Deserialize, Debug)] pub struct RecipeTranslates { - ru: RecipeTranslate, - en: Option, + rus: RecipeTranslate, + eng: Option, } #[derive(Deserialize)] diff --git a/db/data/ingredients/fruit.toml b/db/data/ingredients/fruit.toml index 17d201c..9de2424 100644 --- a/db/data/ingredients/fruit.toml +++ b/db/data/ingredients/fruit.toml @@ -2,19 +2,19 @@ key = "apple" measure = "kg" [ingredients.translates] - ru = "яблоко" - en = "apple" + rus = "яблоко" + eng = "apple" [[ingredients]] key = "banana" measure = "kg" [ingredients.translates] - ru = "банан" - en = "banana" + rus = "банан" + eng = "banana" [[ingredients]] key = "orange" measure = "kg" [ingredients.translates] - ru = "апельсин" - en = "orange" + rus = "апельсин" + eng = "orange" diff --git a/db/data/ingredients/liquid.toml b/db/data/ingredients/liquid.toml index 505d54d..a3006cc 100644 --- a/db/data/ingredients/liquid.toml +++ b/db/data/ingredients/liquid.toml @@ -3,6 +3,6 @@ key = "water" measure = "ml" [ingredients.translates] - ru = "вода" - en = "water" + rus = "вода" + eng = "water" diff --git a/db/data/ingredients/product.toml b/db/data/ingredients/product.toml index db0c9ef..85966ef 100644 --- a/db/data/ingredients/product.toml +++ b/db/data/ingredients/product.toml @@ -2,20 +2,20 @@ key = "wheat_flour" measure = "g" [ingredients.translates] - ru = "пшеничная мука" - en = "wheat flour" + rus = "пшеничная мука" + eng = "wheat flour" [[ingredients]] key = "olive_oil" measure = "ml" [ingredients.translates] - ru = "оливковое масло" - en = "olive oil" + rus = "оливковое масло" + eng = "olive oil" [[ingredients]] key = "dry_yeast" measure = "g" [ingredients.translates] - ru = "сухие дрожжи" - en = "dry yeast" + rus = "сухие дрожжи" + eng = "dry yeast" diff --git a/db/data/ingredients/seasoning.toml b/db/data/ingredients/seasoning.toml index 026e9b3..2a30194 100644 --- a/db/data/ingredients/seasoning.toml +++ b/db/data/ingredients/seasoning.toml @@ -3,13 +3,13 @@ key = "salt" measure = "g" [ingredients.translates] - ru = "соль" - en = "salt" + rus = "соль" + eng = "salt" [[ingredients]] key = "sugar" measure = "g" [ingredients.translates] - ru = "сахар" - en = "sugar" + rus = "сахар" + eng = "sugar" diff --git a/db/data/ingredients/vegetable.toml b/db/data/ingredients/vegetable.toml index 7710009..64cd8ad 100644 --- a/db/data/ingredients/vegetable.toml +++ b/db/data/ingredients/vegetable.toml @@ -2,13 +2,13 @@ key = "carrot" measure = "kg" [ingredients.translates] - ru = "морковь" - en = "carrot" + rus = "морковь" + eng = "carrot" [[ingredients]] key = "potato" measure = "kg" [ingredients.translates] - ru = "картофель" - en = "potato" + rus = "картофель" + eng = "potato" diff --git a/db/data/recipes/pizza.toml b/db/data/recipes/pizza.toml index eb6138a..ab1f864 100644 --- a/db/data/recipes/pizza.toml +++ b/db/data/recipes/pizza.toml @@ -12,7 +12,7 @@ ingredients = [ steps = 7 -[recipes.translates.ru] +[recipes.translates.rus] name = "Тонкая хрустящая основа для пиццы" instructions = [ "Растворить дрожжи в воде, подогретой до температуры тела.", diff --git a/db/src/data.rs b/db/src/data.rs index 8f65001..0d2b040 100644 --- a/db/src/data.rs +++ b/db/src/data.rs @@ -8,8 +8,8 @@ pub struct Ingredient { #[derive(Debug)] pub struct IngredientTranslate { - pub ru: &'static str, - pub en: Option<&'static str>, + pub rus: &'static str, + pub eng: Option<&'static str>, } #[derive(Debug)] @@ -36,8 +36,8 @@ pub enum RecipeIngredientMeasure { #[derive(Debug)] pub struct RecipeTranslates { - ru: RecipeTranslate, - en: Option, + rus: RecipeTranslate, + eng: Option, } #[derive(Debug)] @@ -50,8 +50,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "water", translates: IngredientTranslate { - ru: "вода", - en: Some( + rus: "вода", + eng: Some( "water", ), }, @@ -59,8 +59,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "carrot", translates: IngredientTranslate { - ru: "морковь", - en: Some( + rus: "морковь", + eng: Some( "carrot", ), }, @@ -68,8 +68,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "potato", translates: IngredientTranslate { - ru: "картофель", - en: Some( + rus: "картофель", + eng: Some( "potato", ), }, @@ -77,8 +77,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "wheat_flour", translates: IngredientTranslate { - ru: "пшеничная мука", - en: Some( + rus: "пшеничная мука", + eng: Some( "wheat flour", ), }, @@ -86,8 +86,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "olive_oil", translates: IngredientTranslate { - ru: "оливковое масло", - en: Some( + rus: "оливковое масло", + eng: Some( "olive oil", ), }, @@ -95,8 +95,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "dry_yeast", translates: IngredientTranslate { - ru: "сухие дрожжи", - en: Some( + rus: "сухие дрожжи", + eng: Some( "dry yeast", ), }, @@ -104,8 +104,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "apple", translates: IngredientTranslate { - ru: "яблоко", - en: Some( + rus: "яблоко", + eng: Some( "apple", ), }, @@ -113,8 +113,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "banana", translates: IngredientTranslate { - ru: "банан", - en: Some( + rus: "банан", + eng: Some( "banana", ), }, @@ -122,8 +122,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "orange", translates: IngredientTranslate { - ru: "апельсин", - en: Some( + rus: "апельсин", + eng: Some( "orange", ), }, @@ -131,8 +131,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "salt", translates: IngredientTranslate { - ru: "соль", - en: Some( + rus: "соль", + eng: Some( "salt", ), }, @@ -140,8 +140,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [ Ingredient { key: "sugar", translates: IngredientTranslate { - ru: "сахар", - en: Some( + rus: "сахар", + eng: Some( "sugar", ), }, @@ -180,7 +180,7 @@ pub static ref RECIPES: [Recipe; 1] = [ }, ], translates: RecipeTranslates { - ru: RecipeTranslate { + rus: RecipeTranslate { name: "Тонкая хрустящая основа для пиццы", instructions: vec![ "Растворить дрожжи в воде, подогретой до температуры тела.", @@ -192,7 +192,7 @@ pub static ref RECIPES: [Recipe; 1] = [ "Теперь на основу можно выкладывать начинку на ваш вкус и запекать до момента, когда сыр растает.", ], }, - en: None, + eng: None, }, }, ];