From 00d828e738fa3c509b6f5230073af19d687ede10 Mon Sep 17 00:00:00 2001 From: maedhros Date: Mon, 2 Apr 2007 11:35:08 +0000 Subject: (svn r9543) -Fix [FS#691]: Split up STR_ENGINE_NOT_BUILDABLE into four strings so it can be translated properly and remove "buildable", since it isn't actually a word. --- src/aircraft_cmd.cpp | 2 +- src/lang/english.txt | 5 ++++- src/roadveh_cmd.cpp | 2 +- src/ship_cmd.cpp | 2 +- src/train_cmd.cpp | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index caa6bfa85..d0dd6f6d8 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -237,7 +237,7 @@ uint16 AircraftDefaultCargoCapacity(CargoID cid, const AircraftVehicleInfo *avi) */ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { - if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_player)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE); + if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_player)) return_cmd_error(STR_AIRCRAFT_NOT_AVAILABLE); const AircraftVehicleInfo *avi = AircraftVehInfo(p1); int32 value = EstimateAircraftCost(avi); diff --git a/src/lang/english.txt b/src/lang/english.txt index c32c0fca2..e34670cdb 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3012,7 +3012,10 @@ STR_REPLACE_REMOVE_WAGON :{BLACK}Wagon re STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Make autoreplace keep the length of a train the same by removing wagons (starting at the front), if replacing the engine would make the train longer. STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}Replacing: {ORANGE}{SKIP}{SKIP}{STRING} STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK} EXPERIMENTAL FEATURE {}Switch between engine and wagon replacement windows.{}Wagon replacement will only be done if the new wagon can be refitted into carrying the same type of cargo as the old one. This is checked for each wagon when the actual replacement takes place. -STR_ENGINE_NOT_BUILDABLE :{WHITE}Engine is not buildable +STR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}Vehicle is not available +STR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}Vehicle is not available +STR_SHIP_NOT_AVAILABLE :{WHITE}Ship is not available +STR_AIRCRAFT_NOT_AVAILABLE :{WHITE}Aircraft is not available STR_ENGINES :Engines STR_WAGONS :Wagons diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index ede670d0a..b0cd7c946 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -131,7 +131,7 @@ int32 CmdBuildRoadVeh(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) UnitID unit_num; Engine *e; - if (!IsEngineBuildable(p1, VEH_ROAD, _current_player)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE); + if (!IsEngineBuildable(p1, VEH_ROAD, _current_player)) return_cmd_error(STR_ROAD_VEHICLE_NOT_AVAILABLE); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 0fde8ce5f..cf6687998 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -844,7 +844,7 @@ int32 CmdBuildShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) UnitID unit_num; Engine *e; - if (!IsEngineBuildable(p1, VEH_SHIP, _current_player)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE); + if (!IsEngineBuildable(p1, VEH_SHIP, _current_player)) return_cmd_error(STR_SHIP_NOT_AVAILABLE); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 7a0b839f9..03754b03e 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -704,7 +704,7 @@ static void AddRearEngineToMultiheadedTrain(Vehicle* v, Vehicle* u, bool buildin int32 CmdBuildRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { /* Check if the engine-type is valid (for the player) */ - if (!IsEngineBuildable(p1, VEH_TRAIN, _current_player)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE); + if (!IsEngineBuildable(p1, VEH_TRAIN, _current_player)) return_cmd_error(STR_RAIL_VEHICLE_NOT_AVAILABLE); /* Check if the train is actually being built in a depot belonging * to the player. Doesn't matter if only the cost is queried */ -- cgit v1.2.3-70-g09d2