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

Duplicate strings part II: restored the previous translation strings. Distance and estimated travel time strings can now be overridden globally, or assume separate values depending on which chart is displayed! :)

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4211 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2011-02-02 09:53:03 +00:00
parent 150dd2b9a5
commit 40184ebb0c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Resources/Config/descriptions.plist
View File

@ -968,15 +968,19 @@
"equipment-@-not-available" = "%@ (N/A)";
"manifest-cargo-quantity-format" = "%d %@ × %@"; // $count $units × $commodityName
// Short and Long Range Chart Screens
// Short and Long Range Chart Overrides
"charts-distance-f" = "Distance: %.1f Light Years";
"charts-est-travel-time-f" = "Estimated Travel Time: %.1f Hours";
// Short Range Chart Screen
"short-range-chart-title" = "Short Range Chart";
"short-range-chart-distance-f" = "[charts-distance-f]";
"short-range-chart-est-travel-time-f" = "[charts-est-travel-time-f]";
// Long Range Chart Screen
"long-range-chart-title-d" = "Galactic Chart %d";
"long-range-chart-distance-f" = "[charts-distance-f]";
"long-range-chart-est-travel-time-f" = "[charts-est-travel-time-f]";
"long-range-chart-find-planet-@" = "Find planet: %@";
"long-range-chart-system-unreachable" = "System Unreachable";

5
src/Core/Entities/PlayerEntity.m
View File

@ -5609,8 +5609,9 @@ done:
[gui clearAndKeepBackground:!guiChanged];
[gui setTitle:DESC(@"short-range-chart-title")];
[gui setText:targetSystemName forRow:19];
[gui setText:[NSString stringWithFormat:DESC(@"charts-distance-f"), distance] forRow:20];
if ([self hasHyperspaceMotor]) [gui setText:(NSString *)((distance > 0.0 && distance <= (double)fuel/10.0) ? [NSString stringWithFormat:DESC(@"charts-est-travel-time-f"), estimatedTravelTime] : @"") forRow:21];
// distance-f & est-travel-time-f are identical between short & long range charts in standard Oolite, however can be alterered separately via OXPs
[gui setText:[NSString stringWithFormat:ExpandDescriptionForCurrentSystem(@"[short-range-chart-distance-f]"), distance] forRow:20];
if ([self hasHyperspaceMotor]) [gui setText:(NSString *)((distance > 0.0 && distance <= (double)fuel/10.0) ? [NSString stringWithFormat:ExpandDescriptionForCurrentSystem(@"[short-range-chart-est-travel-time-f]"), estimatedTravelTime] : @"") forRow:21];
[gui setShowTextCursor:NO];
}
/* ends */

5
src/Core/GuiDisplayGen.m
View File

@ -1603,11 +1603,12 @@ static OOTextureSprite *NewTextureSpriteWithDescriptor(NSDictionary *descriptor)
if (routeExists)
{
[self setText:[NSString stringWithFormat:DESC(@"charts-distance-f"), distance] forRow:18];
// distance-f & est-travel-time-f are identical between short & long range charts in standard Oolite, however can be alterered separately via OXPs
[self setText:[NSString stringWithFormat:ExpandDescriptionForCurrentSystem(@"[long-range-chart-distance-f]"), distance] forRow:18];
NSString *travelTimeLine = @"";
if (advancedNavArrayMode != OPTIMIZED_BY_NONE && distance > 0)
{
travelTimeLine = [NSString stringWithFormat:DESC(@"charts-est-travel-time-f"), time];
travelTimeLine = [NSString stringWithFormat:ExpandDescriptionForCurrentSystem(@"[long-range-chart-est-travel-time-f]"), time];
}
[self setText:travelTimeLine forRow:19];
}