i18n: expand GridCraft localization, formula dialects, and function help

Cargo.toml

@@ -42,6 +42,8 @@ craft-csv = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0
 # Excel 97-2003 (.xls, BIFF8) workbooks; `crates/xlsx/src/xls.rs` maps them onto the model.
 craft-xls = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0bc842cbde430955825553ab7b976f4", version = "0.1.0" }
 
+craft-i18n = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", version = "=0.1.0" }
+
 # foundation
 thiserror = "2"
 serde = { version = "1", features = ["derive", "rc"] }

NOTICE

@@ -354,3 +354,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+
+Polish formula names (crates/formula/src/input/pl.rs)
+Source: https://github.com/PHPOffice/PhpSpreadsheet/tree/master/src/PhpSpreadsheet/Calculation/locale/pl
+
+MIT License
+
+Copyright (c) 2019-2026 PhpSpreadsheet Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -116,7 +116,7 @@ cargo run --release -p gridcraft -- --sample sales --control 7979   # + JSON con
 cargo xtask ci                                                 # fmt, clippy, tests, assets, layering, wasm
 ```
 
-Choose Español under View → Interface language for [Spanish formula names, decimal commas, and semicolon arguments](docs/formula-input.md).
+Under View → Interface language, choose Spanish, Russian, Polish, French, German, Italian, Brazilian Portuguese, or Turkish for [localized formula names, decimal commas, and semicolon arguments](docs/formula-input.md).
 Workbooks, clipboard exchange, and programmatic APIs retain canonical English syntax.
 
 ### Web

apps/gridcraft-cli/src/check.rs

@@ -283,7 +283,7 @@ fn collect_inputs(inputs: &[String]) -> Discovery {
 /// Returns false only when the global file budget stops traversal. `seen` holds the shallowest
 /// depth each directory was scanned from; `rescan` is set below a directory reached again from a
 /// shallower path (its depth-limited subtree may now fit), where already collected files are skipped.
-#[cfg_attr(not(unix), allow(unused_mut))]
+#[cfg_attr(not(unix), allow(unused_mut, clippy::only_used_in_recursion))]
 fn walk(dir: &Path, depth: usize, mut rescan: bool, out: &mut Discovery, seen: &mut std::collections::HashMap<(u64, u64), usize>) -> bool {
     // A directory is visited once by identity (dev+inode on unix) unless reached from a shallower
     // path: several links to the same directory are aliases, not exponential branches of the scan

apps/gridcraft-cli/tests/it/sandbox.rs

@@ -105,6 +105,7 @@ fn a_confined_program_reads_only_what_it_is_given() {
 }
 
 #[test]
+#[cfg(unix)]
 fn a_launch_whose_check_fails_runs_nothing() {
     // A run that says it is already confined and isn't finds the canary readable and must refuse.
     // On macOS that is the second stage started without `sandbox-exec`; on Linux the launcher never

apps/gridcraft-web/src/web.rs

@@ -82,7 +82,10 @@ pub fn start() {
                     let browser = gridcraft_ui_egui::i18n::Language::system();
                     if !matches!(
                         browser,
-                        gridcraft_ui_egui::i18n::Language::Zh | gridcraft_ui_egui::i18n::Language::Ja | gridcraft_ui_egui::i18n::Language::Ko
+                        gridcraft_ui_egui::i18n::Language::Zh
+                            | gridcraft_ui_egui::i18n::Language::ZhTw
+                            | gridcraft_ui_egui::i18n::Language::Ja
+                            | gridcraft_ui_egui::i18n::Language::Ko
                     ) {
                         app.ui.language = browser;
                     }

apps/gridcraft/src/main.rs

@@ -35,7 +35,7 @@ impl eframe::App for App {
         #[cfg(target_os = "macos")]
         {
             if self.2.is_none() && std::env::var_os("GRIDCRAFT_NO_NATIVE_MENU").is_none() {
-                self.2 = Some(native_menu::NativeMenu::install(ctx));
+                self.2 = Some(native_menu::NativeMenu::install(ctx, self.0.ui.language));
             }
             if let Some(m) = &mut self.2 {
                 m.poll(&mut self.0, ctx, self.1.focused_viewport());
@@ -240,6 +240,17 @@ fn icon() -> Option<egui::IconData> {
     Some(egui::IconData { width: img.width(), height: img.height(), rgba: img.into_raw() })
 }
 
+/// Creates the desktop's initial blank book after preferences load; supplied documents are kept.
+fn ensure_startup_workbook(app: &mut SheetApp) {
+    let language = app.ui.language;
+    if app.session.documents().is_empty()
+        && let Err(error) = app.run("file.new", json!({"bookPrefix": language.tr("Book"), "sheetPrefix": language.tr("Sheet")}))
+    {
+        log::warn!("new workbook: {error}");
+    }
+}
+
+/// Starts the desktop application with persisted preferences, localized new-document names and native services.
 fn main() -> eframe::Result<()> {
     // A confined launcher run (`gridcraft_sandbox::launch_command`) comes before everything else:
     // it opens no window, writes no log, and becomes the program it confines.
@@ -329,10 +340,8 @@ fn main() -> eframe::Result<()> {
     app.start_update_check();
     let control_port = control_port;
     load_prefs(&mut app);
-    // Stamp the startup workbook's author from the persisted user name.
-    if app.session.documents().is_empty() {
-        app.session.new_workbook();
-    }
+    // Stamp the localized startup workbook's author from the persisted user name.
+    ensure_startup_workbook(&mut app);
     app.after_engine(); // Show warnings from the sample.
     // Files named on the command line (a double-click on Windows and Linux) open as File › Open
     // opens them: a password-protected one asks for its password, and errors are shown, not
@@ -462,3 +471,26 @@ mod packaging_tests {
         }
     }
 }
+
+#[cfg(test)]
+mod startup_tests {
+    /// Saved interface language applies on launch, while existing documents are never renamed or replaced.
+    #[test]
+    fn startup_workbook_uses_loaded_language_and_keeps_existing_documents() {
+        let mut app = gridcraft_ui_egui::SheetApp::new(gridcraft_engine::Session::new(), Default::default());
+        app.ui.language = gridcraft_ui_egui::i18n::Language::Ru;
+        super::ensure_startup_workbook(&mut app);
+        assert_eq!(app.session.active().unwrap().title, "Книга1");
+        assert_eq!(app.session.active().unwrap().wb.active().unwrap().name, "Лист1");
+        super::ensure_startup_workbook(&mut app);
+        assert_eq!(app.session.documents().len(), 1);
+        let mut session = gridcraft_engine::Session::new();
+        session.new_workbook_named("Existing", "Data");
+        let mut app = gridcraft_ui_egui::SheetApp::new(session, Default::default());
+        app.ui.language = gridcraft_ui_egui::i18n::Language::Ru;
+        super::ensure_startup_workbook(&mut app);
+        assert_eq!(app.session.documents().len(), 1);
+        assert_eq!(app.session.active().unwrap().title, "Existing1");
+        assert_eq!(app.session.active().unwrap().wb.active().unwrap().name, "Data1");
+    }
+}

apps/gridcraft/src/native_menu.rs

@@ -1,9 +1,12 @@
 //! macOS: the native menu bar (File, Edit, View, Insert, Format, Tools, Data, Window, Help), as
-//! a desktop spreadsheet has on the Mac. Items run the same commands as the ribbon.
+//! a desktop spreadsheet has on the Mac. Items run the same commands as the ribbon. Titles are in
+//! the interface language and follow it when it changes.
 
+use std::cell::Cell;
 use std::str::FromStr;
 use std::sync::mpsc::{Receiver, channel};
 
+use gridcraft_ui_egui::i18n::Language;
 use gridcraft_ui_egui::{OpenWindow, SheetApp};
 use muda::accelerator::Accelerator;
 use muda::{CheckMenuItem, Menu, MenuEvent, MenuItem, PredefinedMenuItem, Submenu};
@@ -84,7 +87,7 @@ fn tree() -> Vec<(&'static str, Vec<Entry>)> {
             ],
         ),
         (
-            "Insert",
+            "Tab|Insert",
             vec![
                 ("Cells…", "dialog:insertCells", None),
                 ("Rows", "home.insertRows", None),
@@ -129,7 +132,8 @@ fn tree() -> Vec<(&'static str, Vec<Entry>)> {
             ],
         ),
         (
-            "Tools",
+            // Excel for Mac's name for it differs from the ribbon's Tools in some languages.
+            "menu|Tools",
             vec![
                 ("Spelling…", "dialog:spelling", None),
                 ("Workbook Statistics", "dialog:statistics", None),
@@ -199,6 +203,29 @@ pub struct NativeMenu {
     /// The Window menu's window items and what they last showed.
     window_items: Vec<CheckMenuItem>,
     windows: Vec<OpenWindow>,
+    /// Every entry with a title, and its English text (the catalog key).
+    titled: Vec<(Titled, &'static str)>,
+    /// The language the titles are in.
+    language: Cell<Language>,
+}
+
+/// A menu entry whose title follows the interface language.
+enum Titled {
+    Item(MenuItem),
+    Check(CheckMenuItem),
+    Sub(Submenu),
+    Predefined(PredefinedMenuItem),
+}
+
+impl Titled {
+    fn set_text(&self, text: &str) {
+        match self {
+            Titled::Item(i) => i.set_text(text),
+            Titled::Check(i) => i.set_text(text),
+            Titled::Sub(i) => i.set_text(text),
+            Titled::Predefined(i) => i.set_text(text),
+        }
+    }
 }
 
 /// Menu id of the Window menu item that brings workbook `doc` forward.
@@ -220,49 +247,65 @@ fn select_theme(app: &mut SheetApp, id: &str) -> bool {
 }
 
 impl NativeMenu {
-    pub fn install(ctx: &egui::Context) -> NativeMenu {
+    pub fn install(ctx: &egui::Context, language: Language) -> NativeMenu {
+        let tr = |key: &str| language.tr(key).to_owned();
+        let mut titled: Vec<(Titled, &'static str)> = Vec::new();
         let menu = Menu::new();
         let app_menu = Submenu::new("GridCraft", true);
-        let about = MenuItem::with_id("dialog:about", "About GridCraft", true, None);
+        let about = MenuItem::with_id("dialog:about", tr("About GridCraft"), true, None);
+        let services = PredefinedMenuItem::services(Some(&tr("Services")));
+        let hide = PredefinedMenuItem::hide(Some(&tr("Hide GridCraft")));
+        let hide_others = PredefinedMenuItem::hide_others(Some(&tr("Hide Others")));
+        let show_all = PredefinedMenuItem::show_all(Some(&tr("Show All")));
+        let quit = MenuItem::with_id(QUIT, tr("Quit GridCraft"), true, Accelerator::from_str("CMD+Q").ok());
         let _ = app_menu.append_items(&[
             &about,
             &PredefinedMenuItem::separator(),
-            &PredefinedMenuItem::services(None),
+            &services,
             &PredefinedMenuItem::separator(),
-            &PredefinedMenuItem::hide(None),
-            &PredefinedMenuItem::hide_others(None),
-            &PredefinedMenuItem::show_all(None),
+            &hide,
+            &hide_others,
+            &show_all,
             &PredefinedMenuItem::separator(),
-            &MenuItem::with_id(QUIT, "Quit GridCraft", true, Accelerator::from_str("CMD+Q").ok()),
+            &quit,
         ]);
+        titled.push((Titled::Item(about), "About GridCraft"));
+        titled.push((Titled::Item(quit), "Quit GridCraft"));
+        for (item, key) in [(services, "Services"), (hide, "Hide GridCraft"), (hide_others, "Hide Others"), (show_all, "Show All")] {
+            titled.push((Titled::Predefined(item), key));
+        }
         let _ = menu.append(&app_menu);
         let mut theme_items = Vec::new();
         let mut window_menu = None;
         for (title, entries) in tree() {
-            let sub = Submenu::new(title, true);
+            let sub = Submenu::new(tr(title), true);
             for (label, id, acc) in entries {
                 if label == "-" {
                     let _ = sub.append(&PredefinedMenuItem::separator());
                     continue;
                 }
                 if id == "view.theme" {
-                    let themes = Submenu::new(label, true);
+                    let themes = Submenu::new(tr(label), true);
                     for (mode, label) in [("system", "System"), ("light", "Light"), ("dark", "Dark")] {
-                        let item = CheckMenuItem::with_id(format!("theme:{mode}"), label, true, false, None);
+                        let item = CheckMenuItem::with_id(format!("theme:{mode}"), tr(label), true, false, None);
                         let _ = themes.append(&item);
-                        theme_items.push((mode, item));
+                        theme_items.push((mode, item.clone()));
+                        titled.push((Titled::Check(item), label));
                     }
                     let _ = sub.append(&themes);
+                    titled.push((Titled::Sub(themes), label));
                     continue;
                 }
                 let accel = acc.and_then(|a| Accelerator::from_str(a).ok());
-                let item = MenuItem::with_id(id, label, true, accel);
+                let item = MenuItem::with_id(id, tr(label), true, accel);
                 let _ = sub.append(&item);
+                titled.push((Titled::Item(item), label));
             }
             let _ = menu.append(&sub);
             if title == "Window" {
-                window_menu = Some(sub);
+                window_menu = Some(sub.clone());
             }
+            titled.push((Titled::Sub(sub), title));
         }
         menu.init_for_nsapp();
         // NSApp's windowsMenu is where macOS adds Move & Resize, Fill and Center, the targets of the
@@ -277,7 +320,16 @@ impl NativeMenu {
             let _ = tx.send(e);
             ctx.request_repaint();
         }));
-        NativeMenu { _menu: menu, events: rx, theme_items, window_menu, window_items: Vec::new(), windows: Vec::new() }
+        NativeMenu {
+            _menu: menu,
+            events: rx,
+            theme_items,
+            window_menu,
+            window_items: Vec::new(),
+            windows: Vec::new(),
+            titled,
+            language: Cell::new(language),
+        }
     }
 
     /// Keeps the Window menu's list of open windows (title, unsaved bullet, active check) in
@@ -315,6 +367,14 @@ impl NativeMenu {
     /// Runs the chosen menu items. Commands go to the active window, the most recently focused;
     /// `viewport` is its egui viewport, for the items that act on its input.
     pub fn poll(&mut self, app: &mut SheetApp, ctx: &egui::Context, viewport: egui::ViewportId) {
+        // The interface language changed (View › Interface Language): retitle the menus.
+        let language = app.ui.language;
+        if language != self.language.get() {
+            self.language.set(language);
+            for (entry, key) in &self.titled {
+                entry.set_text(language.tr(key));
+            }
+        }
         while let Ok(ev) = self.events.try_recv() {
             let id = ev.id.as_ref().to_string();
             if id == QUIT {

apps/gridcraft/tests/mac_menu_appkit.rs

@@ -19,7 +19,7 @@ fn main() {
     nsapp.finishLaunching();
 
     let ctx = egui::Context::default();
-    let mut menu = native_menu::NativeMenu::install(&ctx);
+    let mut menu = native_menu::NativeMenu::install(&ctx, gridcraft_ui_egui::i18n::Language::En);
 
     let bar = nsapp.mainMenu().expect("a main menu");
     let tops: Vec<String> = (0..bar.numberOfItems()).filter_map(|i| bar.itemAtIndex(i)?.submenu()).map(|m| m.title().to_string()).collect();
@@ -37,6 +37,14 @@ fn main() {
     let last = windows_menu.itemAtIndex(windows_menu.numberOfItems() - 1).expect("a Window menu item");
     assert_eq!(last.title().to_string(), open[0].label(), "the Window menu lists the open workbook");
 
+    // A contextual menu title remains a noun on a language switch, and refreshes back to English.
+    for (language, expected) in [("ru", "Вставка"), ("en", "Insert")] {
+        app.run("app.language.set", serde_json::json!({"language": language})).unwrap();
+        menu.poll(&mut app, &ctx, egui::ViewportId::ROOT);
+        let insert = bar.itemAtIndex(4).unwrap().submenu().unwrap();
+        assert_eq!(insert.title().to_string(), expected);
+    }
+
     println!("mac_menu_appkit: ok");
 }
 

contributors/people.toml

@@ -111,5 +111,8 @@ sync_github_name = true
 [people.maxm11]
 sync_github_name = true
 
+[people.reeeji]
+sync_github_name = true
+
 [people.RockerHX]
 sync_github_name = true