Added translations for the automatic collection names when used as theme system variables

This commit is contained in:
Leon Styhre 2024-08-31 13:04:17 +02:00
parent 965ece8a85
commit ff091a9d83

View file

@ -1604,14 +1604,18 @@ void SystemData::loadTheme(ThemeTriggers::TriggerType trigger)
// to the variables that are not applicable. This will be used in ThemeData to make sure // to the variables that are not applicable. This will be used in ThemeData to make sure
// unpopulated system variables do not lead to theme loading errors. // unpopulated system variables do not lead to theme loading errors.
std::map<std::string, std::string> sysData; std::map<std::string, std::string> sysData;
std::string fullName {getFullName()};
// Always translate fullName for the automatic collections.
if (isCollection() && !isCustomCollection())
fullName = _(fullName.c_str());
sysData.insert(std::pair<std::string, std::string>("system.name", getName())); sysData.insert(std::pair<std::string, std::string>("system.name", getName()));
sysData.insert(std::pair<std::string, std::string>("system.theme", getThemeFolder())); sysData.insert(std::pair<std::string, std::string>("system.theme", getThemeFolder()));
sysData.insert(std::pair<std::string, std::string>("system.fullName", getFullName())); sysData.insert(std::pair<std::string, std::string>("system.fullName", fullName));
if (isCollection() && isCustomCollection()) { if (isCollection() && isCustomCollection()) {
sysData.insert( sysData.insert(
std::pair<std::string, std::string>("system.name.customCollections", getName())); std::pair<std::string, std::string>("system.name.customCollections", getName()));
sysData.insert(std::pair<std::string, std::string>("system.fullName.customCollections", sysData.insert(
getFullName())); std::pair<std::string, std::string>("system.fullName.customCollections", fullName));
sysData.insert(std::pair<std::string, std::string>("system.theme.customCollections", sysData.insert(std::pair<std::string, std::string>("system.theme.customCollections",
getThemeFolder())); getThemeFolder()));
sysData.insert( sysData.insert(
@ -1628,8 +1632,8 @@ void SystemData::loadTheme(ThemeTriggers::TriggerType trigger)
else if (isCollection()) { else if (isCollection()) {
sysData.insert( sysData.insert(
std::pair<std::string, std::string>("system.name.autoCollections", getName())); std::pair<std::string, std::string>("system.name.autoCollections", getName()));
sysData.insert(std::pair<std::string, std::string>("system.fullName.autoCollections", sysData.insert(
getFullName())); std::pair<std::string, std::string>("system.fullName.autoCollections", fullName));
sysData.insert(std::pair<std::string, std::string>("system.theme.autoCollections", sysData.insert(std::pair<std::string, std::string>("system.theme.autoCollections",
getThemeFolder())); getThemeFolder()));
sysData.insert( sysData.insert(
@ -1646,8 +1650,8 @@ void SystemData::loadTheme(ThemeTriggers::TriggerType trigger)
else { else {
sysData.insert( sysData.insert(
std::pair<std::string, std::string>("system.name.noCollections", getName())); std::pair<std::string, std::string>("system.name.noCollections", getName()));
sysData.insert(std::pair<std::string, std::string>("system.fullName.noCollections", sysData.insert(
getFullName())); std::pair<std::string, std::string>("system.fullName.noCollections", fullName));
sysData.insert(std::pair<std::string, std::string>("system.theme.noCollections", sysData.insert(std::pair<std::string, std::string>("system.theme.noCollections",
getThemeFolder())); getThemeFolder()));
sysData.insert( sysData.insert(