Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

Bug 2521: Übersetzung von at_racename für Geister

Browse source
This commit is contained in:
Enno Rehling 2018-12-01 12:27:11 +01:00
parent fbb7a6c418
commit 2766ed8de4
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/creport.c
View file

@ -848,11 +848,13 @@ void cr_output_unit(stream *out, const faction * f,
pzTmp = get_racename(u->attribs); pzTmp = get_racename(u->attribs);
if (pzTmp) { if (pzTmp) {
stream_printf(out, "\"%s\";Typ\n", pzTmp); const char *pzRace = LOC(lang, mkname("race", pzTmp));
pzTmp = pzRace ? pzRace : pzTmp;
stream_printf(out, "\"%s\";Typ\n", translate(pzTmp, LOC(lang, pzTmp)));
if (u->faction == f && fval(u_race(u), RCF_SHAPESHIFTANY)) { if (u->faction == f && fval(u_race(u), RCF_SHAPESHIFTANY)) {
const char *zRace = rc_name_s(u_race(u), NAME_PLURAL); pzRace = rc_name_s(u_race(u), NAME_PLURAL);
stream_printf(out, "\"%s\";wahrerTyp\n", stream_printf(out, "\"%s\";wahrerTyp\n",
translate(zRace, LOC(lang, zRace))); translate(pzRace, LOC(lang, pzRace)));
} }
} }
else { else {

3
src/reports.c
View file

@ -714,7 +714,8 @@ void bufunit(const faction * f, const unit * u, const faction *fv,
pzTmp = get_racename(u->attribs); pzTmp = get_racename(u->attribs);
if (pzTmp) { if (pzTmp) {
sbs_strcat(sbp, pzTmp); const char *name = LOC(lang, mkname("race", pzTmp));
sbs_strcat(sbp, name ? name : pzTmp);
if (u->faction == f && fval(u_race(u), RCF_SHAPESHIFTANY)) { if (u->faction == f && fval(u_race(u), RCF_SHAPESHIFTANY)) {
sbs_strcat(sbp, " ("); sbs_strcat(sbp, " (");
sbs_strcat(sbp, racename(lang, u, u_race(u))); sbs_strcat(sbp, racename(lang, u, u_race(u)));