Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape

This commit is contained in:
aina-esokia
2019-04-05 11:49:45 +04:00
24 changed files with 3680 additions and 2480 deletions

View File

@@ -31,7 +31,10 @@
<span>{{ 'Select files...' | trans }}</span>
<input type="file" name="files[]" multiple>
</span>
<br />
<br />
<p class="or_upload">{{ "Or" | trans }}</p>
<div class="url_upload"><input type="url" value="" id="add-url"><button class="add-url add_url_upload">{{ 'Add this url' | trans }}</button></div>
<br/>
<span class="comment">
({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
</span>