Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Even more hardcoded strings found and externalized. Are they ever going to end?

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1658 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2008-05-29 10:55:00 +00:00
parent b81d73ffd7
commit d97720b1a7
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Resources/Config/descriptions.plist
View File

@ -958,6 +958,15 @@
// Load commander screen // Load commander screen
"loadscreen-title" = "Select Commander"; "loadscreen-title" = "Select Commander";
// Load game failed messages
"loadfailed-no-file-specified" = "No file specified!";
"loadfailed-could-not-load-file" = "Could not load file.";
"loadfailed-could-not-find-ship-type-@-please-reinstall-the-appropriate-OXP"
= "Could not find ship type \"%@\" - please reinstall the appropriate OXP.";
"loadfailed-invalid-saved-game-no-ship-specified"
= "Invalid saved game - no ship specified.";
"loadfailed-could-not-set-up-player-ship" = "Could not set up player ship.";
// Save/Overwrite commander screens // Save/Overwrite commander screens
"savescreen-title" = "Save Commander"; "savescreen-title" = "Save Commander";
"savescreen-commander-name-@" = "Commander name: %@"; "savescreen-commander-name-@" = "Commander name: %@";

10
src/Core/Entities/PlayerEntityLoadSave.m
View File

@ -391,7 +391,7 @@
if (fileToOpen == nil) if (fileToOpen == nil)
{ {
fail_reason = @"No file specified!"; fail_reason = DESC(@"loadfailed-no-file-specified");
loadedOK = NO; loadedOK = NO;
} }
@ -400,7 +400,7 @@
fileDic = OODictionaryFromFile(fileToOpen); fileDic = OODictionaryFromFile(fileToOpen);
if (fileDic == nil) if (fileDic == nil)
{ {
fail_reason = @"Could not load file."; fail_reason = DESC(@"loadfailed-could-not-load-file");
loadedOK = NO; loadedOK = NO;
} }
} }
@ -417,8 +417,8 @@
if (shipDict == nil) if (shipDict == nil)
{ {
loadedOK = NO; loadedOK = NO;
if (shipKey != nil) fail_reason = [NSString stringWithFormat:@"Couldn't find ship type \"%@\" - please reinstall the appropriate OXP.", shipKey]; if (shipKey != nil) fail_reason = [NSString stringWithFormat:DESC(@"loadfailed-could-not-find-ship-type-@-please-reinstall-the-appropriate-OXP"), shipKey];
else fail_reason = @"Invalid saved game - no ship specified."; else fail_reason = DESC(@"loadfailed-invalid-saved-game-no-ship-specified");
} }
} }
@ -431,7 +431,7 @@
} }
else else
{ {
fail_reason = @"Could not set up player ship."; fail_reason = DESC(@"loadfailed-could-not-set-up-player-ship");
loadedOK = NO; loadedOK = NO;
} }
} }