From 8b339d44412d115b6c8a7a35420b245e14b3a985 Mon Sep 17 00:00:00 2001 From: cim Date: Mon, 8 Jul 2013 22:20:17 +0100 Subject: [PATCH] Display correct pause key in paused message. (issue #41) Needs fixing in maintenance branch too, but this fix won't work there, because that branch doesn't have c0c4f6d227 --- Resources/Config/descriptions.plist | 4 ++-- src/Core/Universe.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Config/descriptions.plist b/Resources/Config/descriptions.plist index d5450c5f..9b73c448 100644 --- a/Resources/Config/descriptions.plist +++ b/Resources/Config/descriptions.plist @@ -462,8 +462,8 @@ "witch-engine-malfunction" = "Witchspace engine malfunction!"; "witch-galactic-in-f-seconds" = "Intergalactic jump in %.0f s."; "witch-user-galactic-abort" = "Intergalactic jump aborted."; - "game-paused" = "Game paused.\nPress F2 for options, P to resume."; - "game-paused-docked" = "Game paused. Press P to resume."; + "game-paused-@" = "Game paused.\nPress F2 for options, '%C' to resume."; + "game-paused-docked-@" = "Game paused. Press '%C' to resume."; "game-saved" = "Game saved."; "mouse-on" = "Mouse control on."; "mouse-off" = "Mouse control off."; diff --git a/src/Core/Universe.m b/src/Core/Universe.m index 67e5b078..73fac5b4 100644 --- a/src/Core/Universe.m +++ b/src/Core/Universe.m @@ -551,7 +551,7 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC else { [self setPauseMessageVisible:YES]; - [self addMessage:DESC(@"game-paused-docked") forCount:1.0]; + [self addMessage:[NSString stringWithFormat:DESC(@"game-paused-docked-@"),[[PLAYER keyConfig] oo_intForKey:@"key_pausebutton"]] forCount:1.0]; } } else @@ -563,7 +563,7 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC else { [self setPauseMessageVisible:YES]; - [self addMessage:DESC(@"game-paused") forCount:1.0]; + [self addMessage:[NSString stringWithFormat:DESC(@"game-paused-@"),[[PLAYER keyConfig] oo_intForKey:@"key_pausebutton"]] forCount:1.0]; } }