Fehler bei der Ausgabe des Datums (Übersetzung)

This commit is contained in:
Enno Rehling 2002-07-28 11:51:24 +00:00
parent f559a57669
commit 9fac9fa712
1 changed files with 12 additions and 12 deletions

View File

@ -236,7 +236,7 @@ gamedate_season(const struct locale * lang)
} }
static char * static char *
gamedate2(void) gamedate2(const struct locale * lang)
{ {
int year,month,week,r; int year,month,week,r;
static char buf[256]; static char buf[256];
@ -249,15 +249,15 @@ gamedate2(void)
month = r/weeks_per_month; /* 0 - months_per_year-1 */ month = r/weeks_per_month; /* 0 - months_per_year-1 */
week = r%weeks_per_month; /* 0 - weeks_per_month-1 */ week = r%weeks_per_month; /* 0 - weeks_per_month-1 */
sprintf(buf, "in %s des Monats %s im Jahre %d %s.", sprintf(buf, "in %s des Monats %s im Jahre %d %s.",
weeknames2[week], LOC(lang, weeknames2[week]),
monthnames[month], LOC(lang, monthnames[month]),
year, year,
agename); LOC(lang, agename));
return buf; return buf;
} }
static char * static char *
gamedate_short(void) gamedate_short(const struct locale * lang)
{ {
int year,month,week,r; int year,month,week,r;
static char buf[256]; static char buf[256];
@ -270,7 +270,7 @@ gamedate_short(void)
month = r/weeks_per_month; /* 0 - months_per_year-1 */ month = r/weeks_per_month; /* 0 - months_per_year-1 */
week = r%weeks_per_month; /* 0 - weeks_per_month-1 */ week = r%weeks_per_month; /* 0 - weeks_per_month-1 */
sprintf(buf, "%d/%s/%d", week+1, monthnames[month], year); sprintf(buf, "%d/%s/%d", week+1, LOC(lang, monthnames[month]), year);
return buf; return buf;
} }
@ -2967,7 +2967,7 @@ reports(void)
} }
fprintf(shfp, "eresseamail.zipped $addr \"%s %s\" \"%d-%s.zip\" " fprintf(shfp, "eresseamail.zipped $addr \"%s %s\" \"%d-%s.zip\" "
"%d-%s.zip\n", global.gamename, gamedate_short(), turn, factionid(f), turn, factionid(f)); "%d-%s.zip\n", global.gamename, gamedate_short(f->locale), turn, factionid(f), turn, factionid(f));
} else if(f->options & wants_bzip2) { } else if(f->options & wants_bzip2) {
@ -2979,7 +2979,7 @@ reports(void)
fprintf(BAT, "bzip2 -9v `ls %d-%s.nr %d-%s.cr`\n", fprintf(BAT, "bzip2 -9v `ls %d-%s.nr %d-%s.cr`\n",
turn, factionid(f), turn, factionid(f)); turn, factionid(f), turn, factionid(f));
fprintf(shfp, "eresseamail.bzip2 $addr \"%s %s\"", global.gamename, gamedate_short()); fprintf(shfp, "eresseamail.bzip2 $addr \"%s %s\"", global.gamename, gamedate_short(f->locale));
if (!nonr && f->options & wants_report) if (!nonr && f->options & wants_report)
fprintf(shfp, fprintf(shfp,
@ -2998,7 +2998,7 @@ reports(void)
#endif #endif
} else { } else {
fprintf(shfp, MAIL " $addr \"%s %s\"", global.gamename, gamedate_short()); fprintf(shfp, MAIL " $addr \"%s %s\"", global.gamename, gamedate_short(f->locale));
if (f->age == 1) { if (f->age == 1) {
fprintf(shfp, fprintf(shfp,
@ -3495,7 +3495,7 @@ writeturn(void)
sprintf(zText, "%s/datum", basepath()); sprintf(zText, "%s/datum", basepath());
f = cfopen(zText, "w"); f = cfopen(zText, "w");
if (!f) return; if (!f) return;
fputs(gamedate2(), f); fputs(gamedate2(&default_locale), f);
fclose(f); fclose(f);
sprintf(zText, "%s/turn", basepath()); sprintf(zText, "%s/turn", basepath());
f = cfopen(zText, "w"); f = cfopen(zText, "w");
@ -3532,7 +3532,7 @@ report_summary(summary * s, summary * o, boolean full)
if (!F) return; if (!F) return;
} }
printf("Schreibe Zusammenfassung (parteien)...\n"); printf("Schreibe Zusammenfassung (parteien)...\n");
fprintf(F, "%s\n%s\n\n", global.gamename, gamedate2()); fprintf(F, "%s\n%s\n\n", global.gamename, gamedate2(&default_locale));
fprintf(F, "Auswertung Nr: %d\n\n", turn); fprintf(F, "Auswertung Nr: %d\n\n", turn);
fprintf(F, "Parteien: %s\n", pcomp(s->factions, o->factions)); fprintf(F, "Parteien: %s\n", pcomp(s->factions, o->factions));
fprintf(F, "Einheiten: %s\n", pcomp(s->nunits, o->nunits)); fprintf(F, "Einheiten: %s\n", pcomp(s->nunits, o->nunits));