shared_translation: Deobfuscate auto time zone

author: lat9nq 2023-06-21 17:02:42 -0400
committer: lat9nq 2023-07-21 10:56:55 -0400
commit: 9186f08c3c6cad014c671ca152c78d9d2ee307e6 (patch)
tree: fd018062bfa2097df2ac3595b2a46225142b923f /src
parent: settings_enums: Remove casting (diff)
download: yuzu-9186f08c3c6cad014c671ca152c78d9d2ee307e6.tar.gz
yuzu-9186f08c3c6cad014c671ca152c78d9d2ee307e6.tar.xz
yuzu-9186f08c3c6cad014c671ca152c78d9d2ee307e6.zip
1 files changed, 52 insertions, 46 deletions
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index a1030efb0..f120a632c 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
+#include "common/time_zone.h"
 #include "yuzu/configuration/shared_translation.h"
 #include <map>
@@ -309,52 +310,57 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
                              PAIR(Region, Korea, "Korea"),
                              PAIR(Region, Taiwan, "Taiwan"),
                          }});
-    translations->insert({typeid(Settings::TimeZone),
+    translations->insert(
-                          {
+        {typeid(Settings::TimeZone),
-                              PAIR(TimeZone, Auto, "Auto"),
+         {
-                              PAIR(TimeZone, Default, "Default"),
+             {static_cast<u32>(Settings::TimeZone::Auto),
-                              PAIR(TimeZone, Cet, "CET"),
+              tr("Auto (%1)", "Auto select time zone")
-                              PAIR(TimeZone, Cst6Cdt, "CST6CDT"),
+                  .arg(QString::fromStdString(Settings::GetTimeZoneString()))},
-                              PAIR(TimeZone, Cuba, "Cuba"),
+             {static_cast<u32>(Settings::TimeZone::Default),
-                              PAIR(TimeZone, Eet, "EET"),
+              tr("Default (%1)", "Default time zone")
-                              PAIR(TimeZone, Egypt, "Egypt"),
+                  .arg(QString::fromStdString(Common::TimeZone::GetDefaultTimeZone()))},
-                              PAIR(TimeZone, Eire, "Eire"),
+             PAIR(TimeZone, Cet, "CET"),
-                              PAIR(TimeZone, Est, "EST"),
+             PAIR(TimeZone, Cst6Cdt, "CST6CDT"),
-                              PAIR(TimeZone, Est5Edt, "EST5EDT"),
+             PAIR(TimeZone, Cuba, "Cuba"),
-                              PAIR(TimeZone, Gb, "GB"),
+             PAIR(TimeZone, Eet, "EET"),
-                              PAIR(TimeZone, GbEire, "GB-Eire"),
+             PAIR(TimeZone, Egypt, "Egypt"),
-                              PAIR(TimeZone, Gmt, "GMT"),
+             PAIR(TimeZone, Eire, "Eire"),
-                              PAIR(TimeZone, GmtPlusZero, "GMT+0"),
+             PAIR(TimeZone, Est, "EST"),
-                              PAIR(TimeZone, GmtMinusZero, "GMT-0"),
+             PAIR(TimeZone, Est5Edt, "EST5EDT"),
-                              PAIR(TimeZone, GmtZero, "GMT0"),
+             PAIR(TimeZone, Gb, "GB"),
-                              PAIR(TimeZone, Greenwich, "Greenwich"),
+             PAIR(TimeZone, GbEire, "GB-Eire"),
-                              PAIR(TimeZone, Hongkong, "Hongkong"),
+             PAIR(TimeZone, Gmt, "GMT"),
-                              PAIR(TimeZone, Hst, "HST"),
+             PAIR(TimeZone, GmtPlusZero, "GMT+0"),
-                              PAIR(TimeZone, Iceland, "Iceland"),
+             PAIR(TimeZone, GmtMinusZero, "GMT-0"),
-                              PAIR(TimeZone, Iran, "Iran"),
+             PAIR(TimeZone, GmtZero, "GMT0"),
-                              PAIR(TimeZone, Israel, "Israel"),
+             PAIR(TimeZone, Greenwich, "Greenwich"),
-                              PAIR(TimeZone, Jamaica, "Jamaica"),
+             PAIR(TimeZone, Hongkong, "Hongkong"),
-                              PAIR(TimeZone, Kwajalein, "Kwajalein"),
+             PAIR(TimeZone, Hst, "HST"),
-                              PAIR(TimeZone, Libya, "Libya"),
+             PAIR(TimeZone, Iceland, "Iceland"),
-                              PAIR(TimeZone, Met, "MET"),
+             PAIR(TimeZone, Iran, "Iran"),
-                              PAIR(TimeZone, Mst, "MST"),
+             PAIR(TimeZone, Israel, "Israel"),
-                              PAIR(TimeZone, Mst7Mdt, "MST7MDT"),
+             PAIR(TimeZone, Jamaica, "Jamaica"),
-                              PAIR(TimeZone, Navajo, "Navajo"),
+             PAIR(TimeZone, Kwajalein, "Kwajalein"),
-                              PAIR(TimeZone, Nz, "NZ"),
+             PAIR(TimeZone, Libya, "Libya"),
-                              PAIR(TimeZone, NzChat, "NZ-CHAT"),
+             PAIR(TimeZone, Met, "MET"),
-                              PAIR(TimeZone, Poland, "Poland"),
+             PAIR(TimeZone, Mst, "MST"),
-                              PAIR(TimeZone, Portugal, "Portugal"),
+             PAIR(TimeZone, Mst7Mdt, "MST7MDT"),
-                              PAIR(TimeZone, Prc, "PRC"),
+             PAIR(TimeZone, Navajo, "Navajo"),
-                              PAIR(TimeZone, Pst8Pdt, "PST8PDT"),
+             PAIR(TimeZone, Nz, "NZ"),
-                              PAIR(TimeZone, Roc, "ROC"),
+             PAIR(TimeZone, NzChat, "NZ-CHAT"),
-                              PAIR(TimeZone, Rok, "ROK"),
+             PAIR(TimeZone, Poland, "Poland"),
-                              PAIR(TimeZone, Singapore, "Singapore"),
+             PAIR(TimeZone, Portugal, "Portugal"),
-                              PAIR(TimeZone, Turkey, "Turkey"),
+             PAIR(TimeZone, Prc, "PRC"),
-                              PAIR(TimeZone, Uct, "UCT"),
+             PAIR(TimeZone, Pst8Pdt, "PST8PDT"),
-                              PAIR(TimeZone, WSu, "W-SU"),
+             PAIR(TimeZone, Roc, "ROC"),
-                              PAIR(TimeZone, Wet, "WET"),
+             PAIR(TimeZone, Rok, "ROK"),
-                              PAIR(TimeZone, Zulu, "Zulu"),
+             PAIR(TimeZone, Singapore, "Singapore"),
-                          }});
+             PAIR(TimeZone, Turkey, "Turkey"),
+             PAIR(TimeZone, Uct, "UCT"),
+             PAIR(TimeZone, WSu, "W-SU"),
+             PAIR(TimeZone, Wet, "WET"),
+             PAIR(TimeZone, Zulu, "Zulu"),
+         }});
    translations->insert({typeid(Settings::AudioMode),
                          {
                              PAIR(AudioMode, Mono, "Mono"),
author	lat9nq	2023-06-21 17:02:42 -0400
committer	lat9nq	2023-07-21 10:56:55 -0400
commit	9186f08c3c6cad014c671ca152c78d9d2ee307e6 (patch)
tree	fd018062bfa2097df2ac3595b2a46225142b923f /src
parent	settings_enums: Remove casting (diff)
download	yuzu-9186f08c3c6cad014c671ca152c78d9d2ee307e6.tar.gz yuzu-9186f08c3c6cad014c671ca152c78d9d2ee307e6.tar.xz yuzu-9186f08c3c6cad014c671ca152c78d9d2ee307e6.zip

diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp index a1030efb0..f120a632c 100644 --- a/src/yuzu/configuration/shared_translation.cpp +++ b/src/yuzu/configuration/shared_translation.cpp
@@ -1,6 +1,7 @@
1	// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
2	// SPDX-License-Identifier: GPL-2.0-or-later	2	// SPDX-License-Identifier: GPL-2.0-or-later
3		3
		4	#include "common/time_zone.h"
4	#include "yuzu/configuration/shared_translation.h"	5	#include "yuzu/configuration/shared_translation.h"
5		6
6	#include <map>	7	#include <map>
@@ -309,52 +310,57 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
309	PAIR(Region, Korea, "Korea"),	310	PAIR(Region, Korea, "Korea"),
310	PAIR(Region, Taiwan, "Taiwan"),	311	PAIR(Region, Taiwan, "Taiwan"),
311	}});	312	}});
312	translations->insert({typeid(Settings::TimeZone),	313	translations->insert(
313	{	314	{typeid(Settings::TimeZone),
314	PAIR(TimeZone, Auto, "Auto"),	315	{
315	PAIR(TimeZone, Default, "Default"),	316	{static_cast<u32>(Settings::TimeZone::Auto),
316	PAIR(TimeZone, Cet, "CET"),	317	tr("Auto (%1)", "Auto select time zone")
317	PAIR(TimeZone, Cst6Cdt, "CST6CDT"),	318	.arg(QString::fromStdString(Settings::GetTimeZoneString()))},
318	PAIR(TimeZone, Cuba, "Cuba"),	319	{static_cast<u32>(Settings::TimeZone::Default),
319	PAIR(TimeZone, Eet, "EET"),	320	tr("Default (%1)", "Default time zone")
320	PAIR(TimeZone, Egypt, "Egypt"),	321	.arg(QString::fromStdString(Common::TimeZone::GetDefaultTimeZone()))},
321	PAIR(TimeZone, Eire, "Eire"),	322	PAIR(TimeZone, Cet, "CET"),
322	PAIR(TimeZone, Est, "EST"),	323	PAIR(TimeZone, Cst6Cdt, "CST6CDT"),
323	PAIR(TimeZone, Est5Edt, "EST5EDT"),	324	PAIR(TimeZone, Cuba, "Cuba"),
324	PAIR(TimeZone, Gb, "GB"),	325	PAIR(TimeZone, Eet, "EET"),
325	PAIR(TimeZone, GbEire, "GB-Eire"),	326	PAIR(TimeZone, Egypt, "Egypt"),
326	PAIR(TimeZone, Gmt, "GMT"),	327	PAIR(TimeZone, Eire, "Eire"),
327	PAIR(TimeZone, GmtPlusZero, "GMT+0"),	328	PAIR(TimeZone, Est, "EST"),
328	PAIR(TimeZone, GmtMinusZero, "GMT-0"),	329	PAIR(TimeZone, Est5Edt, "EST5EDT"),
329	PAIR(TimeZone, GmtZero, "GMT0"),	330	PAIR(TimeZone, Gb, "GB"),
330	PAIR(TimeZone, Greenwich, "Greenwich"),	331	PAIR(TimeZone, GbEire, "GB-Eire"),
331	PAIR(TimeZone, Hongkong, "Hongkong"),	332	PAIR(TimeZone, Gmt, "GMT"),
332	PAIR(TimeZone, Hst, "HST"),	333	PAIR(TimeZone, GmtPlusZero, "GMT+0"),
333	PAIR(TimeZone, Iceland, "Iceland"),	334	PAIR(TimeZone, GmtMinusZero, "GMT-0"),
334	PAIR(TimeZone, Iran, "Iran"),	335	PAIR(TimeZone, GmtZero, "GMT0"),
335	PAIR(TimeZone, Israel, "Israel"),	336	PAIR(TimeZone, Greenwich, "Greenwich"),
336	PAIR(TimeZone, Jamaica, "Jamaica"),	337	PAIR(TimeZone, Hongkong, "Hongkong"),
337	PAIR(TimeZone, Kwajalein, "Kwajalein"),	338	PAIR(TimeZone, Hst, "HST"),
338	PAIR(TimeZone, Libya, "Libya"),	339	PAIR(TimeZone, Iceland, "Iceland"),
339	PAIR(TimeZone, Met, "MET"),	340	PAIR(TimeZone, Iran, "Iran"),
340	PAIR(TimeZone, Mst, "MST"),	341	PAIR(TimeZone, Israel, "Israel"),
341	PAIR(TimeZone, Mst7Mdt, "MST7MDT"),	342	PAIR(TimeZone, Jamaica, "Jamaica"),
342	PAIR(TimeZone, Navajo, "Navajo"),	343	PAIR(TimeZone, Kwajalein, "Kwajalein"),
343	PAIR(TimeZone, Nz, "NZ"),	344	PAIR(TimeZone, Libya, "Libya"),
344	PAIR(TimeZone, NzChat, "NZ-CHAT"),	345	PAIR(TimeZone, Met, "MET"),
345	PAIR(TimeZone, Poland, "Poland"),	346	PAIR(TimeZone, Mst, "MST"),
346	PAIR(TimeZone, Portugal, "Portugal"),	347	PAIR(TimeZone, Mst7Mdt, "MST7MDT"),
347	PAIR(TimeZone, Prc, "PRC"),	348	PAIR(TimeZone, Navajo, "Navajo"),
348	PAIR(TimeZone, Pst8Pdt, "PST8PDT"),	349	PAIR(TimeZone, Nz, "NZ"),
349	PAIR(TimeZone, Roc, "ROC"),	350	PAIR(TimeZone, NzChat, "NZ-CHAT"),
350	PAIR(TimeZone, Rok, "ROK"),	351	PAIR(TimeZone, Poland, "Poland"),
351	PAIR(TimeZone, Singapore, "Singapore"),	352	PAIR(TimeZone, Portugal, "Portugal"),
352	PAIR(TimeZone, Turkey, "Turkey"),	353	PAIR(TimeZone, Prc, "PRC"),
353	PAIR(TimeZone, Uct, "UCT"),	354	PAIR(TimeZone, Pst8Pdt, "PST8PDT"),
354	PAIR(TimeZone, WSu, "W-SU"),	355	PAIR(TimeZone, Roc, "ROC"),
355	PAIR(TimeZone, Wet, "WET"),	356	PAIR(TimeZone, Rok, "ROK"),
356	PAIR(TimeZone, Zulu, "Zulu"),	357	PAIR(TimeZone, Singapore, "Singapore"),
357	}});	358	PAIR(TimeZone, Turkey, "Turkey"),
		359	PAIR(TimeZone, Uct, "UCT"),
		360	PAIR(TimeZone, WSu, "W-SU"),
		361	PAIR(TimeZone, Wet, "WET"),
		362	PAIR(TimeZone, Zulu, "Zulu"),
		363	}});
358	translations->insert({typeid(Settings::AudioMode),	364	translations->insert({typeid(Settings::AudioMode),
359	{	365	{
360	PAIR(AudioMode, Mono, "Mono"),	366	PAIR(AudioMode, Mono, "Mono"),