From 9716f503bc58af6eba278113f2aeb58ef96fbb5e Mon Sep 17 00:00:00 2001 From: feco Date: Sun, 22 Nov 2026 10:14:15 +0000 Subject: [PATCH] Hungarian error messages; visible focus on input fields - The browser's own form checks (required, minLength, e-mail format) show Hungarian text on every page (ValidationMessages in the root layout). - User-facing backend errors are Hungarian: e-mail/password login, password length, links, invitations, sharing, questions, limits. Google/Apple token failures log the reason and tell the user to retry. - errorText covers not_found, horoscope_unavailable and internal errors. - Input fields: lighter background and gold caret on focus, the example text steps aside, so a click visibly lands in the field. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL --- services/backend/src/auth.rs | 4 +- services/backend/src/error.rs | 4 +- services/backend/src/oidc.rs | 23 +++-- services/backend/src/routes/account.rs | 4 +- services/backend/src/routes/auth.rs | 8 +- services/backend/src/routes/calculator.rs | 2 +- services/backend/src/routes/charts.rs | 4 +- services/backend/src/routes/forecasts.rs | 2 +- services/backend/src/routes/questions.rs | 4 +- services/backend/src/routes/shares.rs | 2 +- services/backend/src/routes/synastries.rs | 16 ++-- services/frontend/src/app/globals.css | 5 +- services/frontend/src/app/layout.tsx | 2 + .../src/components/ValidationMessages.tsx | 83 +++++++++++++++++++ services/frontend/src/lib/api.ts | 7 ++ 15 files changed, 139 insertions(+), 31 deletions(-) create mode 100644 services/frontend/src/components/ValidationMessages.tsx diff --git a/services/backend/src/auth.rs b/services/backend/src/auth.rs index 024f59a..7b68c2f 100644 --- a/services/backend/src/auth.rs +++ b/services/backend/src/auth.rs @@ -147,10 +147,10 @@ pub fn removal_cookie(config: &Config) -> Cookie<'static> { pub fn validate_password(password: &str) -> Result<(), ApiError> { let len = password.chars().count(); if len < MIN_PASSWORD_LEN { - return Err(ApiError::BadRequest(format!("the password must be at least {MIN_PASSWORD_LEN} characters long"))); + return Err(ApiError::BadRequest(format!("A jelszó legalább {MIN_PASSWORD_LEN} karakter legyen."))); } if len > MAX_PASSWORD_LEN { - return Err(ApiError::BadRequest(format!("the password must be at most {MAX_PASSWORD_LEN} characters long"))); + return Err(ApiError::BadRequest(format!("A jelszó legfeljebb {MAX_PASSWORD_LEN} karakter lehet."))); } Ok(()) } diff --git a/services/backend/src/error.rs b/services/backend/src/error.rs index 9137c14..ddf66f1 100644 --- a/services/backend/src/error.rs +++ b/services/backend/src/error.rs @@ -25,11 +25,11 @@ pub enum ApiError { Conflict { code: &'static str, message: String }, #[error("{0}")] Gone(String), - #[error("the link is invalid or has expired")] + #[error("Ez a link érvénytelen vagy lejárt.")] InvalidToken, #[error("no {unit} analysis left (balance {balance})")] InsufficientCredits { unit: &'static str, balance: i64 }, - #[error("too many attempts; try again later")] + #[error("Túl sok próbálkozás. Próbáld újra később.")] TooManyRequests, /// A usage limit; the message is shown to the user as is. #[error("{message}")] diff --git a/services/backend/src/oidc.rs b/services/backend/src/oidc.rs index 3124641..f639be3 100644 --- a/services/backend/src/oidc.rs +++ b/services/backend/src/oidc.rs @@ -18,6 +18,11 @@ const GOOGLE_ISSUERS: &[&str] = &["accounts.google.com", "https://accounts.googl const APPLE_ISSUERS: &[&str] = &["https://appleid.apple.com"]; const JWKS_MAX_AGE: Duration = Duration::from_secs(3600); +/// What the user sees when a token is rejected; the reason goes to the log. +fn failed(provider: &str) -> ApiError { + ApiError::InvalidCredentials(format!("Nem sikerült a belépés {provider}-fiókkal. Próbáld újra.")) +} + #[derive(Debug, Deserialize)] pub struct IdClaims { /// Stable account id at the provider. @@ -111,7 +116,8 @@ impl IdTokenVerifier { let found = keys.iter().find(|k| k.kid == kid).cloned(); *self.cache.write().await = Some((Instant::now(), keys)); found.ok_or_else(|| { - ApiError::InvalidCredentials(format!("the {} token is signed with an unknown key", self.provider)) + tracing::warn!(provider = self.provider, "id token signed with an unknown key"); + failed(self.provider) }) } @@ -120,14 +126,19 @@ impl IdTokenVerifier { if !self.enabled() { return Err(ApiError::Forbidden(format!("{provider} login is not configured"))); } - let invalid = - |e: jsonwebtoken::errors::Error| ApiError::InvalidCredentials(format!("invalid {provider} token: {e}")); + let invalid = |e: jsonwebtoken::errors::Error| { + tracing::warn!(provider, error = %e, "invalid id token"); + failed(provider) + }; let header = decode_header(id_token).map_err(invalid)?; if header.alg != Algorithm::RS256 { - return Err(ApiError::InvalidCredentials(format!("invalid {provider} token: unexpected algorithm"))); + tracing::warn!(provider, alg = ?header.alg, "id token with an unexpected algorithm"); + return Err(failed(provider)); } - let kid = - header.kid.ok_or_else(|| ApiError::InvalidCredentials(format!("invalid {provider} token: no key id")))?; + let kid = header.kid.ok_or_else(|| { + tracing::warn!(provider, "id token without a key id"); + failed(provider) + })?; let jwk = self.key(&kid).await?; let key = DecodingKey::from_rsa_components(&jwk.n, &jwk.e).map_err(invalid)?; let mut validation = Validation::new(Algorithm::RS256); diff --git a/services/backend/src/routes/account.rs b/services/backend/src/routes/account.rs index b844188..ca8673f 100644 --- a/services/backend/src/routes/account.rs +++ b/services/backend/src/routes/account.rs @@ -113,9 +113,9 @@ pub async fn change_password( .await?; if let Some((hash,)) = existing { let current = - req.current_password.ok_or_else(|| ApiError::BadRequest("current_password is required".into()))?; + req.current_password.ok_or_else(|| ApiError::BadRequest("Add meg a jelenlegi jelszavadat.".into()))?; if !verify_password(current, hash).await? { - return Err(ApiError::InvalidCredentials("the current password is wrong".into())); + return Err(ApiError::InvalidCredentials("A jelenlegi jelszó hibás.".into())); } } let hash = hash_password(req.new_password).await?; diff --git a/services/backend/src/routes/auth.rs b/services/backend/src/routes/auth.rs index 7bb6a9c..f7e9a9b 100644 --- a/services/backend/src/routes/auth.rs +++ b/services/backend/src/routes/auth.rs @@ -45,7 +45,7 @@ pub fn normalize_email(email: &str) -> Result { !local.is_empty() && domain.contains('.') && !domain.starts_with('.') && !domain.ends_with('.') }) && !email.chars().any(char::is_whitespace); - if valid { Ok(email) } else { Err(ApiError::BadRequest("invalid e-mail address".into())) } + if valid { Ok(email) } else { Err(ApiError::BadRequest("Érvénytelen e-mail-cím.".into())) } } pub fn validate_locale(state: &AppState, locale: Option<&str>) -> Result { @@ -288,7 +288,7 @@ pub async fn login( WithRejection(Json(req), _): Body, ) -> ApiResult { password_login_enabled(&state)?; - let invalid = || ApiError::InvalidCredentials("wrong e-mail address or password".into()); + let invalid = || ApiError::InvalidCredentials("Hibás e-mail-cím vagy jelszó.".into()); let email = normalize_email(&req.email).map_err(|_| invalid())?; state.login_limiter.check(&email)?; @@ -405,7 +405,9 @@ async fn social_login( let email = match (claims.email.as_deref(), claims.email_verified) { (Some(e), true) => normalize_email(e)?, _ => { - return Err(ApiError::InvalidCredentials(format!("the {provider} account has no verified e-mail address"))); + return Err(ApiError::InvalidCredentials(format!( + "A {provider}-fiókodhoz nem tartozik megerősített e-mail-cím." + ))); } }; diff --git a/services/backend/src/routes/calculator.rs b/services/backend/src/routes/calculator.rs index a735473..df6c602 100644 --- a/services/backend/src/routes/calculator.rs +++ b/services/backend/src/routes/calculator.rs @@ -42,7 +42,7 @@ pub async fn places( ) -> ApiResult> { let q = query.q.trim(); if !valid_country(&query.country) || q.chars().count() < 2 || q.chars().count() > 80 { - return Err(ApiError::BadRequest("a country code and 2 to 80 characters of a place name are needed".into())); + return Err(ApiError::BadRequest("Válassz országot, és írj be 2–80 karaktert a település nevéből.".into())); } state.places_limiter.hit(&visitor(&headers))?; Ok(Json(state.horoscope.places(&query.country, q, query.limit.unwrap_or(8).min(10)).await?)) diff --git a/services/backend/src/routes/charts.rs b/services/backend/src/routes/charts.rs index 056c30b..8507e88 100644 --- a/services/backend/src/routes/charts.rs +++ b/services/backend/src/routes/charts.rs @@ -97,7 +97,7 @@ pub async fn primary_chart(db: &PgPool, owner: Uuid) -> Result, fn clean_label(label: &str) -> Result { let label: String = label.trim().chars().take(100).collect(); - if label.is_empty() { Err(ApiError::BadRequest("label must not be empty".into())) } else { Ok(label) } + if label.is_empty() { Err(ApiError::BadRequest("A név nem lehet üres.".into())) } else { Ok(label) } } pub async fn list(State(state): St, auth: AuthUser) -> ApiResult> { @@ -195,7 +195,7 @@ pub async fn create( if count >= state.config.max_charts_per_user { return Err(ApiError::conflict( "chart_limit_reached", - format!("at most {} charts can be saved", state.config.max_charts_per_user), + format!("Legfeljebb {} képletet lehet menteni.", state.config.max_charts_per_user), )); } let free = state.config.free_person_slots; diff --git a/services/backend/src/routes/forecasts.rs b/services/backend/src/routes/forecasts.rs index 2d12f2c..063fb9f 100644 --- a/services/backend/src/routes/forecasts.rs +++ b/services/backend/src/routes/forecasts.rs @@ -221,7 +221,7 @@ pub async fn create( if count >= MAX_PER_CHART && !is_admin(&auth) { return Err(ApiError::conflict( "forecast_limit_reached", - format!("at most {MAX_PER_CHART} forecasts can be saved for a chart"), + format!("Egy képlethez legfeljebb {MAX_PER_CHART} előrejelzés menthető."), )); } diff --git a/services/backend/src/routes/questions.rs b/services/backend/src/routes/questions.rs index 1bdbc5e..e20e257 100644 --- a/services/backend/src/routes/questions.rs +++ b/services/backend/src/routes/questions.rs @@ -115,7 +115,7 @@ pub async fn ask( return Err(ApiError::NotFound("analysis")); } if !ASKABLE.contains(&analysis.kind.as_str()) { - return Err(ApiError::BadRequest("questions can be asked about a detailed analysis or a forecast".into())); + return Err(ApiError::BadRequest("Kérdést részletes elemzésről vagy előrejelzésről lehet feltenni.".into())); } if analysis.status != "done" { return Err(ApiError::conflict("analysis_not_ready", "Az elemzés még nem készült el.")); @@ -123,7 +123,7 @@ pub async fn ask( let question = req.question.trim().replace("\r\n", "\n"); let length = question.chars().count(); if !(3..=QUESTION_MAX_CHARS).contains(&length) { - return Err(ApiError::BadRequest(format!("the question must be 3 to {QUESTION_MAX_CHARS} characters long"))); + return Err(ApiError::BadRequest(format!("A kérdés 3–{QUESTION_MAX_CHARS} karakter hosszú lehet."))); } let (open, total): (i64, i64) = sqlx::query_as( "SELECT count(*) FILTER (WHERE status IN ('pending', 'running')), count(*) FROM questions WHERE analysis_id = $1", diff --git a/services/backend/src/routes/shares.rs b/services/backend/src/routes/shares.rs index 9bf91b1..8e00436 100644 --- a/services/backend/src/routes/shares.rs +++ b/services/backend/src/routes/shares.rs @@ -155,7 +155,7 @@ pub async fn create( return Err(ApiError::NotFound("analysis")); } if analysis.status != "done" { - return Err(ApiError::conflict("analysis_not_ready", "only finished analyses can be shared")); + return Err(ApiError::conflict("analysis_not_ready", "Csak elkészült elemzést lehet megosztani.")); } (None, None, Some(req.target_id), "analysis") } diff --git a/services/backend/src/routes/synastries.rs b/services/backend/src/routes/synastries.rs index 9f39d15..b095037 100644 --- a/services/backend/src/routes/synastries.rs +++ b/services/backend/src/routes/synastries.rs @@ -210,7 +210,7 @@ pub async fn create( WithRejection(Json(req), _): Body, ) -> ApiResult<(StatusCode, Json)> { if req.chart1_id == req.chart2_id { - return Err(ApiError::BadRequest("a chart cannot be compared with itself".into())); + return Err(ApiError::BadRequest("Egy képletet önmagával nem lehet összevetni.".into())); } let chart1 = owned_chart(&state.db, req.chart1_id, auth.id()).await?; let chart2 = owned_chart(&state.db, req.chart2_id, auth.id()).await?; @@ -249,9 +249,9 @@ pub struct CreateInvite { async fn chart_or_primary(db: &PgPool, chart_id: Option, user: Uuid) -> Result { match chart_id { Some(id) => owned_chart(db, id, user).await, - None => primary_chart(db, user).await?.ok_or_else(|| { - ApiError::conflict("primary_chart_required", "create your own chart first (is_primary: true)") - }), + None => primary_chart(db, user) + .await? + .ok_or_else(|| ApiError::conflict("primary_chart_required", "Előbb add meg a saját születési adataidat.")), } } @@ -459,12 +459,12 @@ pub async fn accept_invite( ) -> ApiResult<(StatusCode, Json)> { let invite = invite_by_token(&state.db, &req.token).await?; match invite_status(invite.accepted_at, invite.expires_at) { - "accepted" => return Err(ApiError::Gone("this invitation has already been accepted".into())), - "expired" => return Err(ApiError::Gone("this invitation has expired".into())), + "accepted" => return Err(ApiError::Gone("Ezt a meghívót már elfogadták.".into())), + "expired" => return Err(ApiError::Gone("Ez a meghívó lejárt.".into())), _ => {} } if invite.inviter_id == auth.id() { - return Err(ApiError::conflict("own_invitation", "you cannot accept your own invitation")); + return Err(ApiError::conflict("own_invitation", "A saját meghívódat nem fogadhatod el.")); } let my_chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?; let inviter_chart = @@ -489,7 +489,7 @@ pub async fn accept_invite( if created { sqlx::query("DELETE FROM synastries WHERE id = $1").bind(row.id).execute(&state.db).await?; } - return Err(ApiError::Gone("this invitation has already been accepted".into())); + return Err(ApiError::Gone("Ezt a meghívót már elfogadták.".into())); } let inviter: Option = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE id = $1")) .bind(invite.inviter_id) diff --git a/services/frontend/src/app/globals.css b/services/frontend/src/app/globals.css index e93726b..996bb5d 100644 --- a/services/frontend/src/app/globals.css +++ b/services/frontend/src/app/globals.css @@ -132,7 +132,10 @@ textarea.inp { padding: 12px 14px; line-height: 1.55; min-height: 96px; resize: /* A button beside input fields is as tall as they are */ .row > .btn:not(.btn-sm), .redeem-row > .btn { min-height: 48px; } .inp::placeholder { color: #8a93ab; } -.inp:focus { outline: none; border-color: var(--gold); box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); } +.inp:focus { outline: none; border-color: var(--gold); background-color: #182037; box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); } +/* Clicking in must visibly change the field: the example text steps aside for the caret */ +.inp:focus::placeholder { color: transparent; } +.inp { caret-color: var(--gold); } .inp:disabled { opacity: 0.55; } .check { display: flex; align-items: center; gap: 10px; font-size: 14px; color: var(--ink-2); min-height: 32px; cursor: pointer; } .check input { width: 18px; height: 18px; accent-color: var(--gold); margin: 0; } diff --git a/services/frontend/src/app/layout.tsx b/services/frontend/src/app/layout.tsx index 6e15466..4f77e8f 100644 --- a/services/frontend/src/app/layout.tsx +++ b/services/frontend/src/app/layout.tsx @@ -5,6 +5,7 @@ import { Suspense } from "react"; import { NightSky } from "@/components/NightSky"; import { PaymentReturn } from "@/components/PaymentReturn"; import { SiteHeader } from "@/components/SiteHeader"; +import { ValidationMessages } from "@/components/ValidationMessages"; import { getMe } from "@/lib/server"; import { siteUrl } from "@/lib/share"; @@ -32,6 +33,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo + {me && } {children} {me && ( diff --git a/services/frontend/src/components/ValidationMessages.tsx b/services/frontend/src/components/ValidationMessages.tsx new file mode 100644 index 0000000..43baa0f --- /dev/null +++ b/services/frontend/src/components/ValidationMessages.tsx @@ -0,0 +1,83 @@ +"use client"; + +import { useEffect } from "react"; + +type Field = HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement; + +/** Hungarian text for a field the browser found invalid. */ +function message(el: Field): string { + const v = el.validity; + if (v.valueMissing) { + if (el instanceof HTMLSelectElement) return "Válassz a listából."; + if (el instanceof HTMLInputElement && el.type === "checkbox") return "Jelöld be a folytatáshoz."; + if (el instanceof HTMLInputElement && el.type === "radio") return "Válassz egyet."; + return "Töltsd ki ezt a mezőt."; + } + if (v.typeMismatch) { + if (el.type === "email") return "Adj meg egy érvényes e-mail-címet."; + if (el.type === "url") return "Adj meg egy érvényes webcímet."; + } + if (v.tooShort && !(el instanceof HTMLSelectElement)) { + return `Legalább ${el.minLength} karakter legyen (most ${el.value.length}).`; + } + if (v.tooLong && !(el instanceof HTMLSelectElement)) return `Legfeljebb ${el.maxLength} karakter lehet.`; + if (el instanceof HTMLInputElement) { + if (v.rangeUnderflow) return `A legkisebb megengedett érték: ${el.min}.`; + if (v.rangeOverflow) return `A legnagyobb megengedett érték: ${el.max}.`; + if (v.patternMismatch) return el.title || "A formátum nem megfelelő."; + if (v.badInput && el.type === "number") return "Számot adj meg."; + } + return "Az érték nem megfelelő."; +} + +function isField(t: EventTarget | null): t is Field { + return t instanceof HTMLInputElement || t instanceof HTMLTextAreaElement || t instanceof HTMLSelectElement; +} + +/** + * The browser's own form checks (required, minLength, type="email"…) speak + * the browser's language. This puts Hungarian text into those bubbles on + * every page; the checks themselves stay the browser's. + */ +export function ValidationMessages() { + useEffect(() => { + // Fields whose message was set here, so it can be cleared again. + const marked = new WeakSet(); + const clear = (el: Field) => { + if (marked.has(el)) { + el.setCustomValidity(""); + marked.delete(el); + } + }; + const onInvalid = (e: Event) => { + const el = e.target; + if (!isField(el)) return; + clear(el); + // A message the page set itself (setCustomValidity) is kept. + if (el.validity.customError || el.validity.valid) return; + el.setCustomValidity(message(el)); + marked.add(el); + }; + const onEdit = (e: Event) => { + if (isField(e.target)) clear(e.target); + }; + // A submit attempt checks the fields afresh: a value set by code (no input event) is not stuck. + const onClick = (e: Event) => { + const button = (e.target as Element | null)?.closest?.("button, input[type=submit]"); + const form = (button as HTMLButtonElement | HTMLInputElement | null)?.form; + if (!form || (button as HTMLButtonElement).type !== "submit") return; + for (const el of Array.from(form.elements)) if (isField(el)) clear(el); + }; + document.addEventListener("invalid", onInvalid, true); + document.addEventListener("input", onEdit, true); + document.addEventListener("change", onEdit, true); + document.addEventListener("click", onClick, true); + return () => { + document.removeEventListener("invalid", onInvalid, true); + document.removeEventListener("input", onEdit, true); + document.removeEventListener("change", onEdit, true); + document.removeEventListener("click", onClick, true); + }; + }, []); + return null; +} diff --git a/services/frontend/src/lib/api.ts b/services/frontend/src/lib/api.ts index 9b2a3ba..229da89 100644 --- a/services/frontend/src/lib/api.ts +++ b/services/frontend/src/lib/api.ts @@ -37,6 +37,13 @@ export function errorText(e: unknown): string { return "Ehhez nincs jogosultságod."; case "insufficient_credits": return "Nincs több részletes elemzésed ebből a fajtából."; + case "not_found": + return "Nem található. Lehet, hogy közben törölték."; + case "horoscope_unavailable": + return "A számítás most nem érhető el. Próbáld újra pár perc múlva."; + case "internal_error": + case "error": + return "Váratlan hiba történt. Próbáld újra később."; default: return e.message; }