From 2907aa8ba720bdd58b359b8123262bdc4188a5af Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Fri, 16 Feb 2024 09:40:44 +0100 Subject: [PATCH] Added czech translations. UI tweak on booking form. --- assets/vendor/css/theme-default.css | 2 -- src/backend/data.rs | 11 ++++++++++ src/locales/catalogues.rs | 34 ++++++++++++++++++++++++++++- src/pages/change_pwd.rs | 7 +++--- src/pages/company_edit.rs | 21 +++++++++--------- src/pages/hours_edit.rs | 3 ++- src/pages/profile_edit.rs | 9 ++++---- src/pages/property_delete.rs | 3 ++- src/pages/property_edit.rs | 25 +++++++++++---------- src/pages/user_delete.rs | 3 ++- src/pages/user_edit.rs | 13 ++++++----- 11 files changed, 90 insertions(+), 41 deletions(-) diff --git a/assets/vendor/css/theme-default.css b/assets/vendor/css/theme-default.css index 1703f34..2731dd6 100644 --- a/assets/vendor/css/theme-default.css +++ b/assets/vendor/css/theme-default.css @@ -249,8 +249,6 @@ button.list-group-item-primary.active { transform: translateY(-1px); } .btn-check:focus + .btn-outline-primary, .btn-outline-primary:focus { - color: #fff; - background-color: #5f61e6; border-color: #5f61e6; box-shadow: none; transform: translateY(0); diff --git a/src/backend/data.rs b/src/backend/data.rs index 8d905ef..729076a 100644 --- a/src/backend/data.rs +++ b/src/backend/data.rs @@ -303,6 +303,17 @@ pub enum SlotType { Day } +impl Display for SlotType { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + write!(f, "{}", match self { + SlotType::Quarter => {"Quarter an hour"} + SlotType::Half => {"Half an hour"} + SlotType::Hour => {"Hour"} + SlotType::Day => {"Day"} + }) + } +} + fn def_true() -> bool { true } diff --git a/src/locales/catalogues.rs b/src/locales/catalogues.rs index 2ee2b4e..09dab1f 100644 --- a/src/locales/catalogues.rs +++ b/src/locales/catalogues.rs @@ -99,7 +99,39 @@ lazy_static! { ("Approved", "Potvrzená"), ("Canceled", "Zrušená"), ("Booking detail", "Detail rezervace"), - ("State", "Stav") + ("State", "Stav"), + ("Date can't be in past", "Datum nesmí být v minulosti"), + ("Enter your username", "Zadejte své uživatelské jméno"), + ("Hours must be in HH:MM - HH:MM format", "Hodiny musí být zadány ve tvaru HH:MM - HH:MM"), + ("Edit profile", "Upravit profil"), + ("Get emails", "Dostávat e-maily"), + ("Enter username", "Zadejte uživatelské jméno"), + ("Verify password", "Ověření hesla"), + ("Enter email", "Zadejte e-mail"), + ("Old password", "Staré heslo"), + ("New password", "Nové heslo"), + ("Enter new password", "Zadejte nové heslo"), + ("Passwords doesn't match", "Hesla se neshodují"), + ("Edit company", "Upravit organizaci"), + ("Enter Name", "Zadejte jméno"), + ("Enter Street", "Zadejte ulici"), + ("Enter House number", "Číslo domu"), + ("Enter ZIP code", "Zadejte PSČ"), + ("Enter City", "Zadejte město"), + ("Street", "Ulice"), + ("House number", "Číslo domu"), + ("ZIP code", "PSČ"), + ("City", "Město"), + ("Edit property", "Upravit předmět"), + ("Quarter an hour", "Čtvrthodna"), + ("Half an hour", "Půlhodina"), + ("Hour", "Hodina"), + ("Day", "Den"), + ("Time slot", "Časový slot"), + ("Active", "Aktivní"), + ("Are you sure you want to delete property ", "Opravdu chcete smazat předmět "), + ("Delete property", "Smazat předmět"), + ("Are you sure you want to delete user ", "Opravdu chcete smazat uživatele ") ])), ("sk", HashMap::from( [ ("Dashboard", "Prehlad"), diff --git a/src/pages/change_pwd.rs b/src/pages/change_pwd.rs index e108f5c..029fdfb 100644 --- a/src/pages/change_pwd.rs +++ b/src/pages/change_pwd.rs @@ -3,6 +3,7 @@ use crate::backend::data::User; use crate::backend::user::{ChangePwd, get_user}; use crate::components::data_form::DataForm; use crate::components::modal_box::DialogOpener; +use crate::locales::trl; #[component] pub fn change_password(user: ReadSignal, opener: DialogOpener) -> impl IntoView { @@ -24,7 +25,7 @@ pub fn change_password(user: ReadSignal, opener: DialogOpener) -> impl Int Err(_) => "" }}) }}> - + , opener: DialogOpener) -> impl Int
- + , opener: DialogOpener) -> impl Int
- +
- + @@ -29,23 +30,23 @@ pub fn CompanyEdit(
- +
- + @@ -53,23 +54,23 @@ pub fn CompanyEdit(
- +
- + diff --git a/src/pages/hours_edit.rs b/src/pages/hours_edit.rs index d567a60..c4d4af6 100644 --- a/src/pages/hours_edit.rs +++ b/src/pages/hours_edit.rs @@ -3,6 +3,7 @@ use crate::backend::data::WeekHours; use crate::backend::opening_hours::UpdateHours; use crate::components::data_form::DataForm; use crate::components::modal_box::DialogOpener; +use crate::locales::trl; #[component] pub fn EditHours(opener: DialogOpener, hours: ReadSignal) -> impl IntoView { @@ -13,7 +14,7 @@ pub fn EditHours(opener: DialogOpener, hours: ReadSignal) -> impl Int
- + , opener: DialogOpener) -> impl IntoView { @@ -14,12 +15,12 @@ pub fn ProfileEdit(user: ReadSignal, opener: DialogOpener) -> impl IntoVie
- + @@ -32,7 +33,7 @@ pub fn ProfileEdit(user: ReadSignal, opener: DialogOpener) -> impl IntoVie type="text" id="name" class="form-control" - placeholder="Enter email" + placeholder={trl("Enter email")} prop:value={move || user.get().email.unwrap_or("".to_string())} name="user[email]" /> @@ -48,7 +49,7 @@ pub fn ProfileEdit(user: ReadSignal, opener: DialogOpener) -> impl IntoVie prop:checked={move || user.get().get_emails} name="user[get_emails]" /> - +
}> diff --git a/src/pages/property_delete.rs b/src/pages/property_delete.rs index 0ffafac..b7d0ac3 100644 --- a/src/pages/property_delete.rs +++ b/src/pages/property_delete.rs @@ -3,6 +3,7 @@ use crate::backend::data::ResProperty; use crate::backend::property::DeleteProperty; use crate::components::data_form::QuestionDialog; use crate::components::modal_box::DialogOpener; +use crate::locales::trl; #[component] pub fn property_delete(property: ReadSignal, opener: DialogOpener) -> impl IntoView { @@ -11,7 +12,7 @@ pub fn property_delete(property: ReadSignal, opener: DialogOpener) view! { -
"Are you sure you want to delete property "{move || property.get().name}"?"
+
{trl("Are you sure you want to delete property ")}{move || property.get().name}"?"
 } } \ No newline at end of file diff --git a/src/pages/property_edit.rs b/src/pages/property_edit.rs index a384d9a..1083619 100644 --- a/src/pages/property_edit.rs +++ b/src/pages/property_edit.rs @@ -3,6 +3,7 @@ use crate::backend::data::{ResProperty, SlotType}; use crate::backend::property::{CreateProperty, EditProperty}; use crate::components::data_form::DataForm; use crate::components::modal_box::DialogOpener; +use crate::locales::trl; #[component] fn form_inner(property: ReadSignal) -> impl IntoView { @@ -11,12 +12,12 @@ fn form_inner(property: ReadSignal) -> impl IntoView {
- + @@ -24,12 +25,12 @@ fn form_inner(property: ReadSignal) -> impl IntoView {
- + @@ -37,7 +38,7 @@ fn form_inner(property: ReadSignal) -> impl IntoView {
- + ) -> impl IntoView {
- +
@@ -74,7 +75,7 @@ fn form_inner(property: ReadSignal) -> impl IntoView { on:change=move |ev| active_str.set(if event_target_checked(&ev) { "true".to_string() } else { "false".to_string() }) /> - +
diff --git a/src/pages/user_delete.rs b/src/pages/user_delete.rs index 78099a1..5110d29 100644 --- a/src/pages/user_delete.rs +++ b/src/pages/user_delete.rs @@ -3,6 +3,7 @@ use crate::backend::data::User; use crate::backend::user::DeleteUser; use crate::components::data_form::QuestionDialog; use crate::components::modal_box::DialogOpener; +use crate::locales::trl; #[component] pub fn user_delete(user: ReadSignal, opener: DialogOpener) -> impl IntoView { @@ -11,7 +12,7 @@ pub fn user_delete(user: ReadSignal, opener: DialogOpener) -> impl IntoVie view! { -
"Are you sure you want to delete user "{move || user.get().full_name}"?"
+
{trl("Are you sure you want to delete user ")}{move || user.get().full_name}"?"
 } } \ No newline at end of file diff --git a/src/pages/user_edit.rs b/src/pages/user_edit.rs index 4eae4fd..34d640a 100644 --- a/src/pages/user_edit.rs +++ b/src/pages/user_edit.rs @@ -2,6 +2,7 @@ use leptos::*; use crate::backend::user::CreateUser; use crate::components::data_form::DataForm; use crate::components::modal_box::DialogOpener; +use crate::locales::trl; #[component] pub fn user_edit(opener: DialogOpener) -> impl IntoView { @@ -11,12 +12,12 @@ pub fn user_edit(opener: DialogOpener) -> impl IntoView { //
- + @@ -24,7 +25,7 @@ pub fn user_edit(opener: DialogOpener) -> impl IntoView {
- + impl IntoView {
- + impl IntoView {
- + impl IntoView { prop:checked={move || opener.not_checked()} name="user[get_emails]" /> - +