merchandise: Adding informations about original country

2 files changed, 40 insertions, 3 deletions

diff --git a/english/events/merchandise.data b/english/events/merchandise.data
index ea95931f863..a01adf21f19 100644
--- a/english/events/merchandise.data
+++ b/english/events/merchandise.data
@@ -8,6 +8,7 @@
   <their_products <t-shirts>, <mugs>, <other_clothing>, <badges>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <english>>
+  <their_country <germany>>
   <their_delivery <international>>
 </mercentry>
 
@@ -17,6 +18,7 @@
   <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <hats>, <mouse_pads>, <mugs>, <toys>, <bags>, <pillowcases>, <badges>, <stickers>, <cards>, <others>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <english>>
+  <their_country <usa>>
   <their_delivery <no-international>. <more-information "https://www.cafepress.com/p/help-buying-ordering#5">>
   <donates>
 </mercentry>
@@ -27,6 +29,7 @@
   <their_products <t-shirts>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <german>>
+  <their_country <austria>>
   <their_delivery <no-international>, <austria>, <germany>. <more-information "https://common-shirts.org/infos-zu-abholungen/">>
 </mercentry>
 
@@ -36,6 +39,7 @@
   <their_products <t-shirts>, <polo_shirts>, <stickers>, <other_clothing>, <mugs>, <usb-sticks>, <others>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <french>, <english>>
+  <their_country <france>>
   <their_delivery <international>>
   <money-events>
   <donates>
@@ -47,6 +51,7 @@
   <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <mugs>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <english>>
+  <their_country <spain>>
   <their_delivery <international>>
   <donates>
 </mercentry>
@@ -57,6 +62,7 @@
   <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <usb-sticks>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <english>>
+  <their_country <hungary>>
   <their_delivery <international>>
 </mercentry>
 
@@ -66,6 +72,8 @@
  <their_products <t-shirts>, <pillowcases>>
  <their_last_update> <:=spokendate('2019-12-22'):>
  <their_langs <polish>>
+ <their_country <poland>>
+ <their_delivery <no-international>, <europe>>
 </mercentry>
 
 # added, see <9aee95f3-d99e-5db6-88f6-5aafbef22bd1@gmx.de>
@@ -75,6 +83,7 @@
   <their_products <stickers>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <english>>
+  <their_country <usa>>
   <their_delivery <international>>
 </mercentry>
 
diff --git a/english/events/merchandise.def b/english/events/merchandise.def
index cd0332cc85f..a9a417654b3 100644
--- a/english/events/merchandise.def
+++ b/english/events/merchandise.def
@@ -104,7 +104,7 @@
 </define-tag>
 
 ##########
-# Define tags for delivery
+# Define tags for country and delivery
 
 <define-tag delivery whitespace=delete>
   <gettext domain="others">International delivery:</gettext>
@@ -117,12 +117,35 @@
   <no>
 </define-tag>
 
-<define-tag germany whitespace=delete>
-  <gettext domain="countries">Germany</gettext>
+<define-tag europe whitespace=delete>
+  <gettext domain="others">within Europe</gettext>
+</define-tag>
+
+<define-tag country whitespace=delete>
+  <gettext domain="others">Original country:</gettext>
 </define-tag>
+
 <define-tag austria whitespace=delete>
   <gettext domain="countries">Austria</gettext>
 </define-tag>
+<define-tag france whitespace=delete>
+  <gettext domain="countries">France</gettext>
+</define-tag>
+<define-tag germany whitespace=delete>
+  <gettext domain="countries">Germany</gettext>
+</define-tag>
+<define-tag hungary whitespace=delete>
+  <gettext domain="countries">Hungary</gettext>
+</define-tag>
+<define-tag poland whitespace=delete>
+  <gettext domain="countries">Poland</gettext>
+</define-tag>
+<define-tag spain whitespace=delete>
+  <gettext domain="countries">Spain</gettext>
+</define-tag>
+<define-tag usa whitespace=delete>
+  <gettext domain="countries">United States</gettext>
+</define-tag>
 
 <define-tag more-information whitespace=delete>
   <gettext domain="others">More information</gettext> \
@@ -155,6 +178,11 @@
   <strong><languages></strong> %attributes
 </define-tag>
 
+<define-tag their_country>\
+  <br>
+  <strong><country></strong> %attributes
+</define-tag>
+
 <define-tag their_delivery>\
   <br>
   <strong><delivery></strong> %attributes