Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RAIntegration not-found error message fix #19600

Merged
merged 2 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Core/RetroAchievements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
}
}
Expand All @@ -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);
Expand All @@ -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));
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/ar_AE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 نقاط
Expand Down Expand Up @@ -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 سجل في
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/az_AZ.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/bg_BG.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/ca_ES.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/cz_CZ.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/da_DK.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/de_DE.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/dr_ID.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/en_US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/es_ES.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/es_LA.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/fa_IR.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/fi_FI.ini
Original file line number Diff line number Diff line change
@@ -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ä
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/fr_FR.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/gl_ES.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/gr_EL.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/he_IL.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/he_IL_invert.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/hr_HR.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/hu_HU.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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…
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/id_ID.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/it_IT.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/ja_JP.ini
Original file line number Diff line number Diff line change
@@ -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 = アカウント
Expand Down Expand Up @@ -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で登録
Expand Down
2 changes: 2 additions & 0 deletions assets/lang/jv_ID.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading