Multilingual bibliography

Cargo.toml

@@ -43,7 +43,7 @@ ecow = { version = "0.2", features = ["serde"] }
 env_proxy = "0.4"
 flate2 = "1"
 fontdb = { version = "0.15", default-features = false }
-hayagriva = "0.5.1"
+hayagriva = {git = "https://github.com/nrydanov/hayagriva", branch = "feature/language-specific-terms"}
 heck = "0.4"
 hypher = "0.1.4"
 iai = { git = "https://github.com/typst/iai", rev = "3f0f927" }

crates/typst/Cargo.toml

@@ -26,7 +26,7 @@ comemo = { workspace = true }
 csv = { workspace = true }
 ecow = { workspace = true}
 fontdb = { workspace = true }
-hayagriva = { workspace = true }
+hayagriva = { git = "https://github.com/nrydanov/hayagriva", branch = "feature/language-specific-terms" }
 hypher = { workspace = true }
 icu_properties = { workspace = true }
 icu_provider = { workspace = true }

crates/typst/src/model/bibliography.rs

@@ -9,6 +9,7 @@ use std::sync::Arc;
 use comemo::{Prehashed, Tracked};
 use ecow::{eco_format, EcoString, EcoVec};
 use hayagriva::archive::ArchivedStyle;
+use hayagriva::citationberg::LocaleCode;
 use hayagriva::io::BibLaTeXError;
 use hayagriva::{
  citationberg, BibliographyDriver, BibliographyRequest, CitationItem, CitationRequest,
@@ -711,9 +712,23 @@ impl<'a> Generator<'a> {
  Some(CitationForm::Year) => Some(hayagriva::CitePurpose::Year),
  };
 
+ let mut locale: Option<citationberg::LocaleCode> = None;
+ if let Some(lang) = entry.language() {
+ let lang_string = lang.language.as_str();
+ if let Some(value) = hayagriva::lang::codes::get_mapping(lang_string)
+ {
+ locale = Some(LocaleCode(String::from(value)));
+ }
+ }
  normal &= special_form.is_none();
  subinfos.push(CiteInfo { key, supplement, hidden });
- items.push(CitationItem::new(entry, locator, None, hidden, special_form));
+ items.push(CitationItem::new(
+ entry,
+ locator,
+ locale,
+ hidden,
+ special_form,
+ ));
  }
 
  if !errors.is_empty() {
@@ -749,10 +764,18 @@ impl<'a> Generator<'a> {
  // bibliography.
  if self.bibliography.full(StyleChain::default()) {
  for entry in database.map.values() {
+ let mut locale: Option<citationberg::LocaleCode> = None;
+ if let Some(lang) = entry.language() {
+ let lang_string = lang.language.as_str();
+ if let Some(value) = hayagriva::lang::codes::get_mapping(lang_string)
+ {
+ locale = Some(LocaleCode(String::from(value)));
+ }
+ }
  driver.citation(CitationRequest::new(
- vec![CitationItem::new(entry, None, None, true, None)],
+ vec![CitationItem::new(entry, None, locale, true, None)],
  bibliography_style.get(),
- Some(locale.clone()),
+ None,
  &LOCALES,
  None,
  ));