mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-02 07:25:46 +00:00
Code Issues Releases Wiki Activity

Move lang keys to td_lang library.

Browse Source
This commit is contained in:
John Preston
2020-09-30 12:11:44 +03:00
parent def1266216
commit 8634c1f7f3
41 changed files with 271 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,7 +196,7 @@ std::pair<Languages, Languages> PrepareLists() {
const auto projId = [](const Language &language) {
return language.id;
};
const auto current = Lang::LanguageIdOrDefault(Lang::Current().id());
const auto current = Lang::LanguageIdOrDefault(Lang::Id());
auto official = Lang::CurrentCloudManager().languageList();
auto recent = Local::readRecentLanguages();
ranges::stable_partition(recent, [&](const Language &language) {
@@ -207,13 +207,13 @@ std::pair<Languages, Languages> PrepareLists() {
const auto generate = [&] {
const auto name = (current == "#custom")
? "Custom lang pack"
: Lang::Current().name();
: Lang::GetInstance().name();
return Language{
current,
QString(),
QString(),
name,
Lang::Current().nativeName()
Lang::GetInstance().nativeName()
};
};
const auto i = ranges::find(official, current, projId);
@@ -867,7 +867,7 @@ void Content::setupContent(
const Languages &official) {
using namespace rpl::mappers;
const auto current = Lang::LanguageIdOrDefault(Lang::Current().id());
const auto current = Lang::LanguageIdOrDefault(Lang::Id());
const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
const auto add = [&](const Languages &list, bool areOfficial) {
if (list.empty()) {
@@ -1101,7 +1101,7 @@ void LanguageBox::prepare() {
// "#custom" is applied each time it's passed to switchToLanguage().
// So we check that the language really has changed.
const auto currentId = [] {
return Lang::LanguageIdOrDefault(Lang::Current().id());
return Lang::LanguageIdOrDefault(Lang::Id());
};
if (language.id != currentId()) {
Lang::CurrentCloudManager().switchToLanguage(language);