Only show HTML notice if HTML is allowed

liqd · Feb 7, 2013 · d300241 · d300241
1 parent 44a787a
commit d300241
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/adhocracy/templates/instance/new.html b/adhocracy/templates/instance/new.html
@@ -36,7 +36,8 @@ <h3>${_("Create new instance")}</h3>
       <legend>${_("Description")}</legend>
       <p class="info">
       ${_("Describe what the goals of this instance are and who constitutes "
-          "its community. (Both Markdown and HTML are allowed here.)")} 
+          "its community.")}
+      ${_("(Both Markdown and HTML are allowed here.)") if h.text.getconf_allow_user_html() else ""}
       </p>
       <textarea tabindex="3" class="description" name="description"></textarea>
       ${components.formatting()}

diff --git a/adhocracy/templates/instance/settings_general.html b/adhocracy/templates/instance/settings_general.html
@@ -22,7 +22,7 @@ <h2>${c.settings_menu.current['label']}</h2>
     ${forms.input(_("Name"), 'label', 1)}
 
     <%forms:textarea label="${_('Description')}" name="description" value="" tabindex="5"
-    help="${_('Describe what the goals of this instance are and who constitutes its community. (Both Markdown and HTML are allowed here.)')}">
+    help="${_('Describe what the goals of this instance are and who constitutes its community.')} ${_('(Both Markdown and HTML are allowed here.)') if h.text.getconf_allow_user_html(true) else ''}">
     ${components.formatting()}    
     </%forms:textarea>