zaaarf/fluent-fluently
1
0
Fork 0
mirror of https://github.com/zaaarf/fluent-fluently.git synced 2024-11-22 19:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat: more intuitive get_message function

Browse source
This commit is contained in:
zaaarf 2024-02-14 16:14:33 +01:00
parent d75ec22464
commit 970f7ec875
No known key found for this signature in database
GPG key ID: 102E445F4C3F829B
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/lib.rs
View file

@ -14,7 +14,7 @@
//! certainly check whether a language is available manually if you so wish. //! certainly check whether a language is available manually if you so wish.
use std::{collections::HashMap, sync::Arc}; use std::{collections::HashMap, sync::Arc};
use fluent::{bundle::FluentBundle, FluentResource, FluentMessage}; use fluent::{bundle::FluentBundle, FluentResource, FluentArgs};
use intl_memoizer::concurrent::IntlLangMemoizer; use intl_memoizer::concurrent::IntlLangMemoizer;
use unic_langid::LanguageIdentifier; use unic_langid::LanguageIdentifier;
use crate::error::Result; use crate::error::Result;
@ -118,11 +118,21 @@ impl Localiser {
} }
/// Extracts a message from the requested bundle, or from the default one if absent. /// Extracts a message from the requested bundle, or from the default one if absent.
pub fn get_message(&self, key: String, language: String) -> Result<FluentMessage> { pub fn get_message(&self, key: &str, language: &str, args: Option<&FluentArgs>) -> Result<String> {
self.bundles.get(&language) let bundle = self.bundles.get(language)
.or_else(|| self.bundles.get(&self.default_language)) .or_else(|| self.bundles.get(&self.default_language))
.ok_or(error::Error::GenericError("Failed to get default bundle! This is not supposed to happen!".to_string()))? .ok_or(error::Error::GenericError("Failed to get default bundle! This is not supposed to happen!".to_string()))?;
.get_message(&key)
.ok_or(error::Error::MissingMessageError(format!("No such message {} for language {}!", key, language))) let pattern = bundle.get_message(key)
.and_then(|msg| msg.value())
.ok_or(error::Error::MissingMessageError(format!("No such message {} for language {}!", key, language)))?;
let mut err = Vec::new();
let res = bundle.format_pattern(pattern, args, &mut err);
if err.is_empty() {
Ok(res.to_string())
} else {
Err(error::Error::FluentError(err))
}
} }
} }