From b2689e3a9e9fd6f67650d39a329c97d03760bbea Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 26 Jul 2020 22:45:03 +0200
Subject: [PATCH] Bug 2621: Fehlermeldung bei fehlender Anzahl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bei Personen- und Schiffsübergaben.

closing https://bugs.eressea.de/view.php?id=2621
---
 res/core/messages.xml           |  8 ++++++++
 res/translations/messages.de.po |  5 ++++-
 res/translations/messages.en.po |  3 +++
 res/translations/strings.de.po  |  6 ++++++
 res/translations/strings.en.po  |  6 ++++++
 src/give.c                      | 10 ++++++++++
 6 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/res/core/messages.xml b/res/core/messages.xml
index f505d2307..4a0212557 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -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"/>
diff --git a/res/translations/messages.de.po b/res/translations/messages.de.po
index abbf79811..3e4725974 100644
--- a/res/translations/messages.de.po
+++ b/res/translations/messages.de.po
@@ -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.\""
 
diff --git a/res/translations/messages.en.po b/res/translations/messages.en.po
index 013986fbc..49fbdcb3d 100644
--- a/res/translations/messages.en.po
+++ b/res/translations/messages.en.po
@@ -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\").\""
 
diff --git a/res/translations/strings.de.po b/res/translations/strings.de.po
index 4a55e8ab7..70d90a863 100644
--- a/res/translations/strings.de.po
+++ b/res/translations/strings.de.po
@@ -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"
diff --git a/res/translations/strings.en.po b/res/translations/strings.en.po
index 6375c5e96..ff7ecb01f 100644
--- a/res/translations/strings.en.po
+++ b/res/translations/strings.en.po
@@ -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"
diff --git a/src/give.c b/src/give.c
index d6813abd3..0338fa590 100644
--- a/src/give.c
+++ b/src/give.c
@@ -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,