merchandise: Adding languages available on websites

3 files changed, 45 insertions, 2 deletions

diff --git a/english/events/merchandise.data b/english/events/merchandise.data
index 308d17ee67d..758f4c321a1 100644
--- a/english/events/merchandise.data
+++ b/english/events/merchandise.data
@@ -14,6 +14,7 @@
   <URL "https://shop.spreadshirt.de/antcom/">
   <their_products <t-shirts>, <mugs>, <other_clothing>, <badges>>
   <their_last_update> <:=spokendate('2019-12-22'):>
+  <their_langs <english>>
 </mercentry>
 
 # Removed on request
@@ -28,6 +29,7 @@
   <URL "https://common-shirts.org/debian">
   <their_products <t-shirts>>
   <their_last_update> <:=spokendate('2019-12-22'):>
+  <their_langs <german>>
 </mercentry>
 
 # 20190322, ta, website no longer available
@@ -43,6 +45,7 @@
   <URL "https://enventelibre.org/42-debian">
   <their_products <t-shirts>, <polo_shirts>, <stickers>, <other_clothing>, <mugs>, <usb-sticks>, <others>>
   <their_last_update> <:=spokendate('2019-12-22'):>
+  <their_langs <french>, <english>>
   <money-events>
   <donates>
 </mercentry>
@@ -59,6 +62,7 @@
   <URL "http://www.cafepress.com/debianstuff">
   <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>>
   <donates>
 </mercentry>
 
@@ -74,6 +78,7 @@
   <URL "https://www.freewear.org/?org=Debian">
   <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <mugs>>
   <their_last_update> <:=spokendate('2019-12-22'):>
+  <their_langs <english>>
   <donates>
 </mercentry>
 
@@ -91,6 +96,7 @@
   <URL "https://www.hellotux.com/debian">
   <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <usb-sticks>>
   <their_last_update> <:=spokendate('2019-12-22'):>
+  <their_langs <english>>
 </mercentry>
 
 # Disabled, no longer operating
@@ -105,6 +111,7 @@
  <URL "https://www.koszulkomat.eu/tshirt/search?s=debian">
  <their_products <t-shirts>, <pillowcases>>
  <their_last_update> <:=spokendate('2019-12-22'):>
+ <their_langs <polish>>
 </mercentry>
 
 # librestickers is on hiatus and will be back 2015-02
@@ -128,6 +135,7 @@
   <URL "https://www.stickermule.com/unixstickers">
   <their_products <stickers>>
   <their_last_update> <:=spokendate('2019-12-22'):>
+  <their_langs <english>>
 </mercentry>
 
 #<mercentry>
diff --git a/english/events/merchandise.def b/english/events/merchandise.def
index 9c58ace8312..9fbd0fc0852 100644
--- a/english/events/merchandise.def
+++ b/english/events/merchandise.def
@@ -4,6 +4,33 @@
 #use wml::debian::common_translation
 #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" />
 
 <define-tag products whitespace=delete>
@@ -80,6 +107,8 @@
   <gettext domain="others">others</gettext>
 </define-tag>
 
+##########
+# Define data for each vendors
 
 <define-tag mercentry endtag=required>\
   <p>%body
@@ -96,6 +125,11 @@
   <br>
 </define-tag>
 
+<define-tag their_langs>\
+  <br>
+  <strong><languages>:</strong> %attributes
+</define-tag>
+
 <define-tag donates>\
   <br>
   <gettext domain="others">Donates money to Debian</gettext>
diff --git a/english/events/merchandise.wml b/english/events/merchandise.wml
index 7f0ab6b5fff..2fb0e9a9cf8 100644
--- a/english/events/merchandise.wml
+++ b/english/events/merchandise.wml
@@ -31,8 +31,9 @@ Please provide us with the following information:
 <ul>
   <li>the company name,
   <li>the URL for your main page,
-  <li>the URL where Debian merchandise can be found, and
-  <li>the list of Debian merchandise sold.
+  <li>the URL where Debian merchandise can be found,
+  <li>the list of Debian merchandise sold,
+  <li>the list of available languages on the website.
 </ul>
 We are only interested in advertising Debian related gear.