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

feat: renamed get_message to try_get_message, added infallible alternative

Browse source
This commit is contained in:
zaaarf 2024-05-15 18:26:07 +02:00
parent a497b3ad5b
commit 31f0392878
No known key found for this signature in database
GPG key ID: 102E445F4C3F829B
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib.rs
View file

@ -118,7 +118,7 @@ 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: &str, language: &str, args: Option<&FluentArgs>) -> Result<String> { pub fn try_get_message(&self, key: &str, language: &str, args: Option<&FluentArgs>) -> Result<String> {
let bundle = 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()))?;
@ -135,4 +135,10 @@ impl Localiser {
Err(error::Error::FluentError(err)) Err(error::Error::FluentError(err))
} }
} }
/// Similar to [Localiser::try_get_message], but returns the given key on failure.
pub fn get_message(&self, key: &str, language: &str, args: Option<&FluentArgs>) -> String {
self.try_get_message(key, language, args)
.unwrap_or(key.to_string())
}
} }