From 29ce905bc2ab5641503bda22d7c80ff5760ac585 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 9 Feb 2010 21:48:57 +0000 Subject: [PATCH] (svn r19070) -Fix [FS#3607]: the station coverage text was not RTL language aware (sbr) --- src/lang/english.txt | 4 ++-- src/station_gui.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index db77d66f68..80b3f5d126 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1865,8 +1865,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off STR_STATION_BUILD_COVERAGE_ON :{BLACK}On STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't highlight coverage area of proposed site STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{RAW_STRING} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{RAW_STRING} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Join station diff --git a/src/station_gui.cpp b/src/station_gui.cpp index ccbea9c0f1..1741f28d13 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -43,7 +43,7 @@ int DrawCargoListText(uint32 cargo_mask, const Rect &r, StringID prefix) { bool first = true; char string[512]; - char *b = InlineString(string, prefix); + char *b = string; for (CargoID i = 0; i < NUM_CARGO; i++) { if (b >= lastof(string) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode() @@ -68,7 +68,7 @@ int DrawCargoListText(uint32 cargo_mask, const Rect &r, StringID prefix) assert(b < endof(string)); SetDParamStr(0, string); - return DrawStringMultiLine(r.left, r.right, r.top, r.bottom, STR_JUST_RAW_STRING); + return DrawStringMultiLine(r.left, r.right, r.top, r.bottom, prefix); } /**