hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-3086_refresh_table_on_filter_changing

Browse Source
This commit is contained in:
Nicolas Maillat
2020-05-29 19:19:37 +02:00
committed by GitHub
parent 732d9f7154 1436648aa1
commit afc41b8214
10 changed files with 2062 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/admin/index.html.twig
View File

@@ -42,8 +42,6 @@
serverDisconnected: '{{ 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' | trans | e('js') }}',
check_all : '{{ 'Cocher toute la colonne' | trans | e('js') }}',
uncheck_all : '{{ 'Decocher toute la colonne' | trans | e('js') }}',
check_left_right : '{{ 'admin::users:edit: check left right' | trans | e('js') }}',
check_all_right : '{{ 'admin::users:edit: check all right' | trans | e('js') }}',
create_template : '{{ 'Creer un model' | trans | e('js') }}',
create_user : '{{ 'Creer un utilisateur' | trans | e('js') }}',
annuler : '{{ 'boutton::annuler' | trans | e('js') }}',

6
templates/web/admin/worker-manager/worker_configuration.html.twig
View File

@@ -3,7 +3,7 @@
{{ 'admin::workermanager:tab:workerconfig: warning' |trans }}
</p>
<p>Set up the delay between two attempts per queue! (if not set, default 10000 millisecond)</p>
<p>{{ 'admin::workermanager:tab:workerconfig: Set up the delay between two attempts per queue! (if not set, default 10000 millisecond)' |trans }}</p>
{{ form_start(form, {'action': path('worker_admin_configuration')}) }}
<div class="control-group">
@@ -34,8 +34,8 @@
{{ form_row(form.populateIndex) }}
</div>
<h3> Config Worker queue delayed</h3>
<p>if not set ,default 5000 millisecond</p>
<h3> {{ 'admin::workermanager:tab:workerconfig: Config Worker queue delayed' |trans }}</h3>
<p> {{ 'admin::workermanager:tab:workerconfig: if not set ,default 5000 millisecond' |trans }}</p>
<div class="control-group">
{{ form_row(form.delayedSubdef) }}