Skip to content

Remove spuriuous ICU errors from the logs #4132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2025
Merged

Remove spuriuous ICU errors from the logs #4132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions crates/i18n/src/translator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ const FALLBACKER: LocaleFallbackerWithConfig<'static> = LocaleFallbacker::new().
config
});

/// Construct a [`DataRequest`] for the given locale
pub fn data_request_for_locale(locale: &DataLocale) -> DataRequest<'_> {
let mut metadata = DataRequestMetadata::default();
metadata.silent = true;
DataRequest { locale, metadata }
}

/// Error type for loading translations
#[derive(Debug, Error)]
pub enum LoadError {
Expand Down Expand Up @@ -200,19 +207,16 @@ impl Translator {
/// Returns an error if the requested locale is not found, or if the
/// requested key is not found.
pub fn message(&self, locale: &DataLocale, key: &str) -> Result<&Message, DataError> {
let request = DataRequest {
locale,
metadata: DataRequestMetadata::default(),
};
let request = data_request_for_locale(locale);

let tree = self
.translations
.get(locale)
.ok_or(DataErrorKind::MissingLocale.with_req(DATA_KEY, request))?;
.ok_or_else(|| DataErrorKind::MissingLocale.with_req(DATA_KEY, request))?;

let message = tree
.message(key)
.ok_or(DataErrorKind::MissingDataKey.with_req(DATA_KEY, request))?;
.ok_or_else(|| DataErrorKind::MissingDataKey.with_req(DATA_KEY, request))?;

Ok(message)
}
Expand Down Expand Up @@ -273,19 +277,16 @@ impl Translator {
let plurals = PluralRules::try_new_cardinal_unstable(&self.plural_provider, locale)?;
let category = plurals.category_for(count);

let request = DataRequest {
locale,
metadata: DataRequestMetadata::default(),
};
let request = data_request_for_locale(locale);

let tree = self
.translations
.get(locale)
.ok_or(DataErrorKind::MissingLocale.with_req(DATA_KEY, request))?;
.ok_or_else(|| DataErrorKind::MissingLocale.with_req(DATA_KEY, request))?;

let message = tree
.pluralize(key, category)
.ok_or(DataErrorKind::MissingDataKey.with_req(DATA_KEY, request))?;
.ok_or_else(|| DataErrorKind::MissingDataKey.with_req(DATA_KEY, request))?;

Ok(message)
}
Expand Down
Loading