merchandise: Adding first informations about deliveries

2 files changed, 58 insertions, 24 deletions

diff --git a/english/events/merchandise.data b/english/events/merchandise.data
index 758f4c321a1..0aadf72e3e8 100644
--- a/english/events/merchandise.data
+++ b/english/events/merchandise.data
@@ -15,6 +15,7 @@
   <their_products <t-shirts>, <mugs>, <other_clothing>, <badges>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <english>>
+  <their_delivery <international>>
 </mercentry>
 
 # Removed on request
@@ -30,6 +31,7 @@
   <their_products <t-shirts>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <german>>
+  <their_delivery <no-international>, <austria>, <germany>>
 </mercentry>
 
 # 20190322, ta, website no longer available
@@ -46,6 +48,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_delivery <international>>
   <money-events>
   <donates>
 </mercentry>
@@ -79,6 +82,7 @@
   <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <mugs>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <english>>
+  <their_delivery <international>>
   <donates>
 </mercentry>
 
@@ -136,6 +140,7 @@
   <their_products <stickers>>
   <their_last_update> <:=spokendate('2019-12-22'):>
   <their_langs <english>>
+  <their_delivery <international>>
 </mercentry>
 
 #<mercentry>
diff --git a/english/events/merchandise.def b/english/events/merchandise.def
index 9fbd0fc0852..dba34773f11 100644
--- a/english/events/merchandise.def
+++ b/english/events/merchandise.def
@@ -5,30 +5,6 @@
 #use wml::debian::ctime
 
 ##########
-# Define tags for languages
-
-<bind-gettext-domain domain="l10n" />
-
-<define-tag languages  whitespace=delete>
-  <gettext domain="l10n">Language list</gettext>
-</define-tag>
-
-<bind-gettext-domain domain="langs" />
-
-<define-tag english whitespace=delete>
-  <gettext domain="langs">English</gettext>
-</define-tag>
-<define-tag french whitespace=delete>
-  <gettext domain="langs">French</gettext>
-</define-tag>
-<define-tag german whitespace=delete>
-  <gettext domain="langs">German</gettext>
-</define-tag>
-<define-tag polish whitespace=delete>
-  <gettext domain="langs">Polish</gettext>
-</define-tag>
-
-##########
 # Define tags for products
 
 <bind-gettext-domain domain="others" />
@@ -108,6 +84,54 @@
 </define-tag>
 
 ##########
+# Define tags for languages
+
+<bind-gettext-domain domain="l10n" />
+
+<define-tag languages  whitespace=delete>
+  <gettext domain="l10n">Language list</gettext>
+</define-tag>
+
+<bind-gettext-domain domain="langs" />
+
+<define-tag english whitespace=delete>
+  <gettext domain="langs">English</gettext>
+</define-tag>
+<define-tag french whitespace=delete>
+  <gettext domain="langs">French</gettext>
+</define-tag>
+<define-tag german whitespace=delete>
+  <gettext domain="langs">German</gettext>
+</define-tag>
+<define-tag polish whitespace=delete>
+  <gettext domain="langs">Polish</gettext>
+</define-tag>
+
+##########
+# Define tags for delivery
+
+<bind-gettext-domain domain="vendors" />
+
+<define-tag delivery whitespace=delete>
+  <gettext domain="vendors">Ship International</gettext>
+</define-tag>
+
+<define-tag international whitespace=delete>
+  <gettext domain="templates">Yes</gettext>
+</define-tag>
+<define-tag no-international whitespace=delete>
+  <gettext domain="templates">No</gettext>
+</define-tag>
+
+<define-tag germany whitespace=delete>
+  <gettext domain="countries">Germany</gettext>
+</define-tag>
+<define-tag austria whitespace=delete>
+  <gettext domain="countries">Austria</gettext>
+</define-tag>
+
+
+##########
 # Define data for each vendors
 
 <define-tag mercentry endtag=required>\
@@ -130,6 +154,11 @@
   <strong><languages>:</strong> %attributes
 </define-tag>
 
+<define-tag their_delivery>\
+  <br>
+  <strong><delivery>:</strong> %attributes
+</define-tag>
+
 <define-tag donates>\
   <br>
   <gettext domain="others">Donates money to Debian</gettext>