Fixed inconsistencies with the Extra Passenger Berth(s) description in the shipyard.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3492 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2010-06-10 17:47:35 +00:00
parent dd0e03e2ce
commit 4414ba6f43
2 changed files with 8 additions and 5 deletions

View File

@ -1140,8 +1140,10 @@
"shipyard-total-available-%@-%@-plus-%@-trade" = "Total available: %@. (%@ Cash + %@ Trade.)";
"passenger-berth%0" = "Passenger Berth";
"passenger-berth%1" = "Passenger Berths";
"extra-@-@" = " Extra %@ (%@)";
"plus-@" = " Plus %@.";
"extra-@-@-(long-description)" = " Extra %@ (%@)";
"extra-@-@-(passenger-berths)" = " Extra %@ %@";
"extra-@-@-@-(passenger-berth-long-description)" = "Extra %@%@ (%@)";
"plus-@" = " Plus %@.";
"shipyard-standard-customer-model" = " Standard customer model.";
"shipyard-forward-weapon-has-been-upgraded-to-a-@" = " Forward weapon has been upgraded to a %@.";
"shipyard-forward-weapon-upgraded-to-@" = " Forward weapon upgraded to %@.";

View File

@ -7622,7 +7622,7 @@ double estimatedTimeForJourney(double distance, int hops)
{
price += eqPrice;
[extras addObject:equipmentKey];
[description appendFormat:DESC(@"extra-@-@"), eqShortDesc, [eqLongDesc lowercaseString]];
[description appendFormat:DESC(@"extra-@-@-(long-description)"), eqShortDesc, [eqLongDesc lowercaseString]];
[short_description appendFormat:short_extras_string, eqShortDesc];
short_extras_string = @" %@.";
customised = YES;
@ -7639,8 +7639,9 @@ double estimatedTimeForJourney(double distance, int hops)
{
NSString* npb = (passenger_berths > 1)? [NSString stringWithFormat:@"%d ", passenger_berths] : (id)@"";
NSString* ppb = DESC_PLURAL(@"passenger-berth", passenger_berths);
[description appendFormat:@"Extra %@%@ (%@)", npb, ppb, passengerBerthLongDesc];
[short_description appendFormat:@"Extra %@%@.", npb, ppb];
NSString* extraPassengerBerthsDescription = [NSString stringWithFormat:DESC(@"extra-@-@-(passenger-berths)"), npb, ppb];
[description appendFormat:DESC(@"extra-@-@-@-(passenger-berth-long-description)"), npb, ppb, passengerBerthLongDesc];
[short_description appendFormat:short_extras_string, extraPassengerBerthsDescription];
}
if (!customised)