Update locales

This commit is contained in:
Romain Neutron
2013-06-17 23:33:01 +02:00
parent 9f29b403f7
commit 4fb39ff503
5 changed files with 9 additions and 7 deletions

View File

@@ -112,7 +112,7 @@ class PhraseaRegisterForm extends AbstractType
'constraints' => array( 'constraints' => array(
new Assert\Choice(array( new Assert\Choice(array(
'choices' => array_flip($baseIds), 'choices' => array_flip($baseIds),
'minMessage' => _('You must select at least {{ limit }} collection.'), 'minMessage' => _('You must select at least %s collection.'),
'multiple' => true, 'multiple' => true,
'min' => 1, 'min' => 1,
)), )),

View File

@@ -34,7 +34,7 @@ class MailSuccessEmailConfirmationRegistered extends AbstractMailWithLink
*/ */
public function getButtonText() 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'));
} }
/** /**

View File

@@ -128,7 +128,7 @@
<label>Email : </label><input name="email" type="text" /> <label>Email : </label><input name="email" type="text" />
<input type="submit" class="btn btn-warning" value="{% trans 'boutton::valider' %}"/> <input type="submit" class="btn btn-warning" value="{% trans 'boutton::valider' %}"/>
{% if email_status %} {% if email_status %}
<p>{% trans 'result : ' %}{{ email_status }}</p> <p>{% trans %}Email test result : {{ email_status }}{% endtrans %}</p>
{% endif %} {% endif %}
</form> </form>

View File

@@ -1,5 +1,5 @@
<div class="header"> <div class="header">
<h1>{% trans 'Upload a "csv" file for users creation' %}</h1> <h1>{% trans 'Upload a csv file for users creation' %}</h1>
</div> </div>
{% if app['request'].query.get('error') is not none %} {% if app['request'].query.get('error') is not none %}
@@ -9,9 +9,9 @@
{% if error == 'file-invalid' %} {% if error == 'file-invalid' %}
{% trans 'An error occured while upload the file. Please retry' %} {% trans 'An error occured while upload the file. Please retry' %}
{% elseif error == 'row-login' %} {% elseif error == 'row-login' %}
{% trans 'Row "login" is missing, script has stopped' %} {% trans 'Row login is missing, script has stopped' %}
{% elseif error == 'row-pwd' %} {% elseif error == 'row-pwd' %}
{% trans 'Row "password" is missing, script has stopped' %} {% trans 'Row password is missing, script has stopped' %}
{% elseif error == 'no-user' %} {% elseif error == 'no-user' %}
{% trans 'The file does not contains any user to add' %} {% trans 'The file does not contains any user to add' %}
{% endif %} {% endif %}

View File

@@ -20,8 +20,10 @@
{% elseif list['complete'] is defined and list['complete'] %} {% elseif list['complete'] is defined and list['complete'] %}
<div class="alert alert-success"> <div class="alert alert-success">
{% set url = path('document_download', {'token': token}) %} {% set url = path('document_download', {'token': token}) %}
{% set before_link = '<a href="' ~ url ~ '" target="_self">' %}
{% set after_link = '</a>' %}
{% trans %} {% trans %}
Your documents are ready. If the download does not start, <a href="{{ url }}" target="_self">click here</a> Your documents are ready. If the download does not start, {{ before_link }}click here{{ after_link }}
{% endtrans %} {% endtrans %}
</div> </div>
{% endif %} {% endif %}