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

script-fix welcome-text für neue spieler.

This commit is contained in:
Enno Rehling 2005-08-07 14:37:25 +00:00
parent e639a1258b
commit db7c4914f3
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/gamecode/report.c
View File

@ -2785,7 +2785,7 @@ reports(void)
for (f = factions; f; f = f->next) { for (f = factions; f; f = f->next) {
int error = write_reports(f, ltime); int error = write_reports(f, ltime);
if (error) retval = error; if (error) retval = error;
if (!nosh && f->email && BAT) { if (!nosh && f->email && strlen(f->email) && BAT) {
sprintf(buf, "%s/%s.sh", reportpath(), factionid(f)); sprintf(buf, "%s/%s.sh", reportpath(), factionid(f));
shfp = fopen(buf, "w"); shfp = fopen(buf, "w");
fprintf(shfp,"#!/bin/sh\n\nPATH=%s\n\n",MailitPath()); fprintf(shfp,"#!/bin/sh\n\nPATH=%s\n\n",MailitPath());
@ -2816,12 +2816,6 @@ reports(void)
} else if(f->options & REPORT_BZIP2) { } else if(f->options & REPORT_BZIP2) {
if (f->age == 1) {
fprintf(shfp,
" \\\n\t\"text/plain\" \"Willkommen\" %s/%s/%s/welcome.txt",
resourcepath(), global.welcomepath, locale_name(f->locale));
}
fprintf(BAT, "bzip2 -9v `ls %d-%s.nr %d-%s.txt %d-%s.cr`\n", fprintf(BAT, "bzip2 -9v `ls %d-%s.nr %d-%s.txt %d-%s.cr`\n",
turn, factionid(f), turn, factionid(f),
turn, factionid(f), turn, factionid(f),
@ -2843,9 +2837,6 @@ reports(void)
fprintf(shfp, fprintf(shfp,
" \\\n\t\"application/x-bzip2\" \"Computer-Report\" %d-%s.cr.bz2", " \\\n\t\"application/x-bzip2\" \"Computer-Report\" %d-%s.cr.bz2",
turn, factionid(f)); turn, factionid(f));
} else {
fprintf(shfp, MAIL " $addr \"%s %s\"", global.gamename, gamedate_short(f->locale));
if (f->age == 1) { if (f->age == 1) {
fprintf(shfp, fprintf(shfp,
@ -2853,6 +2844,10 @@ reports(void)
resourcepath(), global.welcomepath, locale_name(f->locale)); resourcepath(), global.welcomepath, locale_name(f->locale));
} }
} else {
fprintf(shfp, MAIL " $addr \"%s %s\"", global.gamename, gamedate_short(f->locale));
if (!nonr && f->options & REPORT_NR) if (!nonr && f->options & REPORT_NR)
fprintf(shfp, fprintf(shfp,
" \\\n\t\"text/plain\" \"Report\" %d-%s.nr", " \\\n\t\"text/plain\" \"Report\" %d-%s.nr",
@ -2867,6 +2862,13 @@ reports(void)
fprintf(shfp, fprintf(shfp,
" \\\n\t\"text/x-eressea-cr\" \"Computer-Report\" %d-%s.cr", " \\\n\t\"text/x-eressea-cr\" \"Computer-Report\" %d-%s.cr",
turn, factionid(f)); turn, factionid(f));
if (f->age == 1) {
fprintf(shfp,
" \\\n\t\"text/plain\" \"Willkommen\" %s/%s/%s/welcome.txt",
resourcepath(), global.welcomepath, locale_name(f->locale));
}
} }
fprintf(BAT, ". %s.sh %s\n", factionid(f), f->email); fprintf(BAT, ". %s.sh %s\n", factionid(f), f->email);

2
src/res/de/strings.xml
View File

@ -450,7 +450,7 @@
<string name="dragonship_a"> <string name="dragonship_a">
<text locale="de">ein Drachenschiff</text> <text locale="de">ein Drachenschiff</text>
</string> </string>
<string name="Trireme_a"> <string name="trireme_a">
<text locale="de">eine Trireme</text> <text locale="de">eine Trireme</text>
</string> </string>