mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-10-31 05:28:09 -06:00
Merge upstream main 88dad98d into pr/attachments
Merged cleanly, no conflicts. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -56,7 +56,7 @@ const AR_DAYS: [&str; 7] = ["الأحد", "الاثنين", "الثلاثاء",
|
||||
|
||||
/// The languages month and weekday names can be written in (Preferences ▸ Date format ▸ Language):
|
||||
/// the interface languages, in the same order and with the same names.
|
||||
pub static DATE_LANGUAGES: [DateLanguage; 23] = [
|
||||
pub static DATE_LANGUAGES: [DateLanguage; 24] = [
|
||||
DateLanguage {
|
||||
code: "en",
|
||||
name: "English",
|
||||
@@ -398,6 +398,15 @@ pub static DATE_LANGUAGES: [DateLanguage; 23] = [
|
||||
days: ["Chủ Nhật", "Thứ Hai", "Thứ Ba", "Thứ Tư", "Thứ Năm", "Thứ Sáu", "Thứ Bảy"],
|
||||
days_short: ["CN", "T2", "T3", "T4", "T5", "T6", "T7"],
|
||||
},
|
||||
DateLanguage {
|
||||
code: "nb",
|
||||
name: "Norsk bokmål",
|
||||
months: ["januar", "februar", "mars", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "desember"],
|
||||
months_with_day: None,
|
||||
months_short: ["jan.", "feb.", "mar.", "apr.", "mai", "jun.", "jul.", "aug.", "sep.", "okt.", "nov.", "des."],
|
||||
days: ["søndag", "mandag", "tirsdag", "onsdag", "torsdag", "fredag", "lørdag"],
|
||||
days_short: ["søn.", "man.", "tir.", "ons.", "tor.", "fre.", "lør."],
|
||||
},
|
||||
];
|
||||
|
||||
/// The date language for `code` (any case), or `None` when there's none.
|
||||
@@ -701,6 +710,8 @@ mod tests {
|
||||
assert_eq!(in_lang("yyyy\\年mmmmd\\日 dddd", "ja"), "2026年3月7日 土曜日");
|
||||
assert_eq!(in_lang("yyyy\\年mmmmd\\日 dddd", "zh-hans"), "2026年三月7日 星期六");
|
||||
assert_eq!(in_lang("ddd", "zh-hant"), "週六");
|
||||
assert_eq!(in_lang("dddd d. mmmm yyyy", "nb"), "lørdag 7. mars 2026");
|
||||
assert_eq!(in_lang("ddd d. mmm", "nb"), "lør. 7. mar.");
|
||||
assert_eq!(date_language("PT-BR").map(|l| l.code), Some("pt-br"));
|
||||
assert!(date_language("xx").is_none());
|
||||
for l in &DATE_LANGUAGES {
|
||||
@@ -765,6 +776,7 @@ mod tests {
|
||||
assert_eq!(unwritable("8. října 2026"), "ř");
|
||||
assert_eq!(unwritable("2026年10月8日"), "年月日");
|
||||
assert_eq!(unwritable("sábado, 7 de março – 2026?"), "", "Western European, dashes and ? are fine");
|
||||
assert_eq!(unwritable("lørdag 7. mars, søn. 8. mai (æøå ÆØÅ)"), "", "Norwegian letters are Western European");
|
||||
let mut s = Session::new().with_clock(|| 1_700_000_000);
|
||||
s.set_date_format("d. mmmm yyyy").unwrap();
|
||||
assert_eq!(s.today_text_for_pdf(None, Some("es")).as_deref(), Ok("14. noviembre 2023"));
|
||||
|
||||
Reference in New Issue
Block a user