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

Bug 2653: Fehlermeldungen bei Übergabe von Schiffen.

This commit is contained in:
Enno Rehling 2020-03-25 19:20:51 +01:00
parent af38880b15
commit 112126b07b
6 changed files with 67 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
res/core/messages.xml
View File

@ -3740,6 +3740,62 @@
<arg name="command" type="order"/>
</type>
</message>
<message name="error321" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error322" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error323" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error324" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error325" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error326" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error327" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error328" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error181" section="errors">
<type>
<arg name="unit" type="unit"/>

3
res/translations/messages.de.po
View File

@ -2783,6 +2783,9 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - Das Schiff ist
msgid "error327"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - So viele Schiffe kann die Einheit nicht übergeben.\""
msgid "error328"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Dafür müssen die Schiffe an der selben Küste liegen.\""
msgid "error326"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Diese Schiffe können keinen Konvoi bilden.\""

3
res/translations/messages.en.po
View File

@ -2723,6 +2723,9 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - The unit did no
msgid "error182"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - The ship cannot leave in this direction.\""
msgid "error321"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - The ships need to be on the same coast for this.\""
msgid "analyse_ship_nospell"
msgstr "\"It appears to $unit($mage) that $ship($ship) is not charmed.\""

2
src/give.c
View File

@ -371,7 +371,7 @@ message * give_ship(unit *u1, unit *u2, int n, order *ord)
u2->ship->coast = u1->ship->coast;
}
else {
return msg_error(u1, ord, 182);
return msg_error(u1, ord, 328);
}
}
}

6
src/report.c
View File

@ -1718,23 +1718,23 @@ nr_ship(struct stream *out, const region *r, const ship * sh, const faction * f,
char buffer[1024];
char ch;
sbstring sbs;
const char *stname;
sbs_init(&sbs, buffer, sizeof(buffer));
newline(out);
stname = locale_plural(f->locale, sh->type->_name, sh->number, true);
if (captain && captain->faction == f) {
int n = 0, p = 0;
const char *stname;
getshipweight(sh, &n, &p);
n = (n + 99) / 100; /* 1 Silber = 1 GE */
stname = locale_plural(f->locale, sh->type->_name, sh->number, true);
sbs_printf(&sbs, "%s, %d %s, (%d/%d)", shipname(sh), sh->number,
stname, n, ship_capacity(sh) / 100);
}
else {
sbs_printf(&sbs, "%s, %s", shipname(sh), LOC(f->locale, sh->type->_name));
sbs_printf(&sbs, "%s, %d %s", sh->number, shipname(sh), stname);
}
if (!ship_finished(sh)) {

2
src/util/message.c
View File

@ -277,7 +277,7 @@ const message_type *mt_find(const char *name)
return data;
}
}
return 0;
return NULL;
}
void msg_free(message * msg)