Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix wording

Browse Source
This commit is contained in:
juliancoffee 2022-08-07 18:09:30 +03:00
parent 67df7a1e74
commit eed5aef1d0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
voxygen/i18n/src/lib.rs
View File

@ -247,13 +247,12 @@ pub struct LocalizationHandle {
pub use_english_fallback: bool, pub use_english_fallback: bool,
} }
/// Read [LocalizationGuard](LocalizationGuard) /// Read [LocalizationGuard]
// arbitrary choice to minimize changing all of veloren // arbitrary choice to minimize changing all of veloren
pub type Localization = LocalizationGuard; pub type Localization = LocalizationGuard;
/// RAII guard returned from /// RAII guard returned from [LocalizationHandle::read()], resembles
/// [LocalizationHandle::read()](LocalizationHandle::read), /// [AssetGuard]
/// resembles [AssetGuard](AssetGuard)
pub struct LocalizationGuard { pub struct LocalizationGuard {
active: AssetGuard<Language>, active: AssetGuard<Language>,
fallback: Option<AssetGuard<Language>>, fallback: Option<AssetGuard<Language>>,
@ -302,7 +301,7 @@ impl LocalizationGuard {
// NOTE: we clone the key if translation was missing // NOTE: we clone the key if translation was missing
// We could use borrowed version, but it would mean that // We could use borrowed version, but it would mean that
// `key`, `self`, and result should have the same lifetime. // `key`, `self`, and result should have the same lifetime.
// Which would make it way more awkard to use with runtime generated keys. // Which would make it way more awkward to use with runtime generated keys.
self.try_msg(key) self.try_msg(key)
.unwrap_or_else(|| Cow::Owned(key.to_owned())) .unwrap_or_else(|| Cow::Owned(key.to_owned()))
} }
@ -407,7 +406,7 @@ impl LocalizationHandle {
} }
/// # Errors /// # Errors
/// Returns error if active language can't be loaded /// Returns error if active of fallback language can't be loaded
pub fn load(specifier: &str) -> Result<Self, assets::Error> { pub fn load(specifier: &str) -> Result<Self, assets::Error> {
let default_key = ["voxygen.i18n.", REFERENCE_LANG].concat(); let default_key = ["voxygen.i18n.", REFERENCE_LANG].concat();
let language_key = ["voxygen.i18n.", specifier].concat(); let language_key = ["voxygen.i18n.", specifier].concat();