mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-03 16:05:57 +00:00
Code Issues Releases Wiki Activity

Switched default language for skip translation to application language.

Browse Source
This commit is contained in:
23rd
2022-11-23 03:12:07 +03:00
committed by John Preston
parent 4b2d8b0c53
commit 551bf4f9a7
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/boxes/language_box.cpp
View File

@@ -1123,13 +1123,27 @@ void LanguageBox::prepare() {
tr::lng_translate_settings_choose(), tr::lng_translate_settings_choose(),
label->events() | rpl::map(Ui::LanguageName), label->events() | rpl::map(Ui::LanguageName),
st::settingsButtonNoIcon); st::settingsButtonNoIcon);
label->fire(QLocale(Core::App().settings().skipTranslationForLanguage()));
{
const auto settingsLang =
Core::App().settings().skipTranslationForLanguage();
const auto locale = (settingsLang == QLocale::English)
? QLocale(Lang::LanguageIdOrDefault(Lang::Id()))
: (settingsLang == QLocale::C)
? QLocale(QLocale::English)
: QLocale(settingsLang);
label->fire_copy(locale);
}
translateSkip->setClickedCallback([=] { translateSkip->setClickedCallback([=] {
Ui::BoxShow(this).showBox( Ui::BoxShow(this).showBox(
Box(Ui::ChooseLanguageBox, [=](QLocale locale) { Box(Ui::ChooseLanguageBox, [=](QLocale locale) {
label->fire(QLocale(locale)); label->fire_copy(locale);
const auto result = (locale.language() == QLocale::English)
? QLocale::c()
: locale;
Core::App().settings().setSkipTranslationForLanguage( Core::App().settings().setSkipTranslationForLanguage(
locale.language()); result.language());
Core::App().saveSettingsDelayed();
}), }),
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
}); });

17
Telegram/SourceFiles/boxes/translate_box.cpp
View File

@@ -144,8 +144,13 @@ void TranslateBox(
box->setWidth(st::boxWideWidth); box->setWidth(st::boxWideWidth);
box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); }); box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
const auto container = box->verticalLayout(); const auto container = box->verticalLayout();
const auto defaultId = QLocale( const auto settingsLang =
Core::App().settings().skipTranslationForLanguage()).name().mid(0, 2); Core::App().settings().skipTranslationForLanguage();
const auto defaultId = (settingsLang == QLocale::English)
? Lang::LanguageIdOrDefault(Lang::Id())
: (settingsLang == QLocale::C)
? u"en"_q
: QLocale(settingsLang).name().mid(0, 2);
const auto api = box->lifetime().make_state<MTP::Sender>( const auto api = box->lifetime().make_state<MTP::Sender>(
&peer->session().mtp()); &peer->session().mtp());
@@ -327,7 +332,13 @@ bool SkipTranslate(TextWithEntities textWithEntities) {
if (result.unknown) { if (result.unknown) {
return false; return false;
} }
const auto skip = Core::App().settings().skipTranslationForLanguage(); const auto settingsLang =
Core::App().settings().skipTranslationForLanguage();
const auto skip = (settingsLang == QLocale::English)
? QLocale(Lang::LanguageIdOrDefault(Lang::Id())).language()
: (settingsLang == QLocale::C)
? QLocale::English
: settingsLang;
return (result.locale.language() == skip); return (result.locale.language() == skip);
} }

2
cmake

Submodule cmake updated: 2c341a0d3e...bec3e52392