diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php index 2d5c40bfb1..42d3fc66dc 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php @@ -425,7 +425,7 @@ class Push implements ControllerProviderInterface foreach (array('see_others', 'usr_id', 'agree', 'HD') as $mandatoryparam) { if (!array_key_exists($mandatoryparam, $participant)) - throw new ControllerException(sprintf(_('Missing mandatory participant parameter %s'), $mandatoryparam)); + throw new ControllerException(sprintf(_('Missing mandatory parameter %s'), $mandatoryparam)); } try diff --git a/templates/web/admin/users.html b/templates/web/admin/users.html index 4e754e193f..ae78a3eb11 100644 --- a/templates/web/admin/users.html +++ b/templates/web/admin/users.html @@ -291,7 +291,7 @@ $('#users_page_form select[name="per_page"]').bind('change', function(){ $(this).closest('form').submit(); }); - + $('#users_reset_rights button').bind('click', function(){ var selectedUsers = $("#users tr.selected"); @@ -300,16 +300,16 @@ alert("{% trans 'select at least one user' %}"); return; } - + var users = ''; $.each(selectedUsers, function(i,n){ users += $(n).attr("id").split("_").pop() + ';'; }); - + if(confirm("{% trans 'are you sure you want reset rights ?' %}")) { $("#users_reset_rights input[name='users']").val(users); - + var form = $(this).closest('form'); $.ajax({ @@ -320,7 +320,7 @@ success: function(data){ if(data.error) { - alert("{% trans 'an error occured' %}"); + alert("{% trans 'An error occured' %}"); } else { @@ -330,21 +330,21 @@ }); } }); - + }); - + function importlist() { var myObj = new Object(); - myObj.myOpener = self; + myObj.myOpener = self; window.showModalDialog ('/admin/import0.php?rand='+Math.random(),myObj, 'dialogWidth:550px;dialogHeight:330px;center:yes;help:no;status:no;scrollbars:no' ); - + } function exportlist() { $('#export_form').submit(); } - + {% endblock %} \ No newline at end of file diff --git a/templates/web/common/databox_field_restrictions.twig b/templates/web/common/databox_field_restrictions.twig index 86dd92a6ed..82a9bd4468 100644 --- a/templates/web/common/databox_field_restrictions.twig +++ b/templates/web/common/databox_field_restrictions.twig @@ -10,13 +10,6 @@
-{% if field.get_type() == 'datetime' %} - {% trans 'phraseanet::technique::datetime-edit-explain' %}
-{% elseif field.get_type() == 'date' %} - {% trans 'phraseanet::technique::date-edit-explain (aaaa/mm/jj)' %}
-{% elseif field.get_type() == 'time' %} - {% trans 'phraseanet::technique::time-edit-explain (hh:mm:ss)' %}
-{% endif %} {% if field.get_source().minLength() > 0 %} {% set minLength = field.get_source().minLength() %} diff --git a/templates/web/prod/actions/Bridge/deactivated.twig b/templates/web/prod/actions/Bridge/deactivated.twig index e1208f8742..6be4d6cfa6 100644 --- a/templates/web/prod/actions/Bridge/deactivated.twig +++ b/templates/web/prod/actions/Bridge/deactivated.twig @@ -2,9 +2,9 @@

- {% set bridge_name = api.get_connector().get_name() %} + {% set name = api.get_connector().get_name() %} {% trans %} - {{ bridge_name }} est momentanement indisponible a cause d'un trop grand nombre de requetes + {{ name }} est momentanement indisponible a cause d'un trop grand nombre de requetes {% endtrans %} {%trans %} diff --git a/templates/web/prod/actions/edit_default.twig b/templates/web/prod/actions/edit_default.twig index 79a5941128..cfd9a8e2ae 100644 --- a/templates/web/prod/actions/edit_default.twig +++ b/templates/web/prod/actions/edit_default.twig @@ -85,7 +85,7 @@ {% trans 'Ce champ est decrit comme un element DublinCore' %} {% endif %} {% if field.get_thumbtitle %} - + {% endif %} {{field.get_name()}} {% if field.is_required() %} * {% endif %} :