diff --git a/lib/Alchemy/Phrasea/Form/Login/PhraseaRegisterForm.php b/lib/Alchemy/Phrasea/Form/Login/PhraseaRegisterForm.php index 2ab5728239..bd17b8201f 100644 --- a/lib/Alchemy/Phrasea/Form/Login/PhraseaRegisterForm.php +++ b/lib/Alchemy/Phrasea/Form/Login/PhraseaRegisterForm.php @@ -112,7 +112,7 @@ class PhraseaRegisterForm extends AbstractType 'constraints' => array( new Assert\Choice(array( 'choices' => array_flip($baseIds), - 'minMessage' => _('You must select at least {{ limit }} collection.'), + 'minMessage' => _('You must select at least %s collection.'), 'multiple' => true, 'min' => 1, )), diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationRegistered.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationRegistered.php index 7b3f0d95c7..2aaf0f4cbf 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationRegistered.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationRegistered.php @@ -34,7 +34,7 @@ class MailSuccessEmailConfirmationRegistered extends AbstractMailWithLink */ public function getButtonText() { - return sprintf(_('Access %'), $this->app['phraseanet.registry']->get('GV_homeTile')); + return sprintf(_('Your access on %s'), $this->app['phraseanet.registry']->get('GV_homeTile')); } /** diff --git a/templates/web/admin/dashboard.html.twig b/templates/web/admin/dashboard.html.twig index 2e5213b4b6..6bbb8e2e58 100644 --- a/templates/web/admin/dashboard.html.twig +++ b/templates/web/admin/dashboard.html.twig @@ -128,7 +128,7 @@ {% if email_status %} -

{% trans 'result : ' %}{{ email_status }}

+

{% trans %}Email test result : {{ email_status }}{% endtrans %}

{% endif %} diff --git a/templates/web/admin/user/import/file.html.twig b/templates/web/admin/user/import/file.html.twig index d4632668d2..a9c0158f9c 100644 --- a/templates/web/admin/user/import/file.html.twig +++ b/templates/web/admin/user/import/file.html.twig @@ -1,5 +1,5 @@
-

{% trans 'Upload a "csv" file for users creation' %}

+

{% trans 'Upload a csv file for users creation' %}

{% if app['request'].query.get('error') is not none %} @@ -9,9 +9,9 @@ {% if error == 'file-invalid' %} {% trans 'An error occured while upload the file. Please retry' %} {% elseif error == 'row-login' %} - {% trans 'Row "login" is missing, script has stopped' %} + {% trans 'Row login is missing, script has stopped' %} {% elseif error == 'row-pwd' %} - {% trans 'Row "password" is missing, script has stopped' %} + {% trans 'Row password is missing, script has stopped' %} {% elseif error == 'no-user' %} {% trans 'The file does not contains any user to add' %} {% endif %} diff --git a/templates/web/prod/actions/Download/prepare.html.twig b/templates/web/prod/actions/Download/prepare.html.twig index 62d4c9cd4a..7c4b58bb94 100644 --- a/templates/web/prod/actions/Download/prepare.html.twig +++ b/templates/web/prod/actions/Download/prepare.html.twig @@ -20,8 +20,10 @@ {% elseif list['complete'] is defined and list['complete'] %}
{% set url = path('document_download', {'token': token}) %} + {% set before_link = '' %} + {% set after_link = '' %} {% trans %} - Your documents are ready. If the download does not start, click here + Your documents are ready. If the download does not start, {{ before_link }}click here{{ after_link }} {% endtrans %}
{% endif %}