From b226d113401b48898fa9350029a7bacd2d0b0673 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Wed, 22 Sep 2004 23:17:15 +0000
Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=274 - potion text
 not correct when seen in CR

---
 src/common/gamecode/creport.c | 19 ++++++++++++++++---
 src/common/gamecode/report.c  |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index bee98e092..93cdfa8a9 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -1194,14 +1194,27 @@ report_computer(FILE * F, faction * f, const faction_list * addresses,
 	for (a=a_find(f->attribs, &at_showitem);a;a=a->nexttype) {
 		const potion_type * ptype = resource2potion(((const item_type*)a->data.v)->rtype);
 		requirement * m;
-		const char * ch;
-		if (ptype==NULL) continue;
+		const char * ch, * description;
+
+    if (ptype==NULL) continue;
 		m = ptype->itype->construction->materials;
 		ch = resourcename(ptype->itype->rtype, 0);
 		fprintf(F, "TRANK %d\n", hashstring(ch));
 		fprintf(F, "\"%s\";Name\n", add_translation(ch, locale_string(f->locale, ch)));
 		fprintf(F, "%d;Stufe\n", ptype->level);
-		fprintf(F, "\"%s\";Beschr\n", ptype->text);
+
+    description = ptype->text;
+    if (description==NULL || f->locale!=find_locale("de")) {
+      const char * pname = resourcename(ptype->itype->rtype, 0);
+      const char * potiontext = mkname("potion", pname);
+      description = LOC(f->locale, potiontext);
+      if (strcmp(description, potiontext)==0) {
+        /* string not found */
+        description = ptype->text;
+      }
+    }
+    
+    fprintf(F, "\"%s\";Beschr\n", description);
 		fprintf(F, "ZUTATEN\n");
 
 		while (m->number) {
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 9954aebdf..8f36a5872 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -2140,7 +2140,6 @@ report(FILE *F, faction * f, const faction_list * addresses,
 		requirement * m;
     if (ptype!=NULL) {
       const char * pname = resourcename(ptype->itype->rtype, 0);
-			const char * potiontext = mkname("potion", pname);
 		  m = ptype->itype->construction->materials;
 		  if (ch==0) {
 			  rnl(F);
@@ -2163,6 +2162,7 @@ report(FILE *F, faction * f, const faction_list * addresses,
 		  rnl(F);
       description = ptype->text;
       if (description==NULL || f->locale!=find_locale("de")) {
+        const char * potiontext = mkname("potion", pname);
         description = LOC(f->locale, potiontext);
         if (strcmp(description, potiontext)==0) {
           /* string not found */