Add translation support

This commit is contained in:
Jeremy Soller 2023-10-30 09:34:36 -06:00
parent 4faee3956e
commit b2998f4317
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
8 changed files with 446 additions and 49 deletions

289
Cargo.lock generated
View file

@ -195,6 +195,12 @@ dependencies = [
"num-traits",
]
[[package]]
name = "arc-swap"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[package]]
name = "arrayref"
version = "0.3.7"
@ -866,10 +872,13 @@ dependencies = [
"cosmic-text 0.10.0",
"env_logger",
"fontdb 0.15.0",
"i18n-embed",
"i18n-embed-fl",
"lazy_static",
"libcosmic",
"log",
"rfd",
"rust-embed",
]
[[package]]
@ -903,7 +912,7 @@ dependencies = [
"rangemap",
"rustc-hash",
"rustybuzz 0.11.0",
"self_cell",
"self_cell 1.0.1",
"swash",
"syntect",
"sys-locale",
@ -1136,6 +1145,19 @@ dependencies = [
"syn 2.0.38",
]
[[package]]
name = "dashmap"
version = "5.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
dependencies = [
"cfg-if",
"hashbrown 0.14.2",
"lock_api",
"once_cell",
"parking_lot_core 0.9.9",
]
[[package]]
name = "data-url"
version = "0.2.0"
@ -1231,6 +1253,17 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
[[package]]
name = "displaydoc"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.38",
]
[[package]]
name = "dlib"
version = "0.5.2"
@ -1447,6 +1480,15 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "find-crate"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
dependencies = [
"toml 0.5.11",
]
[[package]]
name = "flate2"
version = "1.0.28"
@ -1475,6 +1517,50 @@ dependencies = [
"num-traits",
]
[[package]]
name = "fluent"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7"
dependencies = [
"fluent-bundle",
"unic-langid",
]
[[package]]
name = "fluent-bundle"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd"
dependencies = [
"fluent-langneg",
"fluent-syntax",
"intl-memoizer",
"intl_pluralrules",
"rustc-hash",
"self_cell 0.10.2",
"smallvec",
"unic-langid",
]
[[package]]
name = "fluent-langneg"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94"
dependencies = [
"unic-langid",
]
[[package]]
name = "fluent-syntax"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78"
dependencies = [
"thiserror",
]
[[package]]
name = "flume"
version = "0.10.14"
@ -2044,6 +2130,76 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "i18n-config"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640"
dependencies = [
"log",
"serde",
"serde_derive",
"thiserror",
"toml 0.8.6",
"unic-langid",
]
[[package]]
name = "i18n-embed"
version = "0.13.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa"
dependencies = [
"arc-swap",
"fluent",
"fluent-langneg",
"fluent-syntax",
"i18n-embed-impl",
"intl-memoizer",
"lazy_static",
"locale_config",
"log",
"parking_lot 0.12.1",
"rust-embed",
"thiserror",
"unic-langid",
"walkdir",
]
[[package]]
name = "i18n-embed-fl"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395"
dependencies = [
"dashmap",
"find-crate",
"fluent",
"fluent-syntax",
"i18n-config",
"i18n-embed",
"lazy_static",
"proc-macro-error",
"proc-macro2",
"quote",
"strsim",
"syn 2.0.38",
"unic-langid",
]
[[package]]
name = "i18n-embed-impl"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b"
dependencies = [
"find-crate",
"i18n-config",
"proc-macro2",
"quote",
"syn 2.0.38",
]
[[package]]
name = "iced"
version = "0.10.0"
@ -2339,6 +2495,25 @@ dependencies = [
"web-sys",
]
[[package]]
name = "intl-memoizer"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f"
dependencies = [
"type-map",
"unic-langid",
]
[[package]]
name = "intl_pluralrules"
version = "7.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
dependencies = [
"unic-langid",
]
[[package]]
name = "io-lifetimes"
version = "1.0.11"
@ -2563,6 +2738,19 @@ version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
[[package]]
name = "locale_config"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
dependencies = [
"lazy_static",
"objc",
"objc-foundation",
"regex",
"winapi",
]
[[package]]
name = "lock_api"
version = "0.4.11"
@ -3817,6 +4005,40 @@ dependencies = [
"xmlparser",
]
[[package]]
name = "rust-embed"
version = "6.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661"
dependencies = [
"rust-embed-impl",
"rust-embed-utils",
"walkdir",
]
[[package]]
name = "rust-embed-impl"
version = "6.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac"
dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
"syn 2.0.38",
"walkdir",
]
[[package]]
name = "rust-embed-utils"
version = "7.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74"
dependencies = [
"sha2",
"walkdir",
]
[[package]]
name = "rust-ini"
version = "0.18.0"
@ -3983,6 +4205,12 @@ dependencies = [
"tiny-skia 0.8.4",
]
[[package]]
name = "self_cell"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"
[[package]]
name = "self_cell"
version = "1.0.1"
@ -4072,6 +4300,17 @@ dependencies = [
"digest",
]
[[package]]
name = "sha2"
version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
"cfg-if",
"cpufeatures",
"digest",
]
[[package]]
name = "signal-hook-registry"
version = "1.4.1"
@ -4352,7 +4591,7 @@ dependencies = [
"cfg-expr",
"heck",
"pkg-config",
"toml",
"toml 0.8.6",
"version-compare",
]
@ -4531,6 +4770,15 @@ dependencies = [
"strict-num",
]
[[package]]
name = "tinystr"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
dependencies = [
"displaydoc",
]
[[package]]
name = "tinyvec"
version = "1.6.0"
@ -4546,6 +4794,15 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "toml"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
"serde",
]
[[package]]
name = "toml"
version = "0.8.6"
@ -4651,6 +4908,15 @@ dependencies = [
"static_assertions",
]
[[package]]
name = "type-map"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46"
dependencies = [
"rustc-hash",
]
[[package]]
name = "typenum"
version = "1.17.0"
@ -4667,6 +4933,25 @@ dependencies = [
"winapi",
]
[[package]]
name = "unic-langid"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f"
dependencies = [
"unic-langid-impl",
]
[[package]]
name = "unic-langid-impl"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff"
dependencies = [
"serde",
"tinystr",
]
[[package]]
name = "unicode-bidi"
version = "0.3.13"

View file

@ -11,6 +11,10 @@ fontdb = "0.15.0"
lazy_static = "1.4.0"
log = "0.4.20"
rfd = "0.12.0"
# Internationalization
i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6.4"
rust-embed = "6.3.0"
[dependencies.cosmic-text]
git = "https://github.com/pop-os/cosmic-text"

4
i18n.toml Normal file
View file

@ -0,0 +1,4 @@
fallback_language = "en"
[fluent]
assets_dir = "i18n"

49
i18n/en/cosmic_edit.ftl Normal file
View file

@ -0,0 +1,49 @@
new-document = New document
open-project = Open project
# Menu
## File
file = File
new-file = New file
new-window = New window
open-file = Open file...
open-recent = Open recent
todo = TODO
save = Save
save-as = Save as...
revert-all-changes = Revert all changes
document-statistics = Document statistics...
document-type = Document type...
encoding = Encoding...
print = Print
quit = Quit
## Edit
edit = Edit
undo = Undo
redo = Redo
cut = Cut
copy = Copy
paste = Pate
find = Find
replace = Replace
spell-check = Spell check...
## View
view = View
indentation = Indentation
### Indentation
automatic-indentation = Automatic Indentation
tab-width = Tab width: {$tab_width}
convert-indentation-to-spaces = Convert indentation to spaces
convert-indentation-to-tabs = Convert indentation to tabs
word-wrap = Word wrap
show-line-numbers = Show line numbers
highlight-current-line = Highlight current line
syntax-highlighting = Syntax highlighting...
settings = Settings...
keyboard-shortcuts = Keyboard shortcuts...
about-cosmic-text-editor = About COSMIC Text Editor

46
src/localize.rs Normal file
View file

@ -0,0 +1,46 @@
use i18n_embed::{
fluent::{fluent_language_loader, FluentLanguageLoader},
DefaultLocalizer, LanguageLoader, Localizer,
};
use rust_embed::RustEmbed;
#[derive(RustEmbed)]
#[folder = "i18n/"]
struct Localizations;
lazy_static::lazy_static! {
pub static ref LANGUAGE_LOADER: FluentLanguageLoader = {
let loader: FluentLanguageLoader = fluent_language_loader!();
loader
.load_fallback_language(&Localizations)
.expect("Error while loading fallback language");
loader
};
}
#[macro_export]
macro_rules! fl {
($message_id:literal) => {{
i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER, $message_id)
}};
($message_id:literal, $($args:expr),*) => {{
i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER, $message_id, $($args), *)
}};
}
// Get the `Localizer` to be used for localizing this library.
pub fn localizer() -> Box<dyn Localizer> {
Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER, &Localizations))
}
pub fn localize() {
let localizer = localizer();
let requested_languages = i18n_embed::DesktopLanguageRequester::requested_languages();
if let Err(error) = localizer.select(&requested_languages) {
eprintln!("Error while loading language for App List {}", error);
}
}

View file

@ -18,6 +18,8 @@ use std::{
sync::Mutex,
};
mod localize;
use self::menu::menu_bar;
mod menu;
@ -39,6 +41,8 @@ lazy_static::lazy_static! {
fn main() -> Result<(), Box<dyn std::error::Error>> {
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
localize::localize();
let settings = Settings::default().size_limits(Limits::NONE.min_width(400.0).min_height(200.0));
let flags = ();
cosmic::app::run::<App>(settings, flags)?;
@ -303,7 +307,7 @@ impl cosmic::Application for App {
app.nav_model
.insert()
.icon(icon::from_name("folder-open-symbolic").size(16).icon())
.text("Open project");
.text(fl!("open-project"));
}
// Open an empty file if no arguments provided

View file

@ -11,12 +11,12 @@ use cosmic::{
Element,
};
use crate::{Config, Message};
use crate::{fl, Config, Message};
pub fn menu_bar<'a>(config: &Config) -> Element<'a, Message> {
//TODO: port to libcosmic
let menu_root = |label| {
widget::button(label)
widget::button(widget::text(label))
.padding([4, 12])
.style(theme::Button::MenuRoot)
};
@ -36,84 +36,89 @@ pub fn menu_bar<'a>(config: &Config) -> Element<'a, Message> {
);
}
let menu_folder = |label| menu_button!(label, horizontal_space(Length::Fill), ">");
let menu_folder =
|label| menu_button!(widget::text(label), horizontal_space(Length::Fill), ">");
let menu_item = |label, message| MenuTree::new(menu_button!(label).on_press(message));
let menu_item =
|label, message| MenuTree::new(menu_button!(widget::text(label)).on_press(message));
let menu_key = |label, key, message| {
MenuTree::new(menu_button!(label, horizontal_space(Length::Fill), key).on_press(message))
MenuTree::new(
menu_button!(widget::text(label), horizontal_space(Length::Fill), key)
.on_press(message),
)
};
MenuBar::new(vec![
MenuTree::with_children(
menu_root("File"),
menu_root(fl!("file")),
vec![
menu_key("New file", "Ctrl + N", Message::New),
menu_key("New window", "Ctrl + Shift + N", Message::Todo),
menu_key(fl!("new-file"), "Ctrl + N", Message::New),
menu_key(fl!("new-window"), "Ctrl + Shift + N", Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_key("Open file...", "Ctrl + O", Message::OpenFileDialog),
menu_key(fl!("open-file"), "Ctrl + O", Message::OpenFileDialog),
MenuTree::with_children(
menu_folder("Open recent"),
vec![menu_item("TODO", Message::Todo)],
menu_folder(fl!("open-recent")),
vec![menu_item(fl!("todo"), Message::Todo)],
),
MenuTree::new(horizontal_rule(1)),
menu_key("Save", "Ctrl + S", Message::Save),
menu_key("Save as...", "Ctrl + Shift + S", Message::Todo),
menu_key(fl!("save"), "Ctrl + S", Message::Save),
menu_key(fl!("save-as"), "Ctrl + Shift + S", Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_item("Revert all changes", Message::Todo),
menu_item(fl!("revert-all-changes"), Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_item("Document statistics...", Message::Todo),
menu_item("Document type...", Message::Todo),
menu_item("Encoding...", Message::Todo),
menu_item("Print", Message::Todo),
menu_item(fl!("document-statistics"), Message::Todo),
menu_item(fl!("document-type"), Message::Todo),
menu_item(fl!("encoding"), Message::Todo),
menu_item(fl!("print"), Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_key("Quit", "Ctrl + Q", Message::Todo),
menu_key(fl!("quit"), "Ctrl + Q", Message::Todo),
],
),
MenuTree::with_children(
menu_root("Edit"),
menu_root(fl!("edit")),
vec![
menu_key("Undo", "Ctrl + Z", Message::Todo),
menu_key("Redo", "Ctrl + Shift + Z", Message::Todo),
menu_key(fl!("undo"), "Ctrl + Z", Message::Todo),
menu_key(fl!("redo"), "Ctrl + Shift + Z", Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_key("Cut", "Ctrl + X", Message::Todo),
menu_key("Copy", "Ctrl + C", Message::Todo),
menu_key("Paste", "Ctrl + V", Message::Todo),
menu_key(fl!("cut"), "Ctrl + X", Message::Todo),
menu_key(fl!("copy"), "Ctrl + C", Message::Todo),
menu_key(fl!("paste"), "Ctrl + V", Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_key("Find", "Ctrl + F", Message::Todo),
menu_key("Replace", "Ctrl + H", Message::Todo),
menu_key(fl!("find"), "Ctrl + F", Message::Todo),
menu_key(fl!("replace"), "Ctrl + H", Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_item("Spell check...", Message::Todo),
menu_item(fl!("spell-check"), Message::Todo),
],
),
MenuTree::with_children(
menu_root("View"),
menu_root(fl!("view")),
vec![
MenuTree::with_children(
menu_folder("Indentation"),
menu_folder(fl!("indentation")),
vec![
menu_item("Automatic indentation", Message::Todo),
menu_item(fl!("automatic-indentation"), Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_item("Tab width: 1", Message::Todo),
menu_item("Tab width: 2", Message::Todo),
menu_item("Tab width: 4", Message::Todo),
menu_item("Tab width: 8", Message::Todo),
menu_item(fl!("tab-width", tab_width = 1), Message::Todo),
menu_item(fl!("tab-width", tab_width = 2), Message::Todo),
menu_item(fl!("tab-width", tab_width = 4), Message::Todo),
menu_item(fl!("tab-width", tab_width = 8), Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_item("Convert indentation to spaces", Message::Todo),
menu_item("Convert indentation to tabs", Message::Todo),
menu_item(fl!("convert-indentation-to-spaces"), Message::Todo),
menu_item(fl!("convert-indentation-to-tabs"), Message::Todo),
],
),
MenuTree::new(horizontal_rule(1)),
menu_item("Word wrap", Message::Todo),
menu_item("Show line numbers", Message::Todo),
menu_item("Highlight current line", Message::Todo),
menu_item("Syntax highlighting...", Message::Todo),
menu_item(fl!("word-wrap"), Message::Todo),
menu_item(fl!("show-line-numbers"), Message::Todo),
menu_item(fl!("highlight-current-line"), Message::Todo),
menu_item(fl!("syntax-highlighting"), Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_key("Settings...", "Ctrl + ,", Message::Todo),
menu_key(fl!("settings"), "Ctrl + ,", Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_item("Keyboard shortcuts...", Message::Todo),
menu_item(fl!("keyboard-shortcuts"), Message::Todo),
MenuTree::new(horizontal_rule(1)),
menu_item("About COSMIC Text Editor", Message::Todo),
menu_item(fl!("about-cosmic-text-editor"), Message::Todo),
],
),
])

View file

@ -3,7 +3,7 @@
use cosmic_text::{Attrs, Buffer, Edit, Metrics, SyntaxEditor, ViEditor, Wrap};
use std::{fs, path::PathBuf, sync::Mutex};
use crate::{Config, FONT_SYSTEM, SYNTAX_SYSTEM};
use crate::{fl, Config, FONT_SYSTEM, SYNTAX_SYSTEM};
static FONT_SIZES: &'static [Metrics] = &[
Metrics::new(10.0, 14.0), // Caption
@ -104,7 +104,7 @@ impl Tab {
None => format!("{}", path.display()),
}
} else {
"New document".to_string()
fl!("new-document")
}
}
}