From 8b28aa45b99cc6f6c9399bbe421460de67088cff Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 20 Jun 2023 23:34:03 -0400 Subject: [PATCH] settings,translation: Fix time zone enum Renames enum values to conform to naming convention. --- src/common/settings_enums.h | 8 ++-- src/yuzu/configuration/shared_translation.cpp | 48 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index cc5c929cf..c380e409e 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -94,10 +94,10 @@ ENUM(Language, Japanese, EnglishAmerican, French, German, Italian, Spanish, Chin ENUM(Region, Japan, Usa, Europe, Australia, China, Korea, Taiwan); -ENUM(TimeZone, Auto, Default, CET, CST6CDT, Cuba, EET, Egypt, Eire, EST, EST5EDT, GB, GBEire, GMT, - GMTPlusZero, GMTMinusZero, GMTZero, Greenwich, Hongkong, HST, Iceland, Iran, Israel, Jamaica, - Japan, Kwajalein, Libya, MET, MST, MST7MDT, Navajo, NZ, NZCHAT, Poland, Portugal, PRC, PST8PDT, - ROC, ROK, Singapore, Turkey, UCT, Universal, UTC, W_SU, WET, Zulu); +ENUM(TimeZone, Auto, Default, Cet, Cst6Cdt, Cuba, Eet, Egypt, Eire, Est, Est5Edt, Gb, GbEire, Gmt, + GmtPlusZero, GmtMinusZero, GmtZero, Greenwich, Hongkong, Hst, Iceland, Iran, Israel, Jamaica, + Japan, Kwajalein, Libya, Met, Mst, Mst7Mdt, Navajo, Nz, NzChat, Poland, Portugal, Prc, Pst8Pdt, + Roc, Rok, Singapore, Turkey, Uct, Universal, Utc, WSu, Wet, Zulu); ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16); diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp index ec4bddb26..a75574530 100644 --- a/src/yuzu/configuration/shared_translation.cpp +++ b/src/yuzu/configuration/shared_translation.cpp @@ -311,46 +311,46 @@ std::unique_ptr ComboboxEnumeration(QWidget* parent) { { PAIR(TimeZone, Auto, "Auto"), PAIR(TimeZone, Default, "Default"), - PAIR(TimeZone, CET, "CET"), - PAIR(TimeZone, CST6CDT, "CST6CDT"), + PAIR(TimeZone, Cet, "CET"), + PAIR(TimeZone, Cst6Cdt, "CST6CDT"), PAIR(TimeZone, Cuba, "Cuba"), - PAIR(TimeZone, EET, "EET"), + PAIR(TimeZone, Eet, "EET"), PAIR(TimeZone, Egypt, "Egypt"), PAIR(TimeZone, Eire, "Eire"), - PAIR(TimeZone, EST, "EST"), - PAIR(TimeZone, EST5EDT, "EST5EDT"), - PAIR(TimeZone, GB, "GB"), - PAIR(TimeZone, GBEire, "GB-Eire"), - PAIR(TimeZone, GMT, "GMT"), - PAIR(TimeZone, GMTPlusZero, "GMT+0"), - PAIR(TimeZone, GMTMinusZero, "GMT-0"), - PAIR(TimeZone, GMTZero, "GMT0"), + PAIR(TimeZone, Est, "EST"), + PAIR(TimeZone, Est5Edt, "EST5EDT"), + PAIR(TimeZone, Gb, "GB"), + PAIR(TimeZone, GbEire, "GB-Eire"), + PAIR(TimeZone, Gmt, "GMT"), + PAIR(TimeZone, GmtPlusZero, "GMT+0"), + PAIR(TimeZone, GmtMinusZero, "GMT-0"), + PAIR(TimeZone, GmtZero, "GMT0"), PAIR(TimeZone, Greenwich, "Greenwich"), PAIR(TimeZone, Hongkong, "Hongkong"), - PAIR(TimeZone, HST, "HST"), + PAIR(TimeZone, Hst, "HST"), PAIR(TimeZone, Iceland, "Iceland"), PAIR(TimeZone, Iran, "Iran"), PAIR(TimeZone, Israel, "Israel"), PAIR(TimeZone, Jamaica, "Jamaica"), PAIR(TimeZone, Kwajalein, "Kwajalein"), PAIR(TimeZone, Libya, "Libya"), - PAIR(TimeZone, MET, "MET"), - PAIR(TimeZone, MST, "MST"), - PAIR(TimeZone, MST7MDT, "MST7MDT"), + PAIR(TimeZone, Met, "MET"), + PAIR(TimeZone, Mst, "MST"), + PAIR(TimeZone, Mst7Mdt, "MST7MDT"), PAIR(TimeZone, Navajo, "Navajo"), - PAIR(TimeZone, NZ, "NZ"), - PAIR(TimeZone, NZCHAT, "NZ-CHAT"), + PAIR(TimeZone, Nz, "NZ"), + PAIR(TimeZone, NzChat, "NZ-CHAT"), PAIR(TimeZone, Poland, "Poland"), PAIR(TimeZone, Portugal, "Portugal"), - PAIR(TimeZone, PRC, "PRC"), - PAIR(TimeZone, PST8PDT, "PST8PDT"), - PAIR(TimeZone, ROC, "ROC"), - PAIR(TimeZone, ROK, "ROK"), + PAIR(TimeZone, Prc, "PRC"), + PAIR(TimeZone, Pst8Pdt, "PST8PDT"), + PAIR(TimeZone, Roc, "ROC"), + PAIR(TimeZone, Rok, "ROK"), PAIR(TimeZone, Singapore, "Singapore"), PAIR(TimeZone, Turkey, "Turkey"), - PAIR(TimeZone, UCT, "UCT"), - PAIR(TimeZone, W_SU, "W-SU"), - PAIR(TimeZone, WET, "WET"), + PAIR(TimeZone, Uct, "UCT"), + PAIR(TimeZone, WSu, "W-SU"), + PAIR(TimeZone, Wet, "WET"), PAIR(TimeZone, Zulu, "Zulu"), }}); translations->insert({typeid(Settings::AudioMode),