From 1e5a100d6a1cec71fe173009bd2b754ca0b5bd3f Mon Sep 17 00:00:00 2001 From: Laurenz Date: Thu, 6 Apr 2023 14:59:05 +0200 Subject: [PATCH] Reorganize matches on languages --- library/src/layout/table.rs | 4 ++-- library/src/math/mod.rs | 2 +- library/src/meta/bibliography.rs | 8 +++++--- library/src/meta/heading.rs | 2 +- library/src/meta/outline.rs | 2 +- library/src/text/raw.rs | 7 ++++--- library/src/visualize/image.rs | 10 +++++++--- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/library/src/layout/table.rs b/library/src/layout/table.rs index 99418bdfe..ad6dc6842 100644 --- a/library/src/layout/table.rs +++ b/library/src/layout/table.rs @@ -292,11 +292,11 @@ impl LocalName for TableElem { Lang::GERMAN => "Tabelle", Lang::ITALIAN => "Tabella", Lang::NYNORSK => "Tabell", + Lang::POLISH => "Tabela", Lang::PORTUGUESE => "Tabela", - Lang::POLISH | Lang::PORTUGUESE => "Tabela", Lang::RUSSIAN => "Таблица", - Lang::SPANISH => "Tabla", Lang::SLOVENIAN => "Tabela", + Lang::SPANISH => "Tabla", Lang::UKRAINIAN => "Таблиця", Lang::ENGLISH | _ => "Table", } diff --git a/library/src/math/mod.rs b/library/src/math/mod.rs index c5dd6b8c8..ac9b4eccc 100644 --- a/library/src/math/mod.rs +++ b/library/src/math/mod.rs @@ -283,8 +283,8 @@ impl LocalName for EquationElem { Lang::POLISH => "Równanie", Lang::PORTUGUESE => "Equação", Lang::RUSSIAN => "Уравнение", - Lang::SPANISH => "Ecuación", Lang::SLOVENIAN => "Enačba", + Lang::SPANISH => "Ecuación", Lang::UKRAINIAN => "Рівняння", Lang::ENGLISH | _ => "Equation", } diff --git a/library/src/meta/bibliography.rs b/library/src/meta/bibliography.rs index 945970f03..ec6907e33 100644 --- a/library/src/meta/bibliography.rs +++ b/library/src/meta/bibliography.rs @@ -202,14 +202,16 @@ impl LocalName for BibliographyElem { fn local_name(&self, lang: Lang) -> &'static str { match lang { Lang::BOKMÅL => "Bibliografi", - Lang::GERMAN | Lang::FRENCH => "Bibliographie", Lang::CHINESE => "参考文献", + Lang::FRENCH => "Bibliographie", + Lang::GERMAN => "Bibliographie", Lang::ITALIAN => "Bibliografia", Lang::NYNORSK => "Bibliografi", - Lang::POLISH | Lang::PORTUGUESE => "Bibliografia", + Lang::POLISH => "Bibliografia", + Lang::PORTUGUESE => "Bibliografia", Lang::RUSSIAN => "Библиография", - Lang::SPANISH => "Bibliografía", Lang::SLOVENIAN => "Literatura", + Lang::SPANISH => "Bibliografía", Lang::UKRAINIAN => "Бібліографія", Lang::ENGLISH | _ => "Bibliography", } diff --git a/library/src/meta/heading.rs b/library/src/meta/heading.rs index e01d2ffdb..bddbb8012 100644 --- a/library/src/meta/heading.rs +++ b/library/src/meta/heading.rs @@ -238,8 +238,8 @@ impl LocalName for HeadingElem { Lang::POLISH => "Sekcja", Lang::PORTUGUESE => "Seção", Lang::RUSSIAN => "Раздел", - Lang::SPANISH => "Sección", Lang::SLOVENIAN => "Poglavje", + Lang::SPANISH => "Sección", Lang::UKRAINIAN => "Розділ", Lang::ENGLISH | _ => "Section", } diff --git a/library/src/meta/outline.rs b/library/src/meta/outline.rs index 55d35f147..b33eaeb8d 100644 --- a/library/src/meta/outline.rs +++ b/library/src/meta/outline.rs @@ -261,8 +261,8 @@ impl LocalName for OutlineElem { Lang::POLISH => "Spis treści", Lang::PORTUGUESE => "Sumário", Lang::RUSSIAN => "Содержание", - Lang::SPANISH => "Índice", Lang::SLOVENIAN => "Kazalo", + Lang::SPANISH => "Índice", Lang::UKRAINIAN => "Зміст", Lang::ENGLISH | _ => "Contents", } diff --git a/library/src/text/raw.rs b/library/src/text/raw.rs index 66164945a..5af93c0f6 100644 --- a/library/src/text/raw.rs +++ b/library/src/text/raw.rs @@ -204,14 +204,15 @@ impl LocalName for RawElem { match lang { Lang::BOKMÅL => "Utskrift", Lang::CHINESE => "代码", + Lang::FRENCH => "Liste", + Lang::GERMAN => "Listing", Lang::ITALIAN => "Codice", Lang::NYNORSK => "Utskrift", - Lang::RUSSIAN => "Листинг", - Lang::FRENCH => "Liste", Lang::POLISH => "Program", + Lang::RUSSIAN => "Листинг", Lang::SLOVENIAN => "Program", Lang::UKRAINIAN => "Лістинг", - Lang::ENGLISH | Lang::GERMAN | _ => "Listing", + Lang::ENGLISH | _ => "Listing", } } } diff --git a/library/src/visualize/image.rs b/library/src/visualize/image.rs index 03fa6c2f5..ed50e8829 100644 --- a/library/src/visualize/image.rs +++ b/library/src/visualize/image.rs @@ -120,13 +120,17 @@ impl LocalName for ImageElem { match lang { Lang::BOKMÅL => "Figur", Lang::CHINESE => "图", + Lang::FRENCH => "Figure", Lang::GERMAN => "Abbildung", + Lang::ITALIAN => "Figura", Lang::NYNORSK => "Figur", - Lang::ITALIAN | Lang::PORTUGUESE | Lang::SPANISH => "Figura", Lang::POLISH => "Rysunek", - Lang::RUSSIAN | Lang::UKRAINIAN => "Рисунок", + Lang::PORTUGUESE => "Figura", + Lang::RUSSIAN => "Рисунок", Lang::SLOVENIAN => "Slika", - Lang::ENGLISH | Lang::FRENCH | _ => "Figure", + Lang::SPANISH => "Figura", + Lang::UKRAINIAN => "Рисунок", + Lang::ENGLISH | _ => "Figure", } } }