Changed some translation hinting to use context information instead

This commit is contained in:
Leon Styhre 2024-07-23 19:28:08 +02:00
parent f4d1534bab
commit ea2f29a5c9
4 changed files with 52 additions and 53 deletions

View file

@ -33,7 +33,7 @@ namespace
{"genre", MD_STRING, "unknown", false, "GENRE", "ENTER GENRE", true},
{"players", MD_STRING, "unknown", false, "PLAYERS", "ENTER NUMBER OF PLAYERS", true},
{"favorite", MD_BOOL, "false", false, "FAVORITE", "ENTER FAVORITE OFF/ON", false},
{"completed", MD_BOOL, "false", false, "COMPLETED [metadata]", "ENTER COMPLETED OFF/ON", false},
{"completed", MD_BOOL, "false", false, "COMPLETED", "ENTER COMPLETED OFF/ON", false},
{"kidgame", MD_BOOL, "false", false, "KIDGAME", "ENTER KIDGAME OFF/ON", false},
{"hidden", MD_BOOL, "false", false, "HIDDEN", "ENTER HIDDEN OFF/ON", false},
{"broken", MD_BOOL, "false", false, "BROKEN/NOT WORKING", "ENTER BROKEN OFF/ON", false},
@ -57,7 +57,7 @@ namespace
{"genre", MD_STRING, "unknown", false, "GENRE", "ENTER GENRE", true},
{"players", MD_STRING, "unknown", false, "PLAYERS", "ENTER NUMBER OF PLAYERS", true},
{"favorite", MD_BOOL, "false", false, "FAVORITE", "ENTER FAVORITE OFF/ON", false},
{"completed", MD_BOOL, "false", false, "COMPLETED [metadata]", "ENTER COMPLETED OFF/ON", false},
{"completed", MD_BOOL, "false", false, "COMPLETED", "ENTER COMPLETED OFF/ON", false},
{"kidgame", MD_BOOL, "false", false, "KIDGAME (ONLY AFFECTS BADGES)", "ENTER KIDGAME OFF/ON", false},
{"hidden", MD_BOOL, "false", false, "HIDDEN", "ENTER HIDDEN OFF/ON", false},
{"broken", MD_BOOL, "false", false, "BROKEN/NOT WORKING", "ENTER BROKEN OFF/ON", false},
@ -189,43 +189,42 @@ void MetaDataList::resetChangedFlag()
#if defined(GETTEXT_DUMMY_ENTRIES)
void gettextMessageCatalogEntries()
{
_("NAME");
_("ENTER NAME");
_("SORTNAME");
_("ENTER SORTNAME");
_("CUSTOM COLLECTIONS SORTNAME");
_("ENTER COLLECTIONS SORTNAME");
_("DESCRIPTION");
_("ENTER DESCRIPTION");
_("RATING");
_("RELEASE DATE");
_("ENTER RELEASE DATE");
_("DEVELOPER");
_("ENTER DEVELOPER");
_("PUBLISHER");
_("ENTER PUBLISHER");
_("GENRE");
_("ENTER GENRE");
_("PLAYERS");
_("ENTER NUMBER OF PLAYERS");
_("FAVORITE");
_("COMPLETED [metadata]");
_("KIDGAME");
_("KIDGAME (ONLY AFFECTS BADGES)");
_("HIDDEN");
_("BROKEN/NOT WORKING");
_("EXCLUDE FROM GAME COUNTER");
_("EXCLUDE FROM MULTI-SCRAPER");
_("HIDE METADATA FIELDS");
_("TIMES PLAYED");
_("ENTER NUMBER OF TIMES PLAYED");
_("CONTROLLER");
_("SELECT CONTROLLER");
_("ALTERNATIVE EMULATOR");
_("SELECT ALTERNATIVE EMULATOR");
_("FOLDER LINK");
_("SELECT FOLDER LINK");
_("LAST PLAYED");
_("ENTER LAST PLAYED DATE");
_p("metadata", "NAME");
_p("metadata", "ENTER NAME");
_p("metadata", "SORTNAME");
_p("metadata", "ENTER SORTNAME");
_p("metadata", "CUSTOM COLLECTIONS SORTNAME");
_p("metadata", "ENTER COLLECTIONS SORTNAME");
_p("metadata", "DESCRIPTION");
_p("metadata", "ENTER DESCRIPTION");
_p("metadata", "RATING");
_p("metadata", "RELEASE DATE");
_p("metadata", "DEVELOPER");
_p("metadata", "ENTER DEVELOPER");
_p("metadata", "PUBLISHER");
_p("metadata", "ENTER PUBLISHER");
_p("metadata", "GENRE");
_p("metadata", "ENTER GENRE");
_p("metadata", "PLAYERS");
_p("metadata", "ENTER NUMBER OF PLAYERS");
_p("metadata", "FAVORITE");
_p("metadata", "COMPLETED");
_p("metadata", "KIDGAME");
_p("metadata", "KIDGAME (ONLY AFFECTS BADGES)");
_p("metadata", "HIDDEN");
_p("metadata", "BROKEN/NOT WORKING");
_p("metadata", "EXCLUDE FROM GAME COUNTER");
_p("metadata", "EXCLUDE FROM MULTI-SCRAPER");
_p("metadata", "HIDE METADATA FIELDS");
_p("metadata", "TIMES PLAYED");
_p("metadata", "ENTER NUMBER OF TIMES PLAYED");
_p("metadata", "CONTROLLER");
_p("metadata", "SELECT CONTROLLER");
_p("metadata", "ALTERNATIVE EMULATOR");
_p("metadata", "SELECT ALTERNATIVE EMULATOR");
_p("metadata", "FOLDER LINK");
_p("metadata", "SELECT FOLDER LINK");
_p("metadata", "LAST PLAYED");
_p("metadata", "ENTER LAST PLAYED DATE");
}
#endif

View file

@ -605,7 +605,7 @@ void GuiMenu::openUIOptions()
// Default gamelist sort order.
std::string sortOrder;
auto defaultSortOrder = std::make_shared<OptionListComponent<const FileData::SortType*>>(
getHelpStyle(), _("GAMES DEFAULT SORT ORDER [short]"), false);
getHelpStyle(), _p("short", "GAMES DEFAULT SORT ORDER"), false);
// Exclude the System sort options.
unsigned int numSortTypes {static_cast<unsigned int>(FileSorts::SortTypes.size() - 2)};
for (unsigned int i {0}; i < numSortTypes; ++i) {
@ -1621,7 +1621,7 @@ void GuiMenu::openOtherOptions()
// When to save game metadata.
auto saveGamelistsMode = std::make_shared<OptionListComponent<std::string>>(
getHelpStyle(), _("WHEN TO SAVE GAME METADATA [short]"), false);
getHelpStyle(), _p("short", "WHEN TO SAVE GAME METADATA"), false);
saveGamelistsMode->add(_("ALWAYS"), "always",
Settings::getInstance()->getString("SaveGamelistsMode") == "always");
saveGamelistsMode->add(_("ON EXIT"), "on exit",
@ -2217,12 +2217,12 @@ void GuiMenu::openThemeDownloader(GuiSettings* settings)
void GuiMenu::openMediaViewerOptions()
{
mWindow->pushGui(new GuiMediaViewerOptions(_("MEDIA VIEWER SETTINGS [short]")));
mWindow->pushGui(new GuiMediaViewerOptions(_p("short", "MEDIA VIEWER SETTINGS")));
}
void GuiMenu::openScreensaverOptions()
{
mWindow->pushGui(new GuiScreensaverOptions(_("SCREENSAVER SETTINGS [short]")));
mWindow->pushGui(new GuiScreensaverOptions(_p("short", "SCREENSAVER SETTINGS")));
}
void GuiMenu::openCollectionSystemOptions()

View file

@ -149,7 +149,7 @@ GuiMetaDataEd::GuiMetaDataEd(MetaDataList* md,
// entry instead of for instance the spacer. That is so because ComponentList
// always looks for the help prompt at the back of the element stack.
ComponentListRow row;
auto lbl = std::make_shared<TextComponent>(_(it->displayName.c_str()),
auto lbl = std::make_shared<TextComponent>(_p("metadata", it->displayName.c_str()),
Font::get(FONT_SIZE_SMALL), mMenuColorPrimary);
row.addElement(lbl, true); // Label.
@ -209,7 +209,7 @@ GuiMetaDataEd::GuiMetaDataEd(MetaDataList* md,
bracket->setColorShift(mMenuColorPrimary);
row.addElement(bracket, false);
const std::string title {_(it->displayPrompt.c_str())};
const std::string title {_p("metadata", it->displayPrompt.c_str())};
// OK callback (apply new value to ed).
auto updateVal = [ed, originalValue](const std::string& newVal) {
@ -297,7 +297,7 @@ GuiMetaDataEd::GuiMetaDataEd(MetaDataList* md,
const std::string title {mRenderer->getIsVerticalOrientation() ?
_("SELECT EMULATOR") :
_(it->displayPrompt.c_str())};
_p("metadata", it->displayPrompt.c_str())};
// OK callback (apply new value to ed).
auto updateVal = [this, ed, originalValue](const std::string& newVal) {
@ -442,7 +442,7 @@ GuiMetaDataEd::GuiMetaDataEd(MetaDataList* md,
bracket->setColorShift(mMenuColorPrimary);
row.addElement(bracket, false);
const std::string title {_(it->displayPrompt.c_str())};
const std::string title {_p("metadata", it->displayPrompt.c_str())};
std::vector<FileData*> children;
if (originalValue != "")
@ -563,7 +563,7 @@ GuiMetaDataEd::GuiMetaDataEd(MetaDataList* md,
row.addElement(bracket, false);
bool multiLine {it->type == MD_MULTILINE_STRING};
const std::string title {_(it->displayPrompt.c_str())};
const std::string title {_p("metadata", it->displayPrompt.c_str())};
gamePath = Utils::FileSystem::getStem(scraperParams.game->getPath());

View file

@ -480,7 +480,7 @@ void GuiScraperMenu::openMiximageOptions()
// Horizontally oriented screenshots fit.
auto miximageHorizontalFit = std::make_shared<OptionListComponent<std::string>>(
getHelpStyle(), _("HORIZONTAL SCREENSHOT FIT [short]"), false);
getHelpStyle(), _p("short", "HORIZONTAL SCREENSHOT FIT"), false);
const std::string selectedHorizontalFit {
Settings::getInstance()->getString("MiximageScreenshotHorizontalFit")};
miximageHorizontalFit->add(_("CONTAIN"), "contain", selectedHorizontalFit == "contain");
@ -502,7 +502,7 @@ void GuiScraperMenu::openMiximageOptions()
// Vertically oriented screenshots fit.
auto miximageVerticalFit = std::make_shared<OptionListComponent<std::string>>(
getHelpStyle(), _("VERTICAL SCREENSHOT FIT [short]"), false);
getHelpStyle(), _p("short", "VERTICAL SCREENSHOT FIT"), false);
const std::string selectedVerticalFit {
Settings::getInstance()->getString("MiximageScreenshotVerticalFit")};
miximageVerticalFit->add(_("CONTAIN"), "contain", selectedVerticalFit == "contain");
@ -524,7 +524,7 @@ void GuiScraperMenu::openMiximageOptions()
// Screenshots aspect ratio threshold.
auto miximageAspectThreshold = std::make_shared<OptionListComponent<std::string>>(
getHelpStyle(), _("SCREENSHOT ASPECT RATIO THRESHOLD [short]"), false);
getHelpStyle(), _p("short", "SCREENSHOT ASPECT RATIO THRESHOLD"), false);
const std::string selectedAspectThreshold {
Settings::getInstance()->getString("MiximageScreenshotAspectThreshold")};
miximageAspectThreshold->add(_("HIGH"), "high", selectedAspectThreshold == "high");
@ -566,7 +566,7 @@ void GuiScraperMenu::openMiximageOptions()
// Screenshot scaling method.
auto miximageScaling = std::make_shared<OptionListComponent<std::string>>(
getHelpStyle(), _("SCREENSHOT SCALING METHOD [short]"), false);
getHelpStyle(), _p("short", "SCREENSHOT SCALING METHOD"), false);
std::string selectedScaling {Settings::getInstance()->getString("MiximageScreenshotScaling")};
miximageScaling->add(_("SHARP"), "sharp", selectedScaling == "sharp");
miximageScaling->add(_("SMOOTH"), "smooth", selectedScaling == "smooth");