From 171b175b4ff5bb519b8180dd2865f59fdbd0a60b Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:13:40 -0600 Subject: [PATCH] i18n: wrap hardcoded Slint labels and plural concatenations Wrap remaining user-facing literals in @tr across discover (RADIO, TOP TRACKS), DiscographyBuilder (release-type/order-by labels), the OfflineManager hero, ExpandableSearch placeholder default, and the appearance option arrays in state.slint (displayed as-is, no Rust re-seed). Replace string concatenation with positional @tr plus ngettext plurals for the DiscographyBuilder footer and OfflineManager track counts so word order is locale-stable. Language endonyms and the macOS/Adwaita/quality-tier brand names stay literal. cc --- crates/qbz-slint/ui/discover/ForYouView.slint | 2 +- crates/qbz-slint/ui/discover/RadioCard.slint | 2 +- crates/qbz-slint/ui/discover/Spotlight.slint | 4 +-- .../ui/myqbz/DiscographyBuilderView.slint | 19 ++++++----- .../ui/offline/OfflineManagerView.slint | 6 ++-- .../ui/primitives/ExpandableSearch.slint | 2 +- crates/qbz-slint/ui/state.slint | 32 +++++++++---------- 7 files changed, 33 insertions(+), 34 deletions(-) diff --git a/crates/qbz-slint/ui/discover/ForYouView.slint b/crates/qbz-slint/ui/discover/ForYouView.slint index 346440775..df0a967e6 100644 --- a/crates/qbz-slint/ui/discover/ForYouView.slint +++ b/crates/qbz-slint/ui/discover/ForYouView.slint @@ -100,7 +100,7 @@ export component ForYouView inherits VerticalLayout { for st in ForYouState.radio-stations: RadioCard { seed-title: st.title; seed-subtitle: st.artist; - label: "RADIO"; + label: @tr("RADIO"); artwork: st.artwork; clicked => { root.start-radio-album(st.album-id); diff --git a/crates/qbz-slint/ui/discover/RadioCard.slint b/crates/qbz-slint/ui/discover/RadioCard.slint index 3df303262..89ece3ea5 100644 --- a/crates/qbz-slint/ui/discover/RadioCard.slint +++ b/crates/qbz-slint/ui/discover/RadioCard.slint @@ -15,7 +15,7 @@ import { QbzIcon } from "../primitives/QbzIcon.slint"; export component RadioCard inherits Rectangle { in property seed-title; in property seed-subtitle; - in property label: "RADIO"; + in property label: @tr("RADIO"); in property artwork; callback clicked(); callback play(); diff --git a/crates/qbz-slint/ui/discover/Spotlight.slint b/crates/qbz-slint/ui/discover/Spotlight.slint index feb2c5f8d..fb689096a 100644 --- a/crates/qbz-slint/ui/discover/Spotlight.slint +++ b/crates/qbz-slint/ui/discover/Spotlight.slint @@ -158,7 +158,7 @@ export component Spotlight inherits VerticalLayout { if ForYouState.spotlight-has-top-tracks: RadioCard { seed-title: @tr("Top tracks"); seed-subtitle: @tr("By {}", ForYouState.spotlight-name); - label: "TOP TRACKS"; + label: @tr("TOP TRACKS"); artwork: ForYouState.spotlight-image; clicked => { root.play-top-tracks(ForYouState.spotlight-artist-id); @@ -170,7 +170,7 @@ export component Spotlight inherits VerticalLayout { RadioCard { seed-title: ForYouState.spotlight-name; seed-subtitle: @tr("Qobuz Radio Station"); - label: "RADIO"; + label: @tr("RADIO"); artwork: ForYouState.spotlight-image; clicked => { root.start-radio(ForYouState.spotlight-artist-id); diff --git a/crates/qbz-slint/ui/myqbz/DiscographyBuilderView.slint b/crates/qbz-slint/ui/myqbz/DiscographyBuilderView.slint index a0f95ef33..5504419be 100644 --- a/crates/qbz-slint/ui/myqbz/DiscographyBuilderView.slint +++ b/crates/qbz-slint/ui/myqbz/DiscographyBuilderView.slint @@ -140,11 +140,11 @@ component TypeOverride inherits Rectangle { padding: 4px; // Album, EP, Single, Live, Compilation (spec order). for choice in [ - { id: "album", lbl: "Album" }, - { id: "ep", lbl: "EP" }, - { id: "single", lbl: "Single" }, - { id: "live", lbl: "Live" }, - { id: "compilation", lbl: "Compilation" }, + { id: "album", lbl: @tr("Album") }, + { id: "ep", lbl: @tr("EP") }, + { id: "single", lbl: @tr("Single") }, + { id: "live", lbl: @tr("Live") }, + { id: "compilation", lbl: @tr("Compilation") }, ]: Rectangle { height: 28px; border-radius: 4px; @@ -549,9 +549,9 @@ export component DiscographyBuilderView inherits Rectangle { seg := HorizontalLayout { spacing: 0px; for s[i] in [ - { id: "release_date", lbl: "Release date" }, - { id: "title", lbl: "Title" }, - { id: "manual", lbl: "Manual" }, + { id: "release_date", lbl: @tr("Release date") }, + { id: "title", lbl: @tr("Title") }, + { id: "manual", lbl: @tr("Manual") }, ]: seg-rect := Rectangle { property active: DiscoBuilderState.order-by == s.id; // Non-accent active (the app's ToggleButton idiom): a surface @@ -744,8 +744,7 @@ export component DiscographyBuilderView inherits Rectangle { alignment: center; horizontal-stretch: 1; Text { - text: DiscoBuilderState.selected-count + " of " - + DiscoBuilderState.group-count + " albums selected"; + text: @tr("{} of {} album selected" | "{} of {} albums selected" % DiscoBuilderState.group-count, DiscoBuilderState.selected-count, DiscoBuilderState.group-count); color: Theme.text-secondary; font-size: 13px; } diff --git a/crates/qbz-slint/ui/offline/OfflineManagerView.slint b/crates/qbz-slint/ui/offline/OfflineManagerView.slint index 1f3077453..edc9164c7 100644 --- a/crates/qbz-slint/ui/offline/OfflineManagerView.slint +++ b/crates/qbz-slint/ui/offline/OfflineManagerView.slint @@ -170,7 +170,7 @@ export component OfflineManagerView inherits Rectangle { VerticalLayout { alignment: center; Text { - text: "Offline Cache"; + text: @tr("Offline Cache"); color: Theme.text-primary; // Hero homologated to the canonical 18px (section). font-size: Typography.section; @@ -191,7 +191,7 @@ export component OfflineManagerView inherits Rectangle { VerticalLayout { alignment: center; Text { - text: OfflineManagerState.tracks-count + " tracks"; + text: @tr("{} track" | "{} tracks" % OfflineManagerState.tracks-count, OfflineManagerState.tracks-count); color: Theme.text-primary; font-size: Typography.body; font-weight: Typography.semibold; @@ -381,7 +381,7 @@ export component OfflineManagerView inherits Rectangle { spacing: 2px; ArtistRailRow { name: @tr("All artists"); - meta: OfflineManagerState.tracks-count + " tracks"; + meta: @tr("{} track" | "{} tracks" % OfflineManagerState.tracks-count, OfflineManagerState.tracks-count); active: OfflineManagerState.selected-artist == ""; clicked => { OfflineManagerActions.select-artist(""); diff --git a/crates/qbz-slint/ui/primitives/ExpandableSearch.slint b/crates/qbz-slint/ui/primitives/ExpandableSearch.slint index d77fd90c9..af03a2655 100644 --- a/crates/qbz-slint/ui/primitives/ExpandableSearch.slint +++ b/crates/qbz-slint/ui/primitives/ExpandableSearch.slint @@ -11,7 +11,7 @@ import { Typography } from "../foundation/typography.slint"; import { QbzIcon } from "QbzIcon.slint"; export component ExpandableSearch inherits Rectangle { - in property placeholder: "Search…"; + in property placeholder: @tr("Search…"); // Trimmed 20px so the open field doesn't ride over the controls to its // left on small screens. in property max-open-width: 196px; diff --git a/crates/qbz-slint/ui/state.slint b/crates/qbz-slint/ui/state.slint index 7f39a8746..d56cef90a 100644 --- a/crates/qbz-slint/ui/state.slint +++ b/crates/qbz-slint/ui/state.slint @@ -2676,14 +2676,14 @@ export global AppearanceState { // Auto-Theme (shown when the "System" theme is selected). Source: // 0 = System Colors, 1 = Wallpaper Sync, 2 = Custom Image. in-out property theme-is-system: false; - in-out property <[string]> auto-theme-sources: ["System Colors", "Wallpaper Sync", "Custom Image"]; + in-out property <[string]> auto-theme-sources: [@tr("System Colors"), @tr("Wallpaper Sync"), @tr("Custom Image")]; in-out property auto-theme-source-index: 0; in-out property auto-theme-custom-path: ""; in-out property auto-theme-generating: false; in-out property auto-theme-detected-de: ""; // --- TYPOGRAPHY / SCALE / LANGUAGE ------------------------------------- - in-out property <[string]> languages: ["Auto", "English", "Español", "Français", "Deutsch", "Português"]; + in-out property <[string]> languages: [@tr("Auto"), "English", "Español", "Français", "Deutsch", "Português"]; in-out property language-index: 0; in-out property <[string]> fonts: ["LINE Seed JP", "Montserrat", "Noto Sans", "Source Sans 3", "System"]; in-out property font-index: 0; @@ -2693,7 +2693,7 @@ export global AppearanceState { // Immersive search action — what selecting a result in the Immersive search // cortinilla does (index: 0=Disabled, 1=Replace queue, 2=Play next, // 3=Add to queue). Persisted via appearance-select("immersive-search-action"). - in-out property <[string]> immersive-search-actions: ["Disabled", "Replace current queue", "Play next", "Add to queue"]; + in-out property <[string]> immersive-search-actions: [@tr("Disabled"), @tr("Replace current queue"), @tr("Play next"), @tr("Add to queue")]; in-out property immersive-search-action-index: 1; // Immersive default view — which immersive view opens by default. @@ -2701,7 +2701,7 @@ export global AppearanceState { // 1 = Album Reactive, 2 = Static, 3 = Coverflow, 4 = Spectrum, // 5 = Lyrics, 6 = Queue (all 1-6 pin a FOCUS view-mode foreground). // Persisted via appearance-select("immersive-default-view"). - in-out property <[string]> immersive-default-views: ["Remember last", "Album Reactive", "Static", "Coverflow", "Spectrum", "Lyrics", "Queue"]; + in-out property <[string]> immersive-default-views: [@tr("Remember last"), @tr("Album Reactive"), @tr("Static"), @tr("Coverflow"), @tr("Spectrum"), @tr("Lyrics"), @tr("Queue")]; in-out property immersive-default-view-index: 0; // --- VISUAL EXTRAS ----------------------------------------------------- @@ -2739,26 +2739,26 @@ export global AppearanceState { in-out property nav-tb-myqbz: false; in-out property nav-tb-purchases: false; // Nav buttons position: 0 = Auto, 1 = Left, 2 = Right. - in-out property <[string]> nav-tb-positions: ["Auto (opposite to window controls)", "Left", "Right"]; + in-out property <[string]> nav-tb-positions: [@tr("Auto (opposite to window controls)"), @tr("Left"), @tr("Right")]; in-out property nav-tb-position-index: 0; // Window controls group. - in-out property <[string]> wc-positions: ["Left", "Right"]; + in-out property <[string]> wc-positions: [@tr("Left"), @tr("Right")]; in-out property wc-position-index: 1; - in-out property <[string]> wc-styles: ["Rectangular", "Full-height rounded", "Circular", "Square"]; + in-out property <[string]> wc-styles: [@tr("Rectangular"), @tr("Full-height rounded"), @tr("Circular"), @tr("Square")]; in-out property wc-style-index: 0; - in-out property <[string]> wc-sizes: ["Small", "Normal", "Large"]; + in-out property <[string]> wc-sizes: [@tr("Small"), @tr("Normal"), @tr("Large")]; in-out property wc-size-index: 1; - in-out property <[string]> wc-color-presets: ["Default", "macOS", "Adwaita", "Monochrome", "Custom"]; + in-out property <[string]> wc-color-presets: [@tr("Default"), "macOS", "Adwaita", @tr("Monochrome"), @tr("Custom")]; in-out property wc-color-preset-index: 0; in-out property show-window-controls: true; // --- MINIPLAYER -------------------------------------------------------- - in-out property <[string]> miniplayer-views: ["Remember last used", "Micro", "Compact", "Artwork", "Queue", "Lyrics"]; + in-out property <[string]> miniplayer-views: [@tr("Remember last used"), @tr("Micro"), @tr("Compact"), @tr("Artwork"), @tr("Queue"), @tr("Lyrics")]; in-out property miniplayer-view-index: 0; // --- STARTUP ----------------------------------------------------------- - in-out property <[string]> startup-pages: ["Home", "Where you left off"]; + in-out property <[string]> startup-pages: [@tr("Home"), @tr("Where you left off")]; in-out property startup-page-index: 0; in-out property show-purchases: false; @@ -2773,17 +2773,17 @@ export global AppearanceState { // macOS-only: hide the Dock icon when closed to the menu bar (.accessory // activation policy). Off = Spotify-style (keep the Dock icon). in-out property tray-mac-hide-dock: false; - in-out property <[string]> tray-icon-themes: ["Auto", "Mono light", "Mono dark", "Color"]; + in-out property <[string]> tray-icon-themes: [@tr("Auto"), @tr("Mono light"), @tr("Mono dark"), @tr("Color")]; in-out property tray-icon-theme-index: 0; // --- IMMERSIVE --------------------------------------------------------- in-out property <[string]> immersive-views: [ - "Remember last used", "Coverflow", "Static", "Vinyl", "Visualizer", - "Neon Flow", "Tunnel", "Comet", "Lyrics", "Queue", - "Split: Lyrics", "Split: Track Info", "Split: Suggestions", "Split: Queue" + @tr("Remember last used"), @tr("Coverflow"), @tr("Static"), @tr("Vinyl"), @tr("Visualizer"), + @tr("Neon Flow"), @tr("Tunnel"), @tr("Comet"), @tr("Lyrics"), @tr("Queue"), + @tr("Split: Lyrics"), @tr("Split: Track Info"), @tr("Split: Suggestions"), @tr("Split: Queue") ]; in-out property immersive-view-index: 0; - in-out property <[string]> immersive-background-modes: ["Full", "Lite", "Off"]; + in-out property <[string]> immersive-background-modes: [@tr("Full"), @tr("Lite"), @tr("Off")]; in-out property immersive-background-mode-index: 0; // Collapsible sub-panels (collapsed by default, matching Tauri). in-out property immersive-panels-collapsed: true;