plint

commit 099ef9dfae8db6f069df220969b6588ff99f93a9
parent 3470acc593fb3f8a52402bb325d30eeadc95bcc3
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Fri, 26 Dec 2014 19:27:07 +0100

Merge branch 'master' of gitorious.org:plint/plint

Diffstat:
.gitignore
 | 
5
+++++
poem2html/make_poem.pl
 | 
2
+-
template.py
 | 
4
++--
views/page.html
 | 
1
+

4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,8 @@ res/*.mo
 diaeresis?.json
 Lexique*.zip
 haspirater
+*.pyo
+poem
+backup/*
+poem*.tpl
+poem2html
diff --git a/poem2html/make_poem.pl b/poem2html/make_poem.pl
@@ -15,7 +15,7 @@ while (<STDIN>) {
     } else {
       my $did = encode_entities($2, '<>&"');
       print "</p>\n";
-      print "<p class=\"did\">Il $did</p>\n";
+      print "<p class=\"did\">$actor $did</p>\n";
       print "<p class=\"speech\">\n";
     }
   } elsif (/^<([^>]*)> (.*)$/) {
diff --git a/template.py b/template.py
@@ -281,9 +281,9 @@ class Template:
     return None
 
 def str2bool(x):
-  if x.lower() in ["yes", "oui", "y", "o"]:
+  if x.lower() in ["yes", "oui", "y", "o", "true", "t", "vrai", "v"]:
     return True
-  if x.lower() in ["no", "non", "n"]:
+  if x.lower() in ["no", "non", "n", "false", "faux", "f"]:
     return False
   raise error.TemplateLoadError(_("Bad value in global option"))
 
diff --git a/views/page.html b/views/page.html
@@ -8,6 +8,7 @@
 {% else %}
     <meta name="description" content="plint French poetry checker" />
 {% endif %}
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="stylesheet" href="/static/main.css" type="text/css" media="screen" />
     <script type="text/javascript">
       var lang = "{{ lang }}";