summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2023-06-20 23:34:03 -0400
committerGravatar lat9nq2023-07-21 10:56:55 -0400
commit8b28aa45b99cc6f6c9399bbe421460de67088cff (patch)
tree9180f3cb89edd2fc92ec4b5a97f34a5a986ea997
parentsettings,opengl,yuzu-qt: Fix AA, Filter maximums (diff)
downloadyuzu-8b28aa45b99cc6f6c9399bbe421460de67088cff.tar.gz
yuzu-8b28aa45b99cc6f6c9399bbe421460de67088cff.tar.xz
yuzu-8b28aa45b99cc6f6c9399bbe421460de67088cff.zip
settings,translation: Fix time zone enum
Renames enum values to conform to naming convention.
Diffstat (limited to '')
-rw-r--r--src/common/settings_enums.h8
-rw-r--r--src/yuzu/configuration/shared_translation.cpp48
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
94 94
95ENUM(Region, Japan, Usa, Europe, Australia, China, Korea, Taiwan); 95ENUM(Region, Japan, Usa, Europe, Australia, China, Korea, Taiwan);
96 96
97ENUM(TimeZone, Auto, Default, CET, CST6CDT, Cuba, EET, Egypt, Eire, EST, EST5EDT, GB, GBEire, GMT, 97ENUM(TimeZone, Auto, Default, Cet, Cst6Cdt, Cuba, Eet, Egypt, Eire, Est, Est5Edt, Gb, GbEire, Gmt,
98 GMTPlusZero, GMTMinusZero, GMTZero, Greenwich, Hongkong, HST, Iceland, Iran, Israel, Jamaica, 98 GmtPlusZero, GmtMinusZero, GmtZero, Greenwich, Hongkong, Hst, Iceland, Iran, Israel, Jamaica,
99 Japan, Kwajalein, Libya, MET, MST, MST7MDT, Navajo, NZ, NZCHAT, Poland, Portugal, PRC, PST8PDT, 99 Japan, Kwajalein, Libya, Met, Mst, Mst7Mdt, Navajo, Nz, NzChat, Poland, Portugal, Prc, Pst8Pdt,
100 ROC, ROK, Singapore, Turkey, UCT, Universal, UTC, W_SU, WET, Zulu); 100 Roc, Rok, Singapore, Turkey, Uct, Universal, Utc, WSu, Wet, Zulu);
101 101
102ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16); 102ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16);
103 103
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<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
311 { 311 {
312 PAIR(TimeZone, Auto, "Auto"), 312 PAIR(TimeZone, Auto, "Auto"),
313 PAIR(TimeZone, Default, "Default"), 313 PAIR(TimeZone, Default, "Default"),
314 PAIR(TimeZone, CET, "CET"), 314 PAIR(TimeZone, Cet, "CET"),
315 PAIR(TimeZone, CST6CDT, "CST6CDT"), 315 PAIR(TimeZone, Cst6Cdt, "CST6CDT"),
316 PAIR(TimeZone, Cuba, "Cuba"), 316 PAIR(TimeZone, Cuba, "Cuba"),
317 PAIR(TimeZone, EET, "EET"), 317 PAIR(TimeZone, Eet, "EET"),
318 PAIR(TimeZone, Egypt, "Egypt"), 318 PAIR(TimeZone, Egypt, "Egypt"),
319 PAIR(TimeZone, Eire, "Eire"), 319 PAIR(TimeZone, Eire, "Eire"),
320 PAIR(TimeZone, EST, "EST"), 320 PAIR(TimeZone, Est, "EST"),
321 PAIR(TimeZone, EST5EDT, "EST5EDT"), 321 PAIR(TimeZone, Est5Edt, "EST5EDT"),
322 PAIR(TimeZone, GB, "GB"), 322 PAIR(TimeZone, Gb, "GB"),
323 PAIR(TimeZone, GBEire, "GB-Eire"), 323 PAIR(TimeZone, GbEire, "GB-Eire"),
324 PAIR(TimeZone, GMT, "GMT"), 324 PAIR(TimeZone, Gmt, "GMT"),
325 PAIR(TimeZone, GMTPlusZero, "GMT+0"), 325 PAIR(TimeZone, GmtPlusZero, "GMT+0"),
326 PAIR(TimeZone, GMTMinusZero, "GMT-0"), 326 PAIR(TimeZone, GmtMinusZero, "GMT-0"),
327 PAIR(TimeZone, GMTZero, "GMT0"), 327 PAIR(TimeZone, GmtZero, "GMT0"),
328 PAIR(TimeZone, Greenwich, "Greenwich"), 328 PAIR(TimeZone, Greenwich, "Greenwich"),
329 PAIR(TimeZone, Hongkong, "Hongkong"), 329 PAIR(TimeZone, Hongkong, "Hongkong"),
330 PAIR(TimeZone, HST, "HST"), 330 PAIR(TimeZone, Hst, "HST"),
331 PAIR(TimeZone, Iceland, "Iceland"), 331 PAIR(TimeZone, Iceland, "Iceland"),
332 PAIR(TimeZone, Iran, "Iran"), 332 PAIR(TimeZone, Iran, "Iran"),
333 PAIR(TimeZone, Israel, "Israel"), 333 PAIR(TimeZone, Israel, "Israel"),
334 PAIR(TimeZone, Jamaica, "Jamaica"), 334 PAIR(TimeZone, Jamaica, "Jamaica"),
335 PAIR(TimeZone, Kwajalein, "Kwajalein"), 335 PAIR(TimeZone, Kwajalein, "Kwajalein"),
336 PAIR(TimeZone, Libya, "Libya"), 336 PAIR(TimeZone, Libya, "Libya"),
337 PAIR(TimeZone, MET, "MET"), 337 PAIR(TimeZone, Met, "MET"),
338 PAIR(TimeZone, MST, "MST"), 338 PAIR(TimeZone, Mst, "MST"),
339 PAIR(TimeZone, MST7MDT, "MST7MDT"), 339 PAIR(TimeZone, Mst7Mdt, "MST7MDT"),
340 PAIR(TimeZone, Navajo, "Navajo"), 340 PAIR(TimeZone, Navajo, "Navajo"),
341 PAIR(TimeZone, NZ, "NZ"), 341 PAIR(TimeZone, Nz, "NZ"),
342 PAIR(TimeZone, NZCHAT, "NZ-CHAT"), 342 PAIR(TimeZone, NzChat, "NZ-CHAT"),
343 PAIR(TimeZone, Poland, "Poland"), 343 PAIR(TimeZone, Poland, "Poland"),
344 PAIR(TimeZone, Portugal, "Portugal"), 344 PAIR(TimeZone, Portugal, "Portugal"),
345 PAIR(TimeZone, PRC, "PRC"), 345 PAIR(TimeZone, Prc, "PRC"),
346 PAIR(TimeZone, PST8PDT, "PST8PDT"), 346 PAIR(TimeZone, Pst8Pdt, "PST8PDT"),
347 PAIR(TimeZone, ROC, "ROC"), 347 PAIR(TimeZone, Roc, "ROC"),
348 PAIR(TimeZone, ROK, "ROK"), 348 PAIR(TimeZone, Rok, "ROK"),
349 PAIR(TimeZone, Singapore, "Singapore"), 349 PAIR(TimeZone, Singapore, "Singapore"),
350 PAIR(TimeZone, Turkey, "Turkey"), 350 PAIR(TimeZone, Turkey, "Turkey"),
351 PAIR(TimeZone, UCT, "UCT"), 351 PAIR(TimeZone, Uct, "UCT"),
352 PAIR(TimeZone, W_SU, "W-SU"), 352 PAIR(TimeZone, WSu, "W-SU"),
353 PAIR(TimeZone, WET, "WET"), 353 PAIR(TimeZone, Wet, "WET"),
354 PAIR(TimeZone, Zulu, "Zulu"), 354 PAIR(TimeZone, Zulu, "Zulu"),
355 }}); 355 }});
356 translations->insert({typeid(Settings::AudioMode), 356 translations->insert({typeid(Settings::AudioMode),
HIC SVNT DRACONES