From d61933d381bc88a59d501449eb0be1e28eed99fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20M=C3=BCller?= Date: Wed, 13 Mar 2019 01:19:43 +0100 Subject: [PATCH] Remove "implicit trailing *" feature for .sources --- about/codeofconduct.sources | 5 ++--- about/localteams.sources | 4 ++-- about/team.sources | 4 ++-- activities/education/education.sources | 14 +++++++------- activities/ftf/avm-gpl-violation.sources | 4 ++-- activities/map/de/de.sources | 2 +- activities/os/os.sources | 8 ++++---- activities/procurement/procurement.sources | 8 ++++---- .../radiodirective/radiodirective.sources | 8 ++++---- activities/routers/routers.sources | 8 ++++---- activities/wipo/wipo.sources | 2 +- at/at.sources | 14 +++++++------- .../askyourcandidates.sources | 8 ++++---- campaigns/ilovefs/2012/ilovefs.sources | 8 ++++---- campaigns/ilovefs/2012/unperfekthaus.sources | 8 ++++---- campaigns/ilovefs/2013/ilovefs.sources | 8 ++++---- campaigns/ilovefs/2014/ilovefs.sources | 8 ++++---- campaigns/ilovefs/2015/ilovefs.sources | 8 ++++---- campaigns/ilovefs/2016/index.sources | 8 ++++---- campaigns/ilovefs/2017/index.sources | 8 ++++---- campaigns/ilovefs/2018/index.sources | 8 ++++---- campaigns/ilovefs/2019/index.sources | 8 ++++---- campaigns/nledu/nledu.sources | 8 ++++---- campaigns/pdfreaders/buglist.sources | 2 +- campaigns/pdfreaders/pdfreaders.sources | 2 +- campaigns/publiccode/bea.sources | 8 ++++---- campaigns/publiccode/publiccode.sources | 8 ++++---- campaigns/swpat/documents.sources | 2 +- contribute/promotion-materials-archive.sources | 2 +- contribute/spreadtheword.sources | 2 +- contribute/translators/translators.sources | 5 ++--- de/de.sources | 14 +++++++------- documents/documents.sources | 5 ++--- ee/ee.sources | 14 +++++++------- events/events.sources | 4 ++-- fellowship/index.sources | 2 +- fi/fi.sources | 14 +++++++------- fr/fr.sources | 16 +++++++--------- index.sources | 14 +++++++------- it/it.sources | 15 +++++++-------- news/legal-news.sources | 4 ++-- news/news.sources | 18 +++++++++--------- news/newsletter.sources | 4 ++-- pdfreaders/pdfreaders.sources | 2 +- press/press.sources | 8 ++++---- supporter/testimonials.sources | 2 +- tags/tags.sources | 10 +++++----- tools/update_xmllists.sh | 2 +- uk/uk.sources | 15 +++++++-------- 49 files changed, 178 insertions(+), 185 deletions(-) diff --git a/about/codeofconduct.sources b/about/codeofconduct.sources index 78558804b5..f3e32f439c 100644 --- a/about/codeofconduct.sources +++ b/about/codeofconduct.sources @@ -1,8 +1,7 @@ about/people/people:[] -about/people/employee:[] -about/people/localteams:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] diff --git a/about/localteams.sources b/about/localteams.sources index 03ec8cab7e..883ac7e206 100644 --- a/about/localteams.sources +++ b/about/localteams.sources @@ -1,9 +1,9 @@ about/people/people:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] -about/people/employee:[] +about/people/employees:[] activities/*/project:[] campaigns/*/project:[] diff --git a/about/team.sources b/about/team.sources index 03ec8cab7e..883ac7e206 100644 --- a/about/team.sources +++ b/about/team.sources @@ -1,9 +1,9 @@ about/people/people:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] -about/people/employee:[] +about/people/employees:[] activities/*/project:[] campaigns/*/project:[] diff --git a/activities/education/education.sources b/activities/education/education.sources index c38340ad9f..f848c26b06 100644 --- a/activities/education/education.sources +++ b/activities/education/education.sources @@ -1,7 +1,7 @@ about/people/people:[] -about/people/employee:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] @@ -9,8 +9,8 @@ activities/*/project:[] campaigns/*/project:[] contact/local:[] -news/*/news:[education] -news/*/.news:[education] -news/nl/nl:[education] -news/nl/.nl:[education] -events/*/event:[education] +news/*/news-*:[education] +news/*/.news-*:[education] +news/nl/nl-*:[education] +news/nl/.nl-*:[education] +events/*/event-*:[education] diff --git a/activities/ftf/avm-gpl-violation.sources b/activities/ftf/avm-gpl-violation.sources index 5aec6d6407..41fc7fd4f8 100644 --- a/activities/ftf/avm-gpl-violation.sources +++ b/activities/ftf/avm-gpl-violation.sources @@ -1,2 +1,2 @@ -news/*/news:[avm] -news/*/.news:[avm] +news/*/news-*:[avm] +news/*/.news-*:[avm] diff --git a/activities/map/de/de.sources b/activities/map/de/de.sources index 803309ed8a..bc60dc6bf4 100644 --- a/activities/map/de/de.sources +++ b/activities/map/de/de.sources @@ -1 +1 @@ -activities/map/de/info:[] +activities/map/de/info-*:[] diff --git a/activities/os/os.sources b/activities/os/os.sources index 78f244925d..70c2871140 100644 --- a/activities/os/os.sources +++ b/activities/os/os.sources @@ -1,4 +1,4 @@ -news/*/news:[openstandards] -news/*/.news:[openstandards] -news/nl/nl:[openstandards] -news/nl/.nl:[openstandards] +news/*/news-*:[openstandards] +news/*/.news-*:[openstandards] +news/nl/nl-*:[openstandards] +news/nl/.nl-*:[openstandards] diff --git a/activities/procurement/procurement.sources b/activities/procurement/procurement.sources index 9a98fbb257..7549bb72ca 100644 --- a/activities/procurement/procurement.sources +++ b/activities/procurement/procurement.sources @@ -1,4 +1,4 @@ -news/*/news:[procurement] -news/*/.news:[procurement] -news/nl/nl:[procurement] -news/nl/.nl:[procurement] +news/*/news-*:[procurement] +news/*/.news-*:[procurement] +news/nl/nl-*:[procurement] +news/nl/.nl-*:[procurement] diff --git a/activities/radiodirective/radiodirective.sources b/activities/radiodirective/radiodirective.sources index f5961ac77b..08379017c6 100644 --- a/activities/radiodirective/radiodirective.sources +++ b/activities/radiodirective/radiodirective.sources @@ -1,4 +1,4 @@ -news/*/news:[radiodirective] -news/*/.news:[radiodirective] -news/nl/nl:[radiodirective] -news/nl/.nl:[radiodirective] +news/*/news-*:[radiodirective] +news/*/.news-*:[radiodirective] +news/nl/nl-*:[radiodirective] +news/nl/.nl-*:[radiodirective] diff --git a/activities/routers/routers.sources b/activities/routers/routers.sources index 5fc9af8aaf..bd2c7aa517 100644 --- a/activities/routers/routers.sources +++ b/activities/routers/routers.sources @@ -1,4 +1,4 @@ -news/*/news:[routers] -news/*/.news:[routers] -news/nl/nl:[routers] -news/nl/.nl:[routers] +news/*/news-*:[routers] +news/*/.news-*:[routers] +news/nl/nl-*:[routers] +news/nl/.nl-*:[routers] diff --git a/activities/wipo/wipo.sources b/activities/wipo/wipo.sources index 2f0d82877d..992add1706 100644 --- a/activities/wipo/wipo.sources +++ b/activities/wipo/wipo.sources @@ -1 +1 @@ -activities/wipo/document:[] +activities/wipo/document-*:[] diff --git a/at/at.sources b/at/at.sources index d50c1a05c5..f87bed3647 100644 --- a/at/at.sources +++ b/at/at.sources @@ -1,15 +1,15 @@ about/people/people:[] -about/people/employee:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] -news/*/news:[at] -news/*/.news:[at] -news/nl/nl:[at] -news/nl/.nl:[at] -events/*/event:[at] +news/*/news-*:[at] +news/*/.news-*:[at] +news/nl/nl-*:[at] +news/nl/.nl-*:[at] +events/*/event-*:[at] diff --git a/campaigns/askyourcandidates/askyourcandidates.sources b/campaigns/askyourcandidates/askyourcandidates.sources index e3b1cc1765..4121510bf9 100755 --- a/campaigns/askyourcandidates/askyourcandidates.sources +++ b/campaigns/askyourcandidates/askyourcandidates.sources @@ -1,4 +1,4 @@ -news/*/news:[ayc] -news/*/.news:[ayc] -news/nl/nl:[ayc] -news/nl/.nl:[ayc] +news/*/news-*:[ayc] +news/*/.news-*:[ayc] +news/nl/nl-*:[ayc] +news/nl/.nl-*:[ayc] diff --git a/campaigns/ilovefs/2012/ilovefs.sources b/campaigns/ilovefs/2012/ilovefs.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2012/ilovefs.sources +++ b/campaigns/ilovefs/2012/ilovefs.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/ilovefs/2012/unperfekthaus.sources b/campaigns/ilovefs/2012/unperfekthaus.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2012/unperfekthaus.sources +++ b/campaigns/ilovefs/2012/unperfekthaus.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/ilovefs/2013/ilovefs.sources b/campaigns/ilovefs/2013/ilovefs.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2013/ilovefs.sources +++ b/campaigns/ilovefs/2013/ilovefs.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/ilovefs/2014/ilovefs.sources b/campaigns/ilovefs/2014/ilovefs.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2014/ilovefs.sources +++ b/campaigns/ilovefs/2014/ilovefs.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/ilovefs/2015/ilovefs.sources b/campaigns/ilovefs/2015/ilovefs.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2015/ilovefs.sources +++ b/campaigns/ilovefs/2015/ilovefs.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/ilovefs/2016/index.sources b/campaigns/ilovefs/2016/index.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2016/index.sources +++ b/campaigns/ilovefs/2016/index.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/ilovefs/2017/index.sources b/campaigns/ilovefs/2017/index.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2017/index.sources +++ b/campaigns/ilovefs/2017/index.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/ilovefs/2018/index.sources b/campaigns/ilovefs/2018/index.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2018/index.sources +++ b/campaigns/ilovefs/2018/index.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/ilovefs/2019/index.sources b/campaigns/ilovefs/2019/index.sources index f6f9b1a348..1ba134f8b0 100755 --- a/campaigns/ilovefs/2019/index.sources +++ b/campaigns/ilovefs/2019/index.sources @@ -1,4 +1,4 @@ -news/*/news:[ilovefs] -news/*/.news:[ilovefs] -news/nl/nl:[ilovefs] -news/nl/.nl:[ilovefs] +news/*/news-*:[ilovefs] +news/*/.news-*:[ilovefs] +news/nl/nl-*:[ilovefs] +news/nl/.nl-*:[ilovefs] diff --git a/campaigns/nledu/nledu.sources b/campaigns/nledu/nledu.sources index cf085f5e2b..926dc84376 100755 --- a/campaigns/nledu/nledu.sources +++ b/campaigns/nledu/nledu.sources @@ -1,4 +1,4 @@ -news/*/news:[nledu] -news/*/.news:[nledu] -news/nl/nl:[nledu] -news/nl/.nl:[nledu] +news/*/news-*:[nledu] +news/*/.news-*:[nledu] +news/nl/nl-*:[nledu] +news/nl/.nl-*:[nledu] diff --git a/campaigns/pdfreaders/buglist.sources b/campaigns/pdfreaders/buglist.sources index a308272ab1..cc24661603 100644 --- a/campaigns/pdfreaders/buglist.sources +++ b/campaigns/pdfreaders/buglist.sources @@ -1,2 +1,2 @@ -campaigns/pdfreaders/bugs:[] +campaigns/pdfreaders/bugs-*:[] about/people/countries:[] diff --git a/campaigns/pdfreaders/pdfreaders.sources b/campaigns/pdfreaders/pdfreaders.sources index 07be019c0e..984f8b5cfe 100644 --- a/campaigns/pdfreaders/pdfreaders.sources +++ b/campaigns/pdfreaders/pdfreaders.sources @@ -1,3 +1,3 @@ -campaigns/pdfreaders/bugs:[] +campaigns/pdfreaders/bugs-*:[] about/people/countries:[] campaigns/pdfreaders/petition-sig:[] diff --git a/campaigns/publiccode/bea.sources b/campaigns/publiccode/bea.sources index 739f35f1f7..968cb9282b 100644 --- a/campaigns/publiccode/bea.sources +++ b/campaigns/publiccode/bea.sources @@ -1,4 +1,4 @@ -news/*/news:[bea] -news/*/.news:[bea] -news/nl/nl:[bea] -news/nl/.nl:[bea] +news/*/news-*:[bea] +news/*/.news-*:[bea] +news/nl/nl-*:[bea] +news/nl/.nl-*:[bea] diff --git a/campaigns/publiccode/publiccode.sources b/campaigns/publiccode/publiccode.sources index 0d4602ec30..531a66b5e1 100644 --- a/campaigns/publiccode/publiccode.sources +++ b/campaigns/publiccode/publiccode.sources @@ -1,4 +1,4 @@ -news/*/news:[pmpc] -news/*/.news:[pmpc] -news/nl/nl:[pmpc] -news/nl/.nl:[pmpc] +news/*/news-*:[pmpc] +news/*/.news-*:[pmpc] +news/nl/nl-*:[pmpc] +news/nl/.nl-*:[pmpc] diff --git a/campaigns/swpat/documents.sources b/campaigns/swpat/documents.sources index 96a06f61a4..4df1976f61 100644 --- a/campaigns/swpat/documents.sources +++ b/campaigns/swpat/documents.sources @@ -1 +1 @@ -campaigns/swpat/document:[] +campaigns/swpat/document-*:[] diff --git a/contribute/promotion-materials-archive.sources b/contribute/promotion-materials-archive.sources index 66d50c3c48..91d575f0cb 100644 --- a/contribute/promotion-materials-archive.sources +++ b/contribute/promotion-materials-archive.sources @@ -1,2 +1,2 @@ contribute/promoitems/archived-items:[] -contribute/promoitems/info-:[] +contribute/promoitems/info-*:[] diff --git a/contribute/spreadtheword.sources b/contribute/spreadtheword.sources index 3901ee3266..c00e4686c4 100644 --- a/contribute/spreadtheword.sources +++ b/contribute/spreadtheword.sources @@ -1,3 +1,3 @@ contribute/promoitems/active-items:[] -contribute/promoitems/info-:[] +contribute/promoitems/info-*:[] tools/countries:[] diff --git a/contribute/translators/translators.sources b/contribute/translators/translators.sources index 78558804b5..f3e32f439c 100644 --- a/contribute/translators/translators.sources +++ b/contribute/translators/translators.sources @@ -1,8 +1,7 @@ about/people/people:[] -about/people/employee:[] -about/people/localteams:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] diff --git a/de/de.sources b/de/de.sources index 3f089e68af..692d5dfd93 100644 --- a/de/de.sources +++ b/de/de.sources @@ -1,15 +1,15 @@ about/people/people:[] -about/people/employee:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] -news/*/news:[de] -news/*/.news:[de] -news/nl/nl:[de] -news/nl/.nl:[de] -events/*/event:[de] +news/*/news-*:[de] +news/*/.news-*:[de] +news/nl/nl-*:[de] +news/nl/.nl-*:[de] +events/*/event-*:[de] diff --git a/documents/documents.sources b/documents/documents.sources index bea21f0957..c0b112f21f 100644 --- a/documents/documents.sources +++ b/documents/documents.sources @@ -1,6 +1,5 @@ -documents/document:[] -about/reports/document:[] -about/history/document:[] +documents/document-*:[] +about/reports/document-*:[] activities/*/project:[] campaigns/*/project:[] news/*/document:[] diff --git a/ee/ee.sources b/ee/ee.sources index 81c9ecdca1..a6dca7d863 100644 --- a/ee/ee.sources +++ b/ee/ee.sources @@ -1,15 +1,15 @@ about/people/people:[] -about/people/employee:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] -news/*/news:[ee] -news/*/.news:[ee] -news/nl/nl:[ee] -news/nl/.nl:[ee] -events/*/event:[ee] +news/*/news-*:[ee] +news/*/.news-*:[ee] +news/nl/nl-*:[ee] +news/nl/.nl-*:[ee] +events/*/event-*:[ee] diff --git a/events/events.sources b/events/events.sources index 6b298dd765..34471d8bb7 100644 --- a/events/events.sources +++ b/events/events.sources @@ -1,2 +1,2 @@ -events/*/event:[] -events/*/*/event:[] +events/*/event-*:[] +events/*/*/event-*:[] diff --git a/fellowship/index.sources b/fellowship/index.sources index f471fd295e..22d320b778 100644 --- a/fellowship/index.sources +++ b/fellowship/index.sources @@ -1 +1 @@ -events/*/event:[fellowship] +events/*/event-*:[fellowship] diff --git a/fi/fi.sources b/fi/fi.sources index 0dc418c95a..2ec068c41d 100644 --- a/fi/fi.sources +++ b/fi/fi.sources @@ -1,15 +1,15 @@ about/people/people:[] -about/people/employee:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] -news/*/news:[fi] -news/*/.news:[fi] -news/nl/nl:[fi] -news/nl/.nl:[fi] -events/*/event:[fi] +news/*/news-*:[fi] +news/*/.news-*:[fi] +news/nl/nl-*:[fi] +news/nl/.nl-*:[fi] +events/*/event-*:[fi] diff --git a/fr/fr.sources b/fr/fr.sources index cdfb72157a..044019cbd7 100644 --- a/fr/fr.sources +++ b/fr/fr.sources @@ -1,17 +1,15 @@ about/people/people:[] -about/people/employee:[] -about/people/localteams:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] -contact/local:[] -news/*/news:[fr] -news/*/.news:[fr] -news/nl/nl:[fr] -news/nl/.nl:[fr] -events/*/event:[fr] +news/*/news-*:[fr] +news/*/.news-*:[fr] +news/nl/nl-*:[fr] +news/nl/.nl-*:[fr] +events/*/event-*:[fr] diff --git a/index.sources b/index.sources index 6ca0298dd8..1912419386 100644 --- a/index.sources +++ b/index.sources @@ -1,7 +1,7 @@ -news/$thisyear/news:[frontpage] -news/$lastyear/news:[frontpage] -news/$thisyear/.news:[frontpage] -news/$lastyear/.news:[frontpage] -events/$thisyear/event:[frontpage] -tools/frontpage/:[] -tools/static-elements/element-:[] +news/$thisyear/news-*:[frontpage] +news/$lastyear/news-*:[frontpage] +news/$thisyear/.news-*:[frontpage] +news/$lastyear/.news-*:[frontpage] +events/$thisyear/event-*:[frontpage] +tools/frontpage/*:[] +tools/static-elements/element-*:[] diff --git a/it/it.sources b/it/it.sources index efac40bd73..79960b1e23 100644 --- a/it/it.sources +++ b/it/it.sources @@ -1,16 +1,15 @@ about/people/people:[] -about/people/employee:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] -contact/local:[] -news/*/news:[it] -news/*/.news:[it] -news/nl/nl:[it] -news/nl/.nl:[it] -events/*/event:[it] +news/*/news-*:[it] +news/*/.news-*:[it] +news/nl/nl-*:[it] +news/nl/.nl-*:[it] +events/*/event-*:[it] diff --git a/news/legal-news.sources b/news/legal-news.sources index 4369e1b0f3..b1b4da3b2f 100644 --- a/news/legal-news.sources +++ b/news/legal-news.sources @@ -1,2 +1,2 @@ -news/*/news:[legalnews] -news/*/.news:[legalnews] +news/*/news-*:[legalnews] +news/*/.news-*:[legalnews] diff --git a/news/news.sources b/news/news.sources index 4425e1ae32..3316c6c517 100644 --- a/news/news.sources +++ b/news/news.sources @@ -1,9 +1,9 @@ -news/$thisyear/news:[] -news/$lastyear/news:[] -news/$thisyear/.news:[] -news/$lastyear/.news:[] -news/nl/nl-$thisyear:[] -news/nl/nl-$lastyear:[] -news/nl/.nl-$thisyear:[] -news/nl/.nl-$lastyear:[] -tools/static-elements/element-:[] +news/$thisyear/news-*:[] +news/$lastyear/news-*:[] +news/$thisyear/.news-*:[] +news/$lastyear/.news-*:[] +news/nl/nl-$thisyear*:[] +news/nl/nl-$lastyear*:[] +news/nl/.nl-$thisyear*:[] +news/nl/.nl-$lastyear*:[] +tools/static-elements/element-*:[] diff --git a/news/newsletter.sources b/news/newsletter.sources index ae362cd8cc..a1d37846b4 100644 --- a/news/newsletter.sources +++ b/news/newsletter.sources @@ -1,2 +1,2 @@ -news/nl/nl:[] -news/nl/.nl:[] +news/nl/nl-*:[] +news/nl/.nl-*:[] diff --git a/pdfreaders/pdfreaders.sources b/pdfreaders/pdfreaders.sources index 5a0e37c8ad..037e0d62b9 100644 --- a/pdfreaders/pdfreaders.sources +++ b/pdfreaders/pdfreaders.sources @@ -1 +1 @@ -pdfreaders/readers/:[] +pdfreaders/readers/*:[] diff --git a/press/press.sources b/press/press.sources index 2d8269b397..bdba335c80 100644 --- a/press/press.sources +++ b/press/press.sources @@ -1,4 +1,4 @@ -news/*/news:[] -news/*/.news:[] -news/nl/nl:[] -news/nl/.nl:[] +news/*/news-*:[] +news/*/.news-*:[] +news/nl/nl-*:[] +news/nl/.nl-*:[] diff --git a/supporter/testimonials.sources b/supporter/testimonials.sources index d57d692bff..16e2ae9a5d 100644 --- a/supporter/testimonials.sources +++ b/supporter/testimonials.sources @@ -1 +1 @@ -supporter/testimonials/:[] +supporter/testimonials/*:[] diff --git a/tags/tags.sources b/tags/tags.sources index ec6859686d..335d86153d 100755 --- a/tags/tags.sources +++ b/tags/tags.sources @@ -1,5 +1,5 @@ -news/*/news:[] -news/*/.news:[] -news/nl/nl:[] -news/nl/.nl:[] -events/*/event:[] +news/*/news-*:[] +news/*/.news-*:[] +news/nl/nl-*:[] +news/nl/.nl-*:[] +events/*/event-*:[] diff --git a/tools/update_xmllists.sh b/tools/update_xmllists.sh index 6efaf7789b..eeffe8f43e 100755 --- a/tools/update_xmllists.sh +++ b/tools/update_xmllists.sh @@ -122,7 +122,7 @@ for source_file in $(find * -name '*.sources' | sort); do cat "tags/.tagged-${tag}.xmllist" else echo "${all_xml}" - fi | grep "^${pattern}" || true + fi | grep "^${pattern}\$" || true done | sort -u > "/tmp/xmllist-${pid}" list_file="$(dirname ${source_file})/.$(basename ${source_file} .sources).xmllist" diff --git a/uk/uk.sources b/uk/uk.sources index 38a9799ac5..682e2dac0d 100644 --- a/uk/uk.sources +++ b/uk/uk.sources @@ -1,16 +1,15 @@ about/people/people:[] -about/people/employee:[] +about/people/employees:[] about/people/functions:[] -about/people/function-:[] +about/people/function-*:[] about/people/countries:[] about/people/groups:[] about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] -contact/local:[] -news/*/news:[gb] -news/*/.news:[gb] -news/nl/nl:[gb] -news/nl/.nl:[gb] -events/*/event:[gb] +news/*/news-*:[gb] +news/*/.news-*:[gb] +news/nl/nl-*:[gb] +news/nl/.nl-*:[gb] +events/*/event-*:[gb]