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

Remove LangKey.

Browse Source
This commit is contained in:
John Preston
2019-06-19 17:42:16 +02:00
parent 87fc066e67
commit edcd09c29f
16 changed files with 97 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/lang/lang_cloud_manager.cpp
View File

@@ -468,7 +468,7 @@ void CloudManager::switchToLanguage(const Language &data) {
)).done([=](const MTPVector<MTPLangPackString> &result) {
_switchingToLanguageRequest = 0;
const auto values = Instance::ParseStrings(result);
const auto getValue = [&](LangKey key) {
const auto getValue = [&](ushort key) {
auto it = values.find(key);
return (it == values.cend())
? GetOriginalValue(key)
@@ -476,7 +476,7 @@ void CloudManager::switchToLanguage(const Language &data) {
};
const auto text = tr::lng_sure_save_language(tr::now)
+ "\n\n"
+ getValue(lng_sure_save_language);
+ getValue(tr::lng_sure_save_language.base);
Ui::show(
Box<ConfirmBox>(
text,
@@ -498,15 +498,17 @@ void CloudManager::performSwitchToCustom() {
return;
}
auto filePath = result.paths.front();
Lang::FileParser loader(filePath, { lng_sure_save_language });
const auto filePath = result.paths.front();
auto loader = Lang::FileParser(
filePath,
{ tr::lng_sure_save_language.base });
if (loader.errors().isEmpty()) {
weak->request(weak->_switchingToLanguageRequest).cancel();
if (weak->canApplyWithoutRestart(qsl("#custom"))) {
weak->_langpack.switchToCustomFile(filePath);
} else {
const auto values = loader.found();
const auto getValue = [&](LangKey key) {
const auto getValue = [&](ushort key) {
const auto it = values.find(key);
return (it == values.cend())
? GetOriginalValue(key)
@@ -514,7 +516,7 @@ void CloudManager::performSwitchToCustom() {
};
const auto text = tr::lng_sure_save_language(tr::now)
+ "\n\n"
+ getValue(lng_sure_save_language);
+ getValue(tr::lng_sure_save_language.base);
const auto change = [=] {
weak->_langpack.switchToCustomFile(filePath);
App::restart();