procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix using of base langpack for custom languages.

This commit is contained in:
John Preston 2018-12-11 16:00:24 +04:00
parent ffd6f7b326
commit cf227490d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,6 @@ mtpRequestId CloudManager::packRequestId(Pack pack) const {
} }
void CloudManager::requestLangPackDifference(Pack pack) { void CloudManager::requestLangPackDifference(Pack pack) {
const auto base = (pack == Pack::Base);
request(base::take(packRequestId(pack))).cancel(); request(base::take(packRequestId(pack))).cancel();
if (_langpack.isCustom()) { if (_langpack.isCustom()) {
return; return;

4
Telegram/SourceFiles/lang/lang_instance.cpp
View File

@ -268,7 +268,7 @@ void Instance::setBaseId(const QString &baseId, const QString &pluralId) {
if (!_base) { if (!_base) {
_base = std::make_unique<Instance>(this, PrivateTag{}); _base = std::make_unique<Instance>(this, PrivateTag{});
} }
_base->switchToId({ baseId, _pluralId }); _base->switchToId({ baseId, pluralId });
} }
} }
@ -513,6 +513,8 @@ void Instance::fillFromSerialized(
"Could not read data from serialized langpack.")); "Could not read data from serialized langpack."));
return; return;
} }
} else {
stream >> base;
} }
if (!base.isEmpty()) { if (!base.isEmpty()) {
_base = std::make_unique<Instance>(this, PrivateTag{}); _base = std::make_unique<Instance>(this, PrivateTag{});