pleshevskiy
/
recipes
1
0
Fork 0
Code Issues 2 Pull Requests 2 Projects Releases Activity

db: rename lang codes

This commit is contained in:
Dmitriy Pleshevskiy 2022-05-13 19:42:43 +03:00
parent 1bc6689104
commit 63a414a7bb
10 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/domain/ingredient/types.rs
View File

@ -42,13 +42,13 @@ impl From<(&db::data::Ingredient, Lang)> for Ingredient {
fn from((db, lang): (&db::data::Ingredient, Lang)) -> Self { fn from((db, lang): (&db::data::Ingredient, Lang)) -> Self {
let tr = &db.translates; let tr = &db.translates;
let name = match lang { let name = match lang {
Lang::Rus => tr.ru, Lang::Rus => tr.rus,
Lang::Eng => tr.en.unwrap_or(tr.ru), Lang::Eng => tr.eng.unwrap_or(tr.rus),
}; };
Self { Self {
key: db.key.to_string(), 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(), name: name.to_string(),
} }
} }

16
api/src/repo/ingredient.rs
View File

@ -71,29 +71,29 @@ impl InMemoryIngredientRepo {
db::data::Ingredient { db::data::Ingredient {
key: "apple", key: "apple",
translates: db::data::IngredientTranslate { translates: db::data::IngredientTranslate {
ru: "Яблоко", rus: "Яблоко",
en: Some("Apple"), eng: Some("Apple"),
}, },
}, },
db::data::Ingredient { db::data::Ingredient {
key: "orange", key: "orange",
translates: db::data::IngredientTranslate { translates: db::data::IngredientTranslate {
ru: "Апельсин", rus: "Апельсин",
en: None, eng: None,
}, },
}, },
db::data::Ingredient { db::data::Ingredient {
key: "salt", key: "salt",
translates: db::data::IngredientTranslate { translates: db::data::IngredientTranslate {
ru: "Соль", rus: "Соль",
en: Some("Salt"), eng: Some("Salt"),
}, },
}, },
db::data::Ingredient { db::data::Ingredient {
key: "sugar", key: "sugar",
translates: db::data::IngredientTranslate { translates: db::data::IngredientTranslate {
ru: "Сахар", rus: "Сахар",
en: None, eng: None,
}, },
}, },
], ],

16
db/build.rs
View File

@ -33,8 +33,8 @@ pub struct Ingredient {
#[derive(Debug)] #[derive(Debug)]
pub struct IngredientTranslate { pub struct IngredientTranslate {
pub ru: &'static str, pub rus: &'static str,
pub en: Option<&'static str>, pub eng: Option<&'static str>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -61,8 +61,8 @@ pub enum RecipeIngredientMeasure {
#[derive(Debug)] #[derive(Debug)]
pub struct RecipeTranslates { pub struct RecipeTranslates {
ru: RecipeTranslate, rus: RecipeTranslate,
en: Option<RecipeTranslate>, eng: Option<RecipeTranslate>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -93,8 +93,8 @@ pub struct Ingredient {
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub struct IngredientTranslate { pub struct IngredientTranslate {
ru: String, rus: String,
en: Option<String>, eng: Option<String>,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
@ -150,8 +150,8 @@ pub enum RecipeIngredientMeasure {
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub struct RecipeTranslates { pub struct RecipeTranslates {
ru: RecipeTranslate, rus: RecipeTranslate,
en: Option<RecipeTranslate>, eng: Option<RecipeTranslate>,
} }
#[derive(Deserialize)] #[derive(Deserialize)]

12
db/data/ingredients/fruit.toml
View File

@ -2,19 +2,19 @@
key = "apple" key = "apple"
measure = "kg" measure = "kg"
[ingredients.translates] [ingredients.translates]
ru = "яблоко" rus = "яблоко"
en = "apple" eng = "apple"
[[ingredients]] [[ingredients]]
key = "banana" key = "banana"
measure = "kg" measure = "kg"
[ingredients.translates] [ingredients.translates]
ru = "банан" rus = "банан"
en = "banana" eng = "banana"
[[ingredients]] [[ingredients]]
key = "orange" key = "orange"
measure = "kg" measure = "kg"
[ingredients.translates] [ingredients.translates]
ru = "апельсин" rus = "апельсин"
en = "orange" eng = "orange"

4
db/data/ingredients/liquid.toml
View File

@ -3,6 +3,6 @@
key = "water" key = "water"
measure = "ml" measure = "ml"
[ingredients.translates] [ingredients.translates]
ru = "вода" rus = "вода"
en = "water" eng = "water"

12
db/data/ingredients/product.toml
View File

@ -2,20 +2,20 @@
key = "wheat_flour" key = "wheat_flour"
measure = "g" measure = "g"
[ingredients.translates] [ingredients.translates]
ru = "пшеничная мука" rus = "пшеничная мука"
en = "wheat flour" eng = "wheat flour"
[[ingredients]] [[ingredients]]
key = "olive_oil" key = "olive_oil"
measure = "ml" measure = "ml"
[ingredients.translates] [ingredients.translates]
ru = "оливковое масло" rus = "оливковое масло"
en = "olive oil" eng = "olive oil"
[[ingredients]] [[ingredients]]
key = "dry_yeast" key = "dry_yeast"
measure = "g" measure = "g"
[ingredients.translates] [ingredients.translates]
ru = "сухие дрожжи" rus = "сухие дрожжи"
en = "dry yeast" eng = "dry yeast"

8
db/data/ingredients/seasoning.toml
View File

@ -3,13 +3,13 @@
key = "salt" key = "salt"
measure = "g" measure = "g"
[ingredients.translates] [ingredients.translates]
ru = "соль" rus = "соль"
en = "salt" eng = "salt"
[[ingredients]] [[ingredients]]
key = "sugar" key = "sugar"
measure = "g" measure = "g"
[ingredients.translates] [ingredients.translates]
ru = "сахар" rus = "сахар"
en = "sugar" eng = "sugar"

8
db/data/ingredients/vegetable.toml
View File

@ -2,13 +2,13 @@
key = "carrot" key = "carrot"
measure = "kg" measure = "kg"
[ingredients.translates] [ingredients.translates]
ru = "морковь" rus = "морковь"
en = "carrot" eng = "carrot"
[[ingredients]] [[ingredients]]
key = "potato" key = "potato"
measure = "kg" measure = "kg"
[ingredients.translates] [ingredients.translates]
ru = "картофель" rus = "картофель"
en = "potato" eng = "potato"

2
db/data/recipes/pizza.toml
View File

@ -12,7 +12,7 @@ ingredients = [
steps = 7 steps = 7
[recipes.translates.ru] [recipes.translates.rus]
name = "Тонкая хрустящая основа для пиццы" name = "Тонкая хрустящая основа для пиццы"
instructions = [ instructions = [
"Растворить дрожжи в воде, подогретой до температуры тела.", "Растворить дрожжи в воде, подогретой до температуры тела.",

56
db/src/data.rs
View File

@ -8,8 +8,8 @@ pub struct Ingredient {
#[derive(Debug)] #[derive(Debug)]
pub struct IngredientTranslate { pub struct IngredientTranslate {
pub ru: &'static str, pub rus: &'static str,
pub en: Option<&'static str>, pub eng: Option<&'static str>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -36,8 +36,8 @@ pub enum RecipeIngredientMeasure {
#[derive(Debug)] #[derive(Debug)]
pub struct RecipeTranslates { pub struct RecipeTranslates {
ru: RecipeTranslate, rus: RecipeTranslate,
en: Option<RecipeTranslate>, eng: Option<RecipeTranslate>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -50,8 +50,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "water", key: "water",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "вода", rus: "вода",
en: Some( eng: Some(
"water", "water",
), ),
}, },
@ -59,8 +59,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "carrot", key: "carrot",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "морковь", rus: "морковь",
en: Some( eng: Some(
"carrot", "carrot",
), ),
}, },
@ -68,8 +68,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "potato", key: "potato",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "картофель", rus: "картофель",
en: Some( eng: Some(
"potato", "potato",
), ),
}, },
@ -77,8 +77,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "wheat_flour", key: "wheat_flour",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "пшеничная мука", rus: "пшеничная мука",
en: Some( eng: Some(
"wheat flour", "wheat flour",
), ),
}, },
@ -86,8 +86,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "olive_oil", key: "olive_oil",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "оливковое масло", rus: "оливковое масло",
en: Some( eng: Some(
"olive oil", "olive oil",
), ),
}, },
@ -95,8 +95,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "dry_yeast", key: "dry_yeast",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "сухие дрожжи", rus: "сухие дрожжи",
en: Some( eng: Some(
"dry yeast", "dry yeast",
), ),
}, },
@ -104,8 +104,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "apple", key: "apple",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "яблоко", rus: "яблоко",
en: Some( eng: Some(
"apple", "apple",
), ),
}, },
@ -113,8 +113,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "banana", key: "banana",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "банан", rus: "банан",
en: Some( eng: Some(
"banana", "banana",
), ),
}, },
@ -122,8 +122,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "orange", key: "orange",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "апельсин", rus: "апельсин",
en: Some( eng: Some(
"orange", "orange",
), ),
}, },
@ -131,8 +131,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "salt", key: "salt",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "соль", rus: "соль",
en: Some( eng: Some(
"salt", "salt",
), ),
}, },
@ -140,8 +140,8 @@ pub const INGREDIENTS: [Ingredient; 11] = [
Ingredient { Ingredient {
key: "sugar", key: "sugar",
translates: IngredientTranslate { translates: IngredientTranslate {
ru: "сахар", rus: "сахар",
en: Some( eng: Some(
"sugar", "sugar",
), ),
}, },
@ -180,7 +180,7 @@ pub static ref RECIPES: [Recipe; 1] = [
}, },
], ],
translates: RecipeTranslates { translates: RecipeTranslates {
ru: RecipeTranslate { rus: RecipeTranslate {
name: "Тонкая хрустящая основа для пиццы", name: "Тонкая хрустящая основа для пиццы",
instructions: vec![ instructions: vec![
"Растворить дрожжи в воде, подогретой до температуры тела.", "Растворить дрожжи в воде, подогретой до температуры тела.",
@ -192,7 +192,7 @@ pub static ref RECIPES: [Recipe; 1] = [
"Теперь на основу можно выкладывать начинку на ваш вкус и запекать до момента, когда сыр растает.", "Теперь на основу можно выкладывать начинку на ваш вкус и запекать до момента, когда сыр растает.",
], ],
}, },
en: None, eng: None,
}, },
}, },
]; ];