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 paths and adding tests

Browse Source
This commit is contained in:
juliancoffee 2021-05-08 16:41:36 +03:00
parent 04de189427
commit ce68d0268e
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
voxygen/i18n/src/data.rs
View File

@ -47,7 +47,7 @@ pub type Fonts = HashMap<String, Font>;
/// However, metadata informations are correct /// However, metadata informations are correct
/// See `Language` for more info on each attributes /// See `Language` for more info on each attributes
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] #[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
pub struct RawLocalization { pub(crate) struct RawLocalization {
pub(crate) sub_directories: Vec<String>, pub(crate) sub_directories: Vec<String>,
pub(crate) string_map: HashMap<String, String>, pub(crate) string_map: HashMap<String, String>,
pub(crate) vector_map: HashMap<String, Vec<String>>, pub(crate) vector_map: HashMap<String, Vec<String>>,
@ -85,7 +85,7 @@ struct Language {
/// Store internationalization maps /// Store internationalization maps
/// These structs are meant to be merged into a Language /// These structs are meant to be merged into a Language
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct LocalizationFragment { struct LocalizationFragment {
/// A map storing the localized texts /// A map storing the localized texts
/// ///
/// Localized content can be accessed using a String key. /// Localized content can be accessed using a String key.
@ -172,9 +172,7 @@ impl assets::Compound for Language {
asset_key: &str, asset_key: &str,
) -> Result<Self, assets::Error> { ) -> Result<Self, assets::Error> {
let raw = cache let raw = cache
.load::<RawLocalization>( .load::<RawLocalization>(&[asset_key, ".", LANG_MANIFEST_FILE].concat())?
&["voxygen.i18n.", asset_key, ".", LANG_MANIFEST_FILE].concat(),
)?
.cloned(); .cloned();
let mut localization = Language::from(raw); let mut localization = Language::from(raw);
@ -335,10 +333,11 @@ impl LocalizationHandle {
} }
pub fn load(specifier: &str) -> Result<Self, crate::assets::Error> { pub fn load(specifier: &str) -> Result<Self, crate::assets::Error> {
let default_key = REFERENCE_LANG; let default_key = ["voxygen.i18n.", REFERENCE_LANG].concat();
let is_default = specifier == default_key; let language_key = ["voxygen.i18n.", specifier].concat();
let is_default = language_key == default_key;
Ok(Self { Ok(Self {
active: Language::load(specifier)?, active: Language::load(&language_key)?,
fallback: if is_default { fallback: if is_default {
None None
} else { } else {
@ -383,16 +382,30 @@ impl assets::Compound for LocalizationList {
} }
/// Load all the available languages located in the voxygen asset directory /// Load all the available languages located in the voxygen asset directory
pub fn list_localizations() -> Vec<LanguageMetadata> { LocalizationList::load_expect_cloned("").0 } pub fn list_localizations() -> Vec<LanguageMetadata> {
LocalizationList::load_expect_cloned("voxygen.i18n").0
}
/// Start hot reloading of i18n assets /// Start hot reloading of i18n assets
pub fn start_hot_reloading() { assets::start_hot_reloading(); } pub fn start_hot_reloading() { assets::start_hot_reloading(); }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*;
use crate::analysis; use crate::analysis;
use std::path::Path; use std::path::Path;
// Test that localization list is loaded (not empty)
#[test]
fn test_localization_list() {
let list = list_localizations();
assert!(!list.is_empty());
}
// Test that reference language can be loaded
#[test]
fn test_localization_handle() { let _ = LocalizationHandle::load_expect(REFERENCE_LANG); }
// Test to verify all languages that they are VALID and loadable, without // Test to verify all languages that they are VALID and loadable, without
// need of git just on the local assets folder // need of git just on the local assets folder
#[test] #[test]