Merge pull request #19600 from hrydgard/raintegration-error-fix

RAIntegration not-found error message fix
hrydgard · Nov 6, 2024 · 65c9377 · 65c9377
2 parents 1ea6fae + a11dc52
commit 65c9377
Show file tree

Hide file tree

Showing 45 changed files with 95 additions and 5 deletions.
diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp
@@ -69,6 +69,8 @@
 
 #endif
 
+static const char *const RAINTEGRATION_FILENAME = "RAIntegration.dll";
+
 static bool HashISOFile(ISOFileSystem *fs, const std::string filename, md5_context *md5) {
 	int handle = fs->OpenFile(filename, FILEACCESS_READ);
 	if (handle < 0) {
@@ -563,7 +565,7 @@ static void raintegration_event_handler(const rc_client_raintegration_event_t *e
 		g_Config.bAchievementsHardcoreMode = rc_client_get_hardcore_enabled(client);
 		break;
 	default:
-		ERROR_LOG(Log::Achievements, "Unsupported raintegration event %u\n", event->type);
+		ERROR_LOG(Log::Achievements, "Unsupported RAIntegration event %u\n", event->type);
 		break;
 	}
 }
@@ -576,7 +578,7 @@ static void load_integration_callback(int result, const char *error_message, rc_
 	case RC_OK:
 	{
 		// DLL was loaded correctly.
-		g_OSD.Show(OSDType::MESSAGE_SUCCESS, ac->T("RAIntegration DLL loaded."));
+		g_OSD.Show(OSDType::MESSAGE_SUCCESS, ApplySafeSubstitutions(ac->T("%1 loaded."), RAINTEGRATION_FILENAME));
 
 		rc_client_raintegration_set_console_id(g_rcClient, RC_CONSOLE_PSP);
 		rc_client_raintegration_set_event_handler(g_rcClient, &raintegration_event_handler);
@@ -591,11 +593,11 @@ static void load_integration_callback(int result, const char *error_message, rc_
 	}
 	case RC_MISSING_VALUE:
 		// This is fine, proceeding to login.
-		g_OSD.Show(OSDType::MESSAGE_WARNING, ac->T("RAIntegration is enabled, but RAIntegration-x64.dll was not found."));
+		g_OSD.Show(OSDType::MESSAGE_WARNING, ac->T("RAIntegration is enabled, but %1 was not found."));
 		break;
 	case RC_ABORTED:
-		// This is fine, proceeding to login.
-		g_OSD.Show(OSDType::MESSAGE_WARNING, ac->T("Wrong version of RAIntegration-x64.dll?"));
+		// This is fine(-ish), proceeding to login.
+		g_OSD.Show(OSDType::MESSAGE_WARNING, ApplySafeSubstitutions("Wrong version of %1?", RAINTEGRATION_FILENAME));
 		break;
 	default:
 		g_OSD.Show(OSDType::MESSAGE_ERROR, StringFromFormat("RAIntegration init failed: %s", error_message));

diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
@@ -7,6 +7,7 @@
 # perl -CSAD -p -i -e 's/(.* = )(?!\x{200e})(.*\p{Arabic}.*)/\1\x{200e}\2/g' ar_AE.ini
 
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: المحاولة فشلت
 %1: Attempt started = %1: بدأت المحاولة
 %1 achievements, %2 points = %1انجازات, %2 نقاط
@@ -46,6 +47,7 @@ Locked achievements = إنجازات مقفلة
 Log bad memory accesses = تسجيل الوصول الى الذاكرة السيئة
 Mastered %1 = %تم اتقان 1
 Notifications = الإشعارات
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = الإنجازات التي تم فتحها مؤخرا
 Reconnected to RetroAchievements. = RetroAchievements يتم إعادة الإتصال في
 Register on www.retroachievements.org =  www.retroachievements.org سجل في

diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
@@ -24,6 +24,7 @@
 
 [Achievements]
 %1 achievements, %2 points = %1 achievements, %2 points
+%1 loaded. = %1 loaded.
 %1: Attempt started = %1: Attempt started
 %1: Attempt failed = %1: Attempt failed
 Account = Account
@@ -62,6 +63,7 @@ Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Around me = Around me
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
@@ -1,5 +1,6 @@
 [Achievements]
 %1 achievements, %2 points = %1 logros, %2 puntos
+%1 loaded. = %1 loaded.
 %1: Attempt started = %1: intento para el leaderboard iniciado
 %1: Attempt failed = %1: intento para el leaderboard fallido
 Account = Cuenta
@@ -38,6 +39,7 @@ Locked achievements = Logros bloqueados
 Log bad memory accesses = Registrar malos accesos a la memoría
 Mastered %1 = Completaste %1
 Notifications = Notificaciones
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Registrate en www.retroachievements.org

diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
@@ -1,5 +1,6 @@
 [Achievements]
 %1 achievements, %2 points = %1 logros, %2 puntos
+%1 loaded. = %1 loaded.
 %1: Attempt started = %1: Intento iniciado
 %1: Attempt failed = %1: Intento fallido
 Account = Cuenta
@@ -38,6 +39,7 @@ Locked achievements = Logros bloqueados
 Log bad memory accesses = Registrar malos accesos a la memoría
 Mastered %1 = Completaste %1
 Notifications = Notificaciones
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Logros recientemente desbloqueados
 Reconnected to RetroAchievements. = Reconectado a RetroAchievements.
 Register on www.retroachievements.org = Registrate en www.retroachievements.org

diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 saavutusta, %2 pistettä
@@ -38,6 +39,7 @@ Locked achievements = Lukitut saavutukset
 Log bad memory accesses = Kirjaa virheelliset muistipääsyt
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Rekisteröidy osoitteessa www.retroachievements.org

diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Próbálkozás sikertelen
 %1: Attempt started = %1: Próbálkozás elkezdve
 %1 achievements, %2 points = %1 teljesítmény, %2 pont
@@ -38,6 +39,7 @@ Locked achievements = Kioldatlan teljesítmények
 Log bad memory accesses = Hibás memóriahozzáférések kiírása
 Mastered %1 = %1 elsajátítva
 Notifications = Értesítések
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Legutóbb kioldott teljesítmények
 Reconnected to RetroAchievements. = Újracsatlakozva a RetroAchievements-hez
 Register on www.retroachievements.org = Regisztráció a www.retroachievements.org-on…

diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org

diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
@@ -1,5 +1,6 @@
 [Achievements]
 %1 achievements, %2 points = %1 obiettivi, %2 punti
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Tentativo fallito
 %1: Attempt started = %1: Tentativo iniziato
 Account = Account
@@ -38,6 +39,7 @@ Log bad memory accesses = Registra cattivi accessi alla memoria
 Mastered %1 = Padroneggiato %1
 Around me = Intorno a me
 Notifications = Notifiche
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Obiettivi recentemente sbloccati
 Reconnected to RetroAchievements. = Riconnesso a RetroAchievements.
 Register on www.retroachievements.org = Registrati su www.retroachievements.org

diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
@@ -1,5 +1,6 @@
 [Achievements]
 %1 achievements, %2 points = %1つの実績、 %2ポイント
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 Account = アカウント
@@ -38,6 +39,7 @@ Locked achievements = 解除していない実績
 Log bad memory accesses = 不正なメモリ・アクセスを記録する
 Mastered %1 = Mastered %1
 Notifications = 通知
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = 最近達成した実績
 Reconnected to RetroAchievements. = RetroAchievementsに再接続しました。
 Register on www.retroachievements.org = www.retroachievements.orgで登録

diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
@@ -1,4 +1,5 @@
 [Achievements]
+%1 loaded. = %1 loaded.
 %1: Attempt failed = %1: Attempt failed
 %1: Attempt started = %1: Attempt started
 %1 achievements, %2 points = %1 achievements, %2 points
@@ -38,6 +39,7 @@ Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
 Notifications = Notifications
+RAIntegration is enabled, but %1 was not found. = RAIntegration is enabled, but %1 was not found.
 Recently unlocked achievements = Recently unlocked achievements
 Reconnected to RetroAchievements. = Reconnected to RetroAchievements.
 Register on www.retroachievements.org = Register on www.retroachievements.org