mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Support new plural keys format.

Browse Source 
All the old plural phrases were changed to work with the new format.
This commit is contained in:
John Preston
2017-06-02 14:46:02 +03:00
parent b6046d829f
commit 85e6f55536
27 changed files with 593 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/lang/lang_instance.h
View File

@@ -75,6 +75,11 @@ public:
Expects(_values.size() == kLangKeysCount);
return _values[key];
}
bool isNonDefaultPlural(LangKey key) {
Expects(key >= 0 && key < kLangKeysCount);
Expects(_nonDefaultSet.size() == kLangKeysCount);
return _nonDefaultSet[key] || _nonDefaultSet[key + 1] || _nonDefaultSet[key + 2] || _nonDefaultSet[key + 3] || _nonDefaultSet[key + 4] || _nonDefaultSet[key + 5];
}
private:
// SetCallback takes two QByteArrays: key, value.
@@ -85,7 +90,7 @@ private:
// Writes each key-value pair in the result container.
template <typename Result>
static void ParseKeyValue(const QByteArray &key, const QByteArray &value, Result &result);
static LangKey ParseKeyValue(const QByteArray &key, const QByteArray &value, Result &result);
void applyValue(const QByteArray &key, const QByteArray &value);
void resetValue(const QByteArray &key);
@@ -94,6 +99,7 @@ private:
void fillFromCustomFile(const QString &filePath);
void loadFromContent(const QByteArray &content);
void loadFromCustomContent(const QString &absolutePath, const QString &relativePath, const QByteArray &content);
void updatePluralRules();
QString _id;
int _legacyId = kLegacyLanguageNone;
@@ -106,6 +112,7 @@ private:
mutable QString _systemLanguage;
std::vector<QString> _values;
std::vector<uchar> _nonDefaultSet;
std::map<QByteArray, QByteArray> _nonDefaultValues;
};