You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cu...@apache.org on 2018/05/09 18:36:22 UTC
[whimsy] branch master updated: Fix192-WHIMSY,
allow copyright variations
This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 2693752 Fix192-WHIMSY, allow copyright variations
2693752 is described below
commit 2693752711916a78aa520d667dd05e8a00203bdf
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Wed May 9 14:36:14 2018 -0400
Fix192-WHIMSY, allow copyright variations
Also fix erroneous image check
---
lib/whimsy/sitestandards.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/whimsy/sitestandards.rb b/lib/whimsy/sitestandards.rb
index 5bda6d8..fcf915a 100644
--- a/lib/whimsy/sitestandards.rb
+++ b/lib/whimsy/sitestandards.rb
@@ -102,9 +102,9 @@ module SiteStandards
CHECK_DOC => 'All project or product homepages must feature a prominent trademark attribution of all applicable Apache trademarks.',
},
'copyright' => { # textnode_check: txt =~ /Copyright / or txt =~ /©/
- CHECK_TEXT => %r{Copyright|©},
+ CHECK_TEXT => %r{((Copyright|©).*apache|apache.*(Copyright|©))}i,
CHECK_CAPTURE => nil,
- CHECK_VALIDATE => %r{[Cc]opyright [^.]+ Apache Software Foundation}, # Do we need '[Tt]he ASF'?
+ CHECK_VALIDATE => %r{((Copyright|©).*apache|apache.*(Copyright|©))}i,
CHECK_TYPE => false,
CHECK_POLICY => 'https://www.apache.org/legal/src-headers.html#headers',
CHECK_DOC => 'All website content SHOULD include a copyright notice for the ASF.',
@@ -113,7 +113,7 @@ module SiteStandards
'image' => { # Custom: merely looks in IMAGE_DIR for #{id}.*
CHECK_TEXT => nil,
CHECK_CAPTURE => nil,
- CHECK_VALIDATE => %r{projectname.jpg},
+ CHECK_VALIDATE => %r{.},
CHECK_TYPE => true,
CHECK_POLICY => 'https://www.apache.org/img/',
CHECK_DOC => 'Projects SHOULD include a 212px wide copy of their logo in https://www.apache.org/img/ to be included in ASF homepage.',
--
To stop receiving notification emails like this one, please contact
curcuru@apache.org.