diff options
| author | Alban Vidal <zordhak@debian.org> | 2019-12-24 07:29:38 +0100 |
|---|---|---|
| committer | Carsten Schoenert <tijuca@debian.org> | 2020-01-07 18:11:03 +0000 |
| commit | 6d3f5bad4fc308b52079353f61838597fe5af820 (patch) | |
| tree | 8b9523621e097496d6873762665a6cf4e21e2b55 /english/events | |
| parent | 7729338aa3acdc9ccf8edd9f95b3714ab5848323 (diff) | |
merchandise: Adding more informations about deliveries
Diffstat (limited to 'english/events')
| -rw-r--r-- | english/events/merchandise.data | 4 | ||||
| -rw-r--r-- | english/events/merchandise.def | 7 | ||||
| -rw-r--r-- | english/events/merchandise.wml | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/english/events/merchandise.data b/english/events/merchandise.data index 0aadf72e3e8..656ea483b21 100644 --- a/english/events/merchandise.data +++ b/english/events/merchandise.data @@ -31,7 +31,7 @@ <their_products <t-shirts>> <their_last_update> <:=spokendate('2019-12-22'):> <their_langs <german>> - <their_delivery <no-international>, <austria>, <germany>> + <their_delivery <no-international>, <austria>, <germany>. <more-information "https://common-shirts.org/infos-zu-abholungen/">> </mercentry> # 20190322, ta, website no longer available @@ -66,6 +66,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_delivery <no-international>. <more-information "https://www.cafepress.com/p/help-buying-ordering#5">> <donates> </mercentry> @@ -101,6 +102,7 @@ <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <usb-sticks>> <their_last_update> <:=spokendate('2019-12-22'):> <their_langs <english>> + <their_delivery <international>> </mercentry> # Disabled, no longer operating diff --git a/english/events/merchandise.def b/english/events/merchandise.def index dba34773f11..229dbf9854b 100644 --- a/english/events/merchandise.def +++ b/english/events/merchandise.def @@ -130,6 +130,13 @@ <gettext domain="countries">Austria</gettext> </define-tag> +<define-tag more-information whitespace=delete> + <gettext domain="others">More information</gettext> \ + <: if (q{%0} eq "") { print "<none/>"; } + else { $tmp=q{%0}; print "<a href=\"$tmp\">$tmp</a>"; } + :> +</define-tag> + ########## # Define data for each vendors diff --git a/english/events/merchandise.wml b/english/events/merchandise.wml index 2fb0e9a9cf8..59f24727554 100644 --- a/english/events/merchandise.wml +++ b/english/events/merchandise.wml @@ -33,7 +33,8 @@ Please provide us with the following information: <li>the URL for your main page, <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. + <li>the list of available languages on the website, + <li>information about international delivery or not. </ul> We are only interested in advertising Debian related gear. |