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

Prefix client-side lang_code-s with #.

Browse Source
This commit is contained in:
John Preston
2018-10-26 13:08:21 +04:00
parent 711b8cfa36
commit 3447aac940
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,13 +185,15 @@ void CloudManager::applyLangPackData(const MTPDlangPackDifference &data) {
} else if (!data.vstrings.v.isEmpty()) {
_langpack.applyDifference(data);
Local::writeLangPack();
} else if (_restartAfterSwitch) {
Local::writeLangPack();
} else {
LOG(("Lang Info: Up to date."));
}
}
bool CloudManager::canApplyWithoutRestart(const QString &id) const {
if (id == qstr("TEST_X") || id == qstr("TEST_0")) {
if (id == qstr("#TEST_X") || id == qstr("#TEST_0")) {
return true;
}
@@ -207,12 +209,12 @@ void CloudManager::switchToLanguage(QString id) {
if (id.isEmpty()) {
id = DefaultLanguageId();
}
if (_langpack.id() == id && id != qstr("custom")) {
if (_langpack.id() == id && id != qstr("#custom")) {
return;
}
request(_switchingToLanguageRequest).cancel();
if (id == qstr("custom")) {
if (id == qstr("#custom")) {
performSwitchToCustom();
} else if (canApplyWithoutRestart(id)) {
performSwitch(id);
@@ -258,7 +260,7 @@ void CloudManager::performSwitchToCustom() {
Lang::FileParser loader(filePath, { lng_sure_save_language });
if (loader.errors().isEmpty()) {
weak->request(weak->_switchingToLanguageRequest).cancel();
if (weak->canApplyWithoutRestart(qsl("custom"))) {
if (weak->canApplyWithoutRestart(qsl("#custom"))) {
weak->_langpack.switchToCustomFile(filePath);
} else {
const auto values = loader.found();
@@ -292,7 +294,9 @@ void CloudManager::performSwitchToCustom() {
}
void CloudManager::switchToTestLanguage() {
auto testLanguageId = (_langpack.id() == qstr("TEST_X")) ? qsl("TEST_0") : qsl("TEST_X");
const auto testLanguageId = (_langpack.id() == qstr("#TEST_X"))
? qsl("#TEST_0")
: qsl("#TEST_X");
performSwitch(testLanguageId);
}