-
Notifications
You must be signed in to change notification settings - Fork 0
fix(locale): translate home daily mix section and tray menu #32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,4 +33,5 @@ pub mod smart_playlists; | |
| pub mod spotify; | ||
| pub mod stats; | ||
| pub mod track; | ||
| pub mod tray; | ||
| pub mod wrapped; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| //! Tray menu localisation bridge. | ||
| //! | ||
| //! The system tray menu (Play/Pause, Previous, Next, Open WaveFlow, Quit) | ||
| //! is created in Rust at startup before the frontend has loaded i18next, | ||
| //! so the labels are seeded in English and the frontend pushes a | ||
| //! localised set once `i18nReady` resolves — and again on every | ||
| //! `languageChanged`. The `MenuItem` handles are stashed in | ||
| //! [`TrayMenuItems`] so this command can call `set_text` without | ||
| //! rebuilding the menu. | ||
|
|
||
| use tauri::{menu::MenuItem, AppHandle, Manager, Runtime, State}; | ||
|
|
||
| /// Holds the five user-facing tray `MenuItem`s so their labels can be | ||
| /// retitled at runtime when the UI language changes. | ||
| pub struct TrayMenuItems<R: Runtime> { | ||
| pub play_pause: MenuItem<R>, | ||
| pub previous: MenuItem<R>, | ||
| pub next: MenuItem<R>, | ||
| pub show: MenuItem<R>, | ||
| pub quit: MenuItem<R>, | ||
| } | ||
|
|
||
| #[derive(serde::Deserialize)] | ||
| #[serde(rename_all = "camelCase")] | ||
| pub struct TrayLabels { | ||
| pub play_pause: String, | ||
| pub previous: String, | ||
| pub next: String, | ||
| pub show: String, | ||
| pub quit: String, | ||
| } | ||
|
|
||
| #[tauri::command] | ||
| pub fn set_tray_labels<R: Runtime>( | ||
| app: AppHandle<R>, | ||
| labels: TrayLabels, | ||
| ) -> Result<(), String> { | ||
| let Some(items) = app.try_state::<TrayMenuItems<R>>() else { | ||
| return Ok(()); | ||
| }; | ||
| apply(&items, &labels).map_err(|e| e.to_string()) | ||
| } | ||
|
|
||
| fn apply<R: Runtime>( | ||
| items: &State<'_, TrayMenuItems<R>>, | ||
| labels: &TrayLabels, | ||
| ) -> tauri::Result<()> { | ||
| items.play_pause.set_text(&labels.play_pause)?; | ||
| items.previous.set_text(&labels.previous)?; | ||
| items.next.set_text(&labels.next)?; | ||
| items.show.set_text(&labels.show)?; | ||
| items.quit.set_text(&labels.quit)?; | ||
| Ok(()) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.