mirrors/rage
1
0
Fork 0
mirror of https://github.com/str4d/rage.git synced 2025-04-03 19:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update type names for embedded localizations

Browse source
This commit is contained in:
Jack Grigg 2024-01-06 23:20:57 +00:00
parent 4bac30b7c3
commit 22a7b96440
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
age/src/i18n.rs
View file

@ -8,9 +8,7 @@ use rust_embed::RustEmbed;
#[derive(RustEmbed)]
#[folder = "i18n"]
struct Translations;
const TRANSLATIONS: Translations = Translations {};
struct Localizations;
lazy_static! {
pub(crate) static ref LANGUAGE_LOADER: FluentLanguageLoader = {
@ -18,7 +16,7 @@ lazy_static! {
// Ensure that the fallback language is always loaded, even if the library user
// doesn't call `localizer().select(languages)`.
let fallback: LanguageIdentifier = "en-US".parse().unwrap();
language_loader.load_languages(&TRANSLATIONS, &[&fallback]).unwrap();
language_loader.load_languages(&Localizations, &[&fallback]).unwrap();
language_loader
};
}
@ -65,5 +63,5 @@ macro_rules! wlnfl {
/// age::localizer().select(&requested_languages).unwrap();
/// ```
pub fn localizer() -> Box<dyn Localizer> {
Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER, &TRANSLATIONS))
Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER, &Localizations))
}

6
rage/src/bin/rage-keygen/main.rs
View file

@ -13,9 +13,7 @@ use std::io::Write;
#[derive(RustEmbed)]
#[folder = "i18n"]
struct Translations;
const TRANSLATIONS: Translations = Translations {};
struct Localizations;
lazy_static! {
static ref LANGUAGE_LOADER: FluentLanguageLoader = fluent_language_loader!();
@ -47,7 +45,7 @@ fn main() {
.init();
let requested_languages = DesktopLanguageRequester::requested_languages();
i18n_embed::select(&*LANGUAGE_LOADER, &TRANSLATIONS, &requested_languages).unwrap();
i18n_embed::select(&*LANGUAGE_LOADER, &Localizations, &requested_languages).unwrap();
age::localizer().select(&requested_languages).unwrap();
// Unfortunately the common Windows terminals don't support Unicode Directionality
// Isolation Marks, so we disable them for now.

6
rage/src/bin/rage-mount/main.rs
View file

@ -26,9 +26,7 @@ mod zip;
#[derive(RustEmbed)]
#[folder = "i18n"]
struct Translations;
const TRANSLATIONS: Translations = Translations {};
struct Localizations;
lazy_static! {
static ref LANGUAGE_LOADER: FluentLanguageLoader = fluent_language_loader!();
@ -219,7 +217,7 @@ fn main() -> Result<(), Error> {
.init();
let requested_languages = DesktopLanguageRequester::requested_languages();
i18n_embed::select(&*LANGUAGE_LOADER, &TRANSLATIONS, &requested_languages).unwrap();
i18n_embed::select(&*LANGUAGE_LOADER, &Localizations, &requested_languages).unwrap();
age::localizer().select(&requested_languages).unwrap();
// Unfortunately the common Windows terminals don't support Unicode Directionality
// Isolation Marks, so we disable them for now.

6
rage/src/bin/rage/main.rs
View file

@ -24,9 +24,7 @@ mod error;
#[derive(RustEmbed)]
#[folder = "i18n"]
struct Translations;
const TRANSLATIONS: Translations = Translations {};
struct Localizations;
lazy_static! {
static ref LANGUAGE_LOADER: FluentLanguageLoader = fluent_language_loader!();
@ -590,7 +588,7 @@ fn main() -> Result<(), error::Error> {
.init();
let requested_languages = DesktopLanguageRequester::requested_languages();
i18n_embed::select(&*LANGUAGE_LOADER, &TRANSLATIONS, &requested_languages).unwrap();
i18n_embed::select(&*LANGUAGE_LOADER, &Localizations, &requested_languages).unwrap();
age::localizer().select(&requested_languages).unwrap();
// Unfortunately the common Windows terminals don't support Unicode Directionality
// Isolation Marks, so we disable them for now.