From 76c2d51a9663a4c6c72be94932a519087c5dcf02 Mon Sep 17 00:00:00 2001 From: Raniere Silva Date: Sun, 5 Nov 2017 09:59:48 +0000 Subject: [PATCH] Adopt email instead of contact as keyword Close #178 --- _includes/lesson_footer.html | 2 +- _includes/links.md | 2 +- _layouts/workshop.html | 2 +- bin/lesson_initialize.py | 8 ++++---- bin/workshop_check.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html index fa5d888..f36bc09 100644 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@ -31,7 +31,7 @@ / Cite / - Contact + Contact diff --git a/_includes/links.md b/_includes/links.md index a754ce6..71ee7ee 100644 --- a/_includes/links.md +++ b/_includes/links.md @@ -1,7 +1,7 @@ [cc-by-human]: https://creativecommons.org/licenses/by/4.0/ [cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode [concept-maps]: http://carpentries.github.io/instructor-training/05-memory/ -[contact]: mailto:lessons@software-carpentry.org +[email]: mailto:lessons@software-carpentry.org [contrib-covenant]: http://contributor-covenant.org/ [contributing]: {{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md [cran-checkpoint]: https://cran.r-project.org/web/packages/checkpoint/index.html diff --git a/_layouts/workshop.html b/_layouts/workshop.html index 2f4cd30..ccd8747 100644 --- a/_layouts/workshop.html +++ b/_layouts/workshop.html @@ -16,7 +16,7 @@ - + {% if page.redirect %} {% endif %} diff --git a/bin/lesson_initialize.py b/bin/lesson_initialize.py index bf0ba17..d3fc0c3 100755 --- a/bin/lesson_initialize.py +++ b/bin/lesson_initialize.py @@ -45,7 +45,7 @@ This is a good way to introduce yourself and to meet some of our community members. 1. If you do not have a [GitHub][github] account, - you can [send us comments by email][contact]. + you can [send us comments by email][email]. However, we will be able to respond more quickly if you use one of the other methods described below. @@ -151,9 +151,9 @@ and have final say over what gets merged into the lesson. General discussion of [Software Carpentry][swc-site] and [Data Carpentry][dc-site] happens on the [discussion mailing list][discuss-list], which everyone is welcome to join. -You can also [reach us by email][contact]. +You can also [reach us by email][email]. -[contact]: mailto:admin@software-carpentry.org +[email]: mailto:admin@software-carpentry.org [dc-issues]: https://github.com/issues?q=user%3Adatacarpentry [dc-lessons]: http://datacarpentry.org/lessons/ [dc-site]: http://datacarpentry.org/ @@ -183,7 +183,7 @@ title: "Lesson Title" # Contact. This *must* include the protocol: if it's an email # address, it must look like "mailto:lessons@software-carpentry.org", # or if it's a URL, "https://gitter.im/username/ProjectName". -contact: "mailto:lessons@software-carpentry.org" +email: "mailto:lessons@software-carpentry.org" #------------------------------------------------------------ # Generic settings (should not need to change). diff --git a/bin/workshop_check.py b/bin/workshop_check.py index 39ee0bf..87b9ec8 100755 --- a/bin/workshop_check.py +++ b/bin/workshop_check.py @@ -205,7 +205,7 @@ def check_helpers(helpers): @look_for_fixme def check_email(email): """ - 'contact' must be a valid email address consisting of characters, + 'email' must be a valid email address consisting of characters, an '@', and more characters. It should not be the default contact email address 'admin@software-carpentry.org'. """ @@ -286,7 +286,7 @@ HANDLERS = { 'helper list isn\'t a valid list of format ' + '["First helper", "Second helper",..]'), - 'contact': (True, check_email, + 'email': (True, check_email, 'contact email invalid or still set to ' + '"{0}".'.format(DEFAULT_CONTACT_EMAIL)), -- 2.30.2