core/desktopentry: fix locale matching to ignore mismatched modifiers/territories

Author: bbedward

src/core/desktopentry.cpp

@@ -61,12 +61,19 @@ struct Locale {
 
 	[[nodiscard]] int matchScore(const Locale& other) const {
 		if (this->language != other.language) return 0;
-		auto territoryMatches = !this->territory.isEmpty() && this->territory == other.territory;
-		auto modifierMatches = !this->modifier.isEmpty() && this->modifier == other.modifier;
 
-		auto score = 1;
-		if (territoryMatches) score += 2;
-		if (modifierMatches) score += 1;
+		// If candidate specifies a modifier, it must match
+		if (!other.modifier.isEmpty() && this->modifier != other.modifier) return 0;
+
+		// If candidate specifies a territory, it must match
+		if (!other.territory.isEmpty() && this->territory != other.territory) return 0;
+
+		// Base language match
+		int score = 1;
+
+		// Reward specificity when it matches
+		if (!other.territory.isEmpty()) score += 2;
+		if (!other.modifier.isEmpty()) score += 1;
 
 		return score;
 	}
@@ -178,11 +185,21 @@ ParsedDesktopEntryData DesktopEntry::parseText(const QString& id, const QString&
 
 		if (entries.contains(key)) {
 			const auto& old = entries.value(key);
+			const int oldScore = system.matchScore(old.first);
+			const int newScore = system.matchScore(locale);
 
-			auto oldScore = system.matchScore(old.first);
-			auto newScore = system.matchScore(locale);
+			bool shouldReplace = false;
+
+			if (newScore > oldScore) {
+				shouldReplace = true;
+			} else if (newScore == oldScore) {
+				// Prefer unlocalized (invalid locale) when both scores tie (usually 0)
+				if (!locale.isValid() && old.first.isValid()) {
+					shouldReplace = true;
+				}
+			}
 
-			if (newScore > oldScore || (oldScore == 0 && !locale.isValid())) {
+			if (shouldReplace) {
 				entries.insert(key, qMakePair(locale, value));
 			}
 		} else {