8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-09 03:16:25 +00:00

Merge branch 'Fix_asso_description' into 'master'

Let use HTML tags in asso description

See merge request federez/re2o!136
This commit is contained in:
chirac 2018-04-15 20:54:05 +02:00
commit 79f4f8051a
2 changed files with 2 additions and 2 deletions

View file

@ -190,7 +190,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</tr> </tr>
<tr> <tr>
<th>Description de l'association</th> <th>Description de l'association</th>
<td>{{ assooptions.description }}</td> <td colspan="3">{{ assooptions.description | safe }}</td>
</tr> </tr>
</table> </table>

View file

@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>{% blocktrans %}About {{AssoName}}{% endblocktrans %}</h2> <h2>{% blocktrans %}About {{AssoName}}{% endblocktrans %}</h2>
{{ description }} {{ description | safe }}
<h2>{% trans "About Re2o" %}</h2> <h2>{% trans "About Re2o" %}</h2>
<p>{% blocktrans %} <p>{% blocktrans %}