use preferred language for config file retrieval

This commit is contained in:
John
2023-01-02 20:00:58 +01:00
parent 4263c98f04
commit eb007fe381
4 changed files with 22 additions and 4 deletions
+5
View File
@@ -222,6 +222,11 @@ class MappedFileReader : public FileReader {
*/
static const string normalizeLanguage(const string& lang);
/**
* @return the preferred language code (up to 2 characters), or empty.
*/
const string getPreferLanguage() const { return m_preferLanguage; }
// @copydoc
result_t readFromStream(istream* stream, const string& filename, const time_t& mtime, bool verbose,
map<string, string>* defaults, string* errorDescription, bool replace = false, size_t* hash = nullptr,
+1 -1
View File
@@ -1267,7 +1267,7 @@ class MessageMap : public MappedFileReader {
* @param deleteData whether to delete the scan message @a DataField during @a Message destruction.
*/
explicit MessageMap(bool addAll = false, const string& preferLanguage = "", bool deleteData = true)
: MappedFileReader::MappedFileReader(true),
: MappedFileReader::MappedFileReader(true, preferLanguage),
m_addAll(addAll), m_additionalScanMessages(false), m_maxIdLength(0), m_maxBroadcastIdLength(0),
m_messageCount(0), m_conditionalMessageCount(0), m_passiveMessageCount(0) {
m_scanMessage = Message::createScanMessage(false, deleteData);