I18N: Switch to getting categories by index instead of by string lookup

Also gets rid of the shared_ptr usage, and generally makes things nicer.

Needed for later config refactorings, good to get in early.
This commit is contained in:
Henrik Rydgård committed 2023-04-07 10:35:01 +02:00
1 parent 07b8b6f35a
commit ee6234ecb6
65 files changed
+535 -516

No files matched your search

+4 -4
View File
@@ -94,7 +94,7 @@ void PSPNetconfDialog::DrawBanner() {
// TODO: Draw a hexagon icon
PPGeDrawImage(10, 5, 11.0f, 10.0f, 1, 10, 1, 10, 10, 10, FadedImageStyle());
auto di = GetI18NCategory("Dialog");
auto di = GetI18NCategory(I18NCat::DIALOG);
PPGeDrawText(di->T("Network Connection"), 31, 10, textStyle);
}
@@ -104,7 +104,7 @@ void PSPNetconfDialog::DrawIndicator() {
}
void PSPNetconfDialog::DisplayMessage(std::string text1, std::string text2a, std::string text2b, std::string text3a, std::string text3b, bool hasYesNo, bool hasOK) {
auto di = GetI18NCategory("Dialog");
auto di = GetI18NCategory(I18NCat::DIALOG);
PPGeStyle buttonStyle = FadedStyle(PPGeAlign::BOX_CENTER, FONT_SCALE);
PPGeStyle messageStyle = FadedStyle(PPGeAlign::BOX_HCENTER, FONT_SCALE);
@@ -238,8 +238,8 @@ int PSPNetconfDialog::Update(int animSpeed) {
UpdateButtons();
UpdateCommon();
auto di = GetI18NCategory("Dialog");
auto err = GetI18NCategory("Error");
auto di = GetI18NCategory(I18NCat::DIALOG);
auto err = GetI18NCategory(I18NCat::ERRORS);
u64 now = (u64)(time_now_d() * 1000000.0);
// It seems JPCSP doesn't check for NETCONF_STATUS_APNET