manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

🧑‍💻 Improve handling of empty translations

Browse source
This commit is contained in:
Manuel Cillero 2023-10-21 21:11:25 +02:00
parent 71e6d4cf88
commit 861a9648e8
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pagetop/src/base/component/branding.rs
View file

@ -51,7 +51,6 @@ impl ComponentTrait for Branding {
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup { fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
let title = L10n::l("site_home").using(cx.langid()); let title = L10n::l("site_home").using(cx.langid());
let slogan = self.slogan().using(cx.langid()).unwrap_or_default();
PrepareMarkup::With(html! { PrepareMarkup::With(html! {
div id=[self.id()] { div id=[self.id()] {
div class="pt-branding__wrapper" { div class="pt-branding__wrapper" {
@ -64,7 +63,7 @@ impl ComponentTrait for Branding {
(self.app_name()) (self.app_name())
} }
} }
@if !slogan.is_empty() { @if let Some(slogan) = self.slogan().using(cx.langid()) {
div class="pt-branding__slogan" { div class="pt-branding__slogan" {
(slogan) (slogan)
} }

6
pagetop/src/base/component/form/input.rs
View file

@ -67,11 +67,9 @@ impl ComponentTrait for Input {
InputType::Url => "url", InputType::Url => "url",
}; };
let id = self.name().get().map(|name| concat_string!("edit-", name)); let id = self.name().get().map(|name| concat_string!("edit-", name));
let label = self.label().using(cx.langid()).unwrap_or_default();
let description = self.help_text().using(cx.langid()).unwrap_or_default();
PrepareMarkup::With(html! { PrepareMarkup::With(html! {
div class=[self.classes().get()] { div class=[self.classes().get()] {
@if !label.is_empty() { @if let Some(label) = self.label().using(cx.langid()) {
label class="form-label" for=[&id] { label class="form-label" for=[&id] {
(label) " " (label) " "
@if self.required().get().is_some() { @if self.required().get().is_some() {
@ -96,7 +94,7 @@ impl ComponentTrait for Input {
readonly=[self.readonly().get()] readonly=[self.readonly().get()]
required=[self.required().get()] required=[self.required().get()]
disabled=[self.disabled().get()] {} disabled=[self.disabled().get()] {}
@if !description.is_empty() { @if let Some(description) = self.help_text().using(cx.langid()) {
div class="form-text" { (description) } div class="form-text" { (description) }
} }
} }

7
pagetop/src/locale.rs
View file

@ -177,8 +177,13 @@ pub struct L10n {
impl L10n { impl L10n {
pub fn n(text: impl Into<String>) -> Self { pub fn n(text: impl Into<String>) -> Self {
let text = text.into();
L10n { L10n {
op: L10nOp::Text(text.into()), op: if text.trim().is_empty() {
L10nOp::None
} else {
L10nOp::Text(text)
},
..Default::default() ..Default::default()
} }
} }