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

Bug 2621: Fehlermeldung bei fehlender Anzahl

Browse source 
bei Personen- und Schiffsübergaben.

closing https://bugs.eressea.de/view.php?id=2621
This commit is contained in:
Enno Rehling 2020-07-26 22:45:03 +02:00
parent 09c9ba32eb
commit b2689e3a9e
6 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
res/core/messages.xml
View file

@ -4982,6 +4982,14 @@
<arg name="resource" type="resource"/>
</type>
</message>
<message name="give_number_missing" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
<arg name="resource" type="string"/>
</type>
</message>
<message name="error35" section="errors">
<type>
<arg name="unit" type="unit"/>

5
res/translations/messages.de.po
View file

@ -1389,7 +1389,7 @@ msgid "earthquake_effect"
msgstr "\"$unit($mage) läßt die Erde in $region($region) erzittern.\""
msgid "error56"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit kann soviele Pferde nicht bändigen.\""
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit kann so viele Pferde nicht bändigen.\""
msgid "error78"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Ein Fluch verhindert die Übergabe.\""
@ -2777,6 +2777,9 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - So viele Schiff
msgid "error328"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Dafür müssen die Schiffe an derselben Küste liegen.\""
msgid "give_number_missing"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Anzahl der $localize($resource) fehlt.\""
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

@ -2780,6 +2780,9 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - The ship is und
msgid "error328"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - All ships of a convoy must be on the same coast.\""
msgid "give_number_missing"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Missign number of $localize($resource,0).\""
msgid "dissolve_units_2"
msgstr "\"$unit($unit) in $region($region): $int($number) $race($race,$number) turned into $if($eq($number,1),\"a tree\", \"trees\").\""

6
res/translations/strings.de.po
View file

@ -1029,6 +1029,12 @@ msgstr "ein Boot"
msgid "boat_p"
msgstr "Boote"
msgid "ship"
msgstr "Schiff"
msgid "ship_p"
msgstr "Schiffe"
msgctxt "race"
msgid "nymph"
msgstr "Nymphe"

6
res/translations/strings.en.po
View file

@ -838,6 +838,12 @@ msgstr "a boat"
msgid "boat_p"
msgstr "boats"
msgid "ship"
msgstr "ship"
msgid "ship_p"
msgstr "ships"
msgctxt "race"
msgid "orc_p"
msgstr "orcs"

10
src/give.c
View file

@ -836,6 +836,16 @@ void give_cmd(unit * u, order * ord)
/* handled in give_control_cmd */
return;
}
else if (p == P_SHIP) {
ADDMSG(&u->faction->msgs,
msg_feedback(u, ord, "give_number_missing", "resource", "ship_p"));
return;
}
else if (p == P_PERSON) {
ADDMSG(&u->faction->msgs,
msg_feedback(u, ord, "give_number_missing", "resource", "person_p"));
return;
}
if (err == GET_NOTFOUND || (err != GET_PEASANTS && !can_give_to(u, u2))) {
ADDMSG(&u->faction->msgs,