diff --git a/resources/fonts/full/subset_characters.txt b/resources/fonts/full/subset_characters.txt index f5f9d9e5..1ab39be1 100644 --- a/resources/fonts/full/subset_characters.txt +++ b/resources/fonts/full/subset_characters.txt @@ -96,6 +96,7 @@ z ¿ Ê Î +Ö Ü à á @@ -120,9 +121,14 @@ z ą ć ę +ğ +İ +ı ł ń ś +Ş +ş ź ż Ș diff --git a/resources/fonts/subset/sarasa-mono-sc-bold.subset.ttf b/resources/fonts/subset/sarasa-mono-sc-bold.subset.ttf index 8639d77f..e6a27ac3 100644 Binary files a/resources/fonts/subset/sarasa-mono-sc-bold.subset.ttf and b/resources/fonts/subset/sarasa-mono-sc-bold.subset.ttf differ diff --git a/resources/fonts/subset/sarasa-mono-sc-regular.subset.ttf b/resources/fonts/subset/sarasa-mono-sc-regular.subset.ttf index 41ffdf80..b3c8f8bf 100644 Binary files a/resources/fonts/subset/sarasa-mono-sc-regular.subset.ttf and b/resources/fonts/subset/sarasa-mono-sc-regular.subset.ttf differ diff --git a/src/gui/pages/settings_language_page.rs b/src/gui/pages/settings_language_page.rs index e81ccdd3..8f9ab7fa 100644 --- a/src/gui/pages/settings_language_page.rs +++ b/src/gui/pages/settings_language_page.rs @@ -23,10 +23,13 @@ pub fn settings_language_page(sniffer: &Sniffer) -> Container { language_radios(language_active, &Language::COL1, font, sniffer.style); let col_language_radio_2 = language_radios(language_active, &Language::COL2, font, sniffer.style); + let col_language_radio_3 = + language_radios(language_active, &Language::COL3, font, sniffer.style); let row_language_radio = Row::new() .spacing(50) .push(col_language_radio_1) - .push(col_language_radio_2); + .push(col_language_radio_2) + .push(col_language_radio_3); let content = Column::new() .align_items(Alignment::Center) diff --git a/src/translations/translations.rs b/src/translations/translations.rs index f4b2cac1..d624a926 100644 --- a/src/translations/translations.rs +++ b/src/translations/translations.rs @@ -69,12 +69,11 @@ pub fn address_translation(language: Language) -> &'static str { Language::IT => "\nIndirizzo:", Language::FR | Language::DE => "\nAdresse:", Language::ES => "\nDirección:", - Language::PL => "\nAdres:", + Language::PL | Language::TR => "\nAdres:", Language::UK => "\nАдреса:", Language::ZH => "\n网络地址:", Language::RO => "\nAdresă:", Language::KO => "\n주소:", - Language::TR => "\nAdres:", } } @@ -382,7 +381,7 @@ pub fn some_observed_translation( Language::KO => format!("감지한 총 패킷: {observed}\n\n\ 필터링된 패킷: 0\n\n\ 일부 패킷이 감지되었지만, 지정한 필터에 따라 선택되지 않았습니다...\n\n{filters}"), - Language::TR => format!("Toplam yakalanan paketler: {observerd}\n\n\ + Language::TR => format!("Toplam yakalanan paketler: {observed}\n\n\ Filterelenen paketler: 0\n\n\ Bazı paketler yakalandı, fakat belirttiğiniz filtrelere göre hiç biri seçilmedi...\n\n{filters}") }) @@ -412,7 +411,7 @@ pub fn filtered_packets_translation( Language::KO => { format!("필터링된 패킷:\n {filtered} ({percentage} 의 일부)") } - Language::TR => format!("Filtrelenen paketler: \n {filtered} toplamın ({percentage})"), + Language::TR => format!("Filtrelenen paketler:\n {filtered} toplamın ({percentage})"), }) } @@ -735,7 +734,7 @@ pub fn active_filters_translation(language: Language) -> &'static str { Language::ZH => "活动的过滤器:", Language::RO => "Filtre active:", Language::KO => "활성화된 필터:", - Language::TR => "Aktif filtreler", + Language::TR => "Aktif filtreler:", } } @@ -872,11 +871,10 @@ pub fn style_translation(language: Language) -> &'static str { Language::IT => "Stile", Language::ES => "Estilo", Language::PL => "Styl", - Language::DE | Language::RO => "Stil", + Language::DE | Language::RO | Language::TR => "Stil", Language::UK => "Стиль", Language::ZH => "主题", Language::KO => "스타일", - Language::TR => "Stil", } } diff --git a/src/translations/types/language.rs b/src/translations/types/language.rs index bb80aadb..838f76a2 100644 --- a/src/translations/types/language.rs +++ b/src/translations/types/language.rs @@ -23,6 +23,8 @@ pub enum Language { RO, /// Korean KO, + /// Turkish + TR, } impl Default for Language { @@ -32,20 +34,9 @@ impl Default for Language { } impl Language { - pub(crate) const COL1: [Language; 5] = [ - Language::EN, - Language::ES, - Language::IT, - Language::PL, - Language::UK, - ]; - pub(crate) const COL2: [Language; 5] = [ - Language::DE, - Language::FR, - Language::KO, - Language::RO, - Language::ZH, - ]; + pub(crate) const COL1: [Language; 4] = [Language::EN, Language::FR, Language::PL, Language::UK]; + pub(crate) const COL2: [Language; 4] = [Language::DE, Language::IT, Language::RO, Language::ZH]; + pub(crate) const COL3: [Language; 3] = [Language::ES, Language::KO, Language::TR]; pub fn get_radio_label(&self) -> &str { match self { @@ -59,6 +50,7 @@ impl Language { Language::ZH => "简体中文", Language::RO => "Română", Language::KO => "한국인", + Language::TR => "Türkçe", } } } diff --git a/src/utils/countries.rs b/src/utils/countries.rs index 65e27c72..623c936a 100644 --- a/src/utils/countries.rs +++ b/src/utils/countries.rs @@ -516,6 +516,7 @@ pub fn get_flag_from_language_code(language: &str) -> Image { "KO" => KR, "PL" => PL, "RO" => RO, + "TR" => TR, "UK" => UA, _ => UNKNOWN, })))