Merge branch 'data-messages' (pull #642)

This commit is contained in:
David A. Harding 2014-11-16 13:20:54 -05:00
commit cc13a10623
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
57 changed files with 7352 additions and 6 deletions

View file

@ -65,9 +65,9 @@ require 'yaml'
(?![^\s]*<!--noref-->) ## No subst if <!--noref--> after key
(?!((?!<pre>).)*(<\/pre>)) ## No subst on a line with a closing pre tag. This
## prevents matching in {% highlight %} code blocks.
(?![^\(]*(\.svg|\.png)) ## No subst if key inside an image name. This
(?![^\(]*(\.svg|\.png|\.gif)) ## No subst if key inside an image name. This
## simple regex has the side effect that we can't
## use .svg or .png in non-image base text; if that
## use .svg, .png, or .gif in non-image base text; if that
## becomes an issue, we can devise a more complex
## regex
(?!\w) ## Don't match inside words