From bd7d2e12710d3d7f80305f45c90e9427f35ac788 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 3 Feb 2008 15:51:39 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=1343 "required-Tag von $resources() liefert falsche Item-Bezeichnungen" - lokalisierter string --- src/common/gamecode/creport.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c index e8530c7c8..b007d4bad 100644 --- a/src/common/gamecode/creport.c +++ b/src/common/gamecode/creport.c @@ -410,16 +410,17 @@ cr_order(variant var, char * buffer, const void * userdata) static int cr_resources(variant var, char * buffer, const void * userdata) { + faction * f = (faction*)userdata; resource * rlist = (resource*)var.v; char * wp = buffer; if (rlist!=NULL) { - wp += sprintf(wp, "\"%d %s", rlist->number, - resourcename(rlist->type, rlist->number!=1)); + const char * name = resourcename(rlist->type, rlist->number!=1); + wp += sprintf(wp, "\"%d %s", rlist->number, add_translation(name, LOC(f->locale, name))); for (;;) { rlist = rlist->next; if (rlist==NULL) break; - wp += sprintf(wp, ", %d %s", rlist->number, - resourcename(rlist->type, rlist->number!=1)); + name = resourcename(rlist->type, rlist->number!=1); + wp += sprintf(wp, ", %d %s", rlist->number, add_translation(name, LOC(f->locale, name))); } strcat(wp, "\""); } @@ -1573,3 +1574,4 @@ creport_cleanup(void) junkyard = 0; } +