loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Compare language codes in MessageContent::Choose()

Browse Source 
If there is no exact match, compare language codes so that a more
generic match is preferred over just returning the English content.

This means that if a locale code is given, Choose() will also look for
the locale's language code (but will not match another locale with the
same language code), and if a language code is given, Choose() will also
look for a locale with that language code.
This commit is contained in:
Oliver Hamlet
2021-03-28 22:31:14 +01:00
parent 12ed2de739
commit cd978bb215
3 changed files with 151 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/loot/metadata/message_content.h
+26 -11
View File
@@ -37,7 +37,7 @@ class MessageContent {
public:
/**
* The code for the default language assumed for message content, which is
* English.
* "en" (English).
*/
LOOT_API static const std::string defaultLanguage;
@@ -73,7 +73,7 @@ public:
/**
* A less-than operator implemented with no semantics so that MessageContent
* objects can be stored in sets.
* @returns True if this MessageContent is less than the given
* @returns True if this MessageContent is less than the given
* MessageContent, false otherwise.
*/
LOOT_API bool operator<(const MessageContent& rhs) const;
@@ -89,11 +89,26 @@ public:
* @param content
* The MessageContent objects to choose between.
* @param language
* The language code for the preferred language to select. If no
* message in the preferred language is present, the English
* MessageContent will be returned.
* @return A MessageContent object. If the given vector is empty, a
* default-constructed MessageContent is returned.
* The locale or language code for the preferred language to select.
* Locale codes are of the form <language code>_<country code>.
* @return A MessageContent object.
*
* If the vector only contains a single element, that element is
* returned.
*
* If content with a language that exactly matches the given locale
* or language code is present, that content is returned.
*
* If a locale code is given and there is no exact match but content
* for that locale's language is present, that content is returned.
*
* If a language code is given and there is no exact match but content
* for a locale in that langauge is present, that content is returned.
*
* If no locale or language code matches are found and content in the
* default language is present, that content is returned.
*
* Otherwise, a default-constructed MessageContent is returned.
*/
LOOT_API static MessageContent Choose(
const std::vector<MessageContent> content,
@@ -111,9 +126,9 @@ private:
LOOT_API bool operator!=(const MessageContent& lhs, const MessageContent& rhs);
/**
* Check if the first MessageContent object is greater than the second
* Check if the first MessageContent object is greater than the second
* MessageContent object.
* @returns True if the second MessageContent object is less than the first
* @returns True if the second MessageContent object is less than the first
* MessageContent object, false otherwise.
*/
LOOT_API bool operator>(const MessageContent& lhs, const MessageContent& rhs);
@@ -121,13 +136,13 @@ LOOT_API bool operator>(const MessageContent& lhs, const MessageContent& rhs);
/**
* Check if the first MessageContent object is less than or equal to the second
* MessageContent object.
* @returns True if the first MessageContent object is not greater than the
* @returns True if the first MessageContent object is not greater than the
* second MessageContent object, false otherwise.
*/
LOOT_API bool operator<=(const MessageContent& lhs, const MessageContent& rhs);
/**
* Check if the first MessageContent object is greater than or equal to the
* Check if the first MessageContent object is greater than or equal to the
* second MessageContent object.
* @returns True if the first MessageContent object is not less than the second
* MessageContent object, false otherwise.