Update templates to fit the new translator

This commit is contained in:
Romain Neutron
2013-11-21 19:00:17 +01:00
parent e4c43b8622
commit 16c1930ca0
87 changed files with 361 additions and 317 deletions

View File

@@ -43,8 +43,8 @@
<p class="login_error">{{ 'Erreur de login / mot de passe' | trans }}</p>
{% endif %}
<p class="login_hello">
{% trans %}
Bonjour, veuillez vous identifier sur {{home_title}} :
{% trans with {'%home_title%' : home_title} %}
Bonjour, veuillez vous identifier sur %home_title% :
{% endtrans %}
</p>
<input id="myLogin" name="login" class="span6" type="text" placeholder="{{ 'admin::compte-utilisateur identifiant' | trans }}" />
@@ -60,8 +60,8 @@
{% set username = '<b>' ~ app['authentication'].getUser().get_display_name() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans %}
Hello {{username}}
{% trans with {'%username%' : username} %}
Hello %username%
{% endtrans %}
</p>
</div>
@@ -69,13 +69,13 @@
{% if auth.getClient() is not none %}
<div id="text-box" class="span6 offset3">
<div id="top-text-box">
<h4>{% trans %}Autorisation d'acc&egrave;s{% endtrans %}</h4>
<h4>{% trans %}Autorisation d'acces{% endtrans %}</h4>
</div>
<div id="main-text-box">
{% set application_name = auth.getClient.get_name() %}
{% set application_name = '<span>' ~ auth.getClient.get_name() ~ '</span>' %}
<p>
{% trans %}
Autorisez-vous l'application "<span>{{application_name}}</span>" &agrave; acc&eacute;der &agrave; votre contenu sur {{home_title}} ?
{% trans with {'%application_name%' : application_name, '%home_title%' : home_title} %}
Autorisez-vous l'application %application_name% a acceder a votre contenu sur %home_title% ?
{% endtrans %}
</p>
</div>

View File

@@ -41,8 +41,8 @@
{% set username = '<b>' ~ app['authentication'].getUser().get_display_name() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans %}
Hello {{username}}
{% trans with {'%username%' : username} %}
Hello %username%
{% endtrans %}
</p>
</div>
@@ -67,7 +67,7 @@
<div id="main-text-box">
<p>
{% trans %}
Copiez le code ci-dessous, retournez dans votre application et collez-le &agrave l'endroit requis :
Copiez le code ci-dessous, retournez dans votre application et collez-le a l'endroit requis :
{% endtrans %}
</p>
<input type="text" class="input-large" name="access_token" value="{{token.access_token}}" size="{{token.access_token|length}}"/>

View File

@@ -21,9 +21,9 @@
</p>
<p>
{% set author = feed_entry.getAuthorName() %}
<span class="author">{% trans %}Par {{ author }}{% endtrans %}</span>
<span class="author">{% trans with {'%author%' : author} %}Par %author%{% endtrans %}</span>
{% set entry_length = feed_entry.getItems()|length %}
{% trans %}{{entry_length}} documents{% endtrans %}
{% trans with {'%entry_length%' : entry_length} %}%entry_length% documents{% endtrans %}
</p>
<ul class="image_set">
{% for item in feed_entry.getItems() %}

View File

@@ -25,7 +25,7 @@
<input type="hidden" id="basket_validation_id" value="{{ basket.getId() }}">
<p>
{% set basket_length = basket.getElements().count() %}
{% trans %}{{basket_length}} documents{% endtrans %}
{% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %}
</p>
<ul class="image_set">
{% for basket_element in basket.getElements() %}

View File

@@ -26,8 +26,8 @@
{% if application.get_creator() is not none %}
<small>
{% set user_name = application.get_creator().get_display_name() %}
{% trans %}
par {{ user_name }}
{% trans with {'%user_name%' : user_name} %}
par %user_name%
{% endtrans %}
</small>
{% endif%}

View File

@@ -1,5 +1,3 @@
{% form_theme form 'web/login/common/fields.html.twig' %}
{% set jquery_theme = 'dark-hive' %}
{% set module = '' %}

View File

@@ -247,7 +247,7 @@
<div class="modal-body">
<p>
{% set supported_file_types = ['jpg', 'jpeg', 'pjpg', 'gif', 'png']|join(' | ') %}
{% trans %} Invalid file type, only ({{ supported_file_types }}) file formats are supported {% endtrans %}
{% trans with {'%supported_file_types%' : supported_file_types} %}Invalid file type, only (%supported_file_types%) file formats are supported'{% endtrans %}
</p>
</div>
<div class="modal-footer">

View File

@@ -2,7 +2,7 @@
<h2>{{ requirements.getName() }}</h2>
<ul class="setup unstyled">
{% if requirements.getRequirements() is not empty %}
<li><strong>{% trans %}Requirements{% endtrans %}</strong></li>
<li><strong>{{ 'Requirements' | trans }}</strong></li>
{% for requirement in requirements.getRequirements() %}
<li class="{% if not requirement.isFulfilled() %}{% if not requirement.isOptional() %}blocker{% else %}non-blocker{% endif %}{% else %}good-enough{% endif %}">
{{ requirement.getTestMessage }}
@@ -16,7 +16,7 @@
{% endfor %}
{% endif %}
{% if requirements.getRecommendations() is not empty %}
<li><strong>{% trans %}Recommendations{% endtrans %}</strong></li>
<li><strong>{{ 'Recommendations' | trans }}</strong></li>
{% for requirement in requirements.getRecommendations() %}
<li class="{% if not requirement.isFulfilled() %}{% if not requirement.isOptional() %}blocker{% else %}non-blocker{% endif %}{% else %}good-enough{% endif %}">
{{ requirement.getTestMessage }}
@@ -30,7 +30,7 @@
{% endfor %}
{% endif %}
{% if requirements.getInformations() is not empty %}
<li><strong>{% trans %}Informations{% endtrans %}</strong></li>
<li><strong>{{ 'Informations' | trans }}</strong></li>
{% for information in requirements.getInformations() %}
<li>
{{ information.getName() }} : {{ information.getValue() }}
@@ -89,14 +89,14 @@
{% if cache_flushed %}
<div class="well well-small">
{% trans %}all caches services have been flushed{% endtrans %}
{{ 'all caches services have been flushed' | trans }}
</div>
{% endif %}
<div class="board_section">
<form id="admin_adder" action="{{ path('admin_dashboard_add_admins') }}" method="post" class="form-inline">
<fieldset>
<legend>{% trans %}setup:: administrateurs de l\'application{% endtrans %}</legend>
<legend>{{ 'setup:: administrateurs de l\'application' | trans }}</legend>
<ul class="unstyled">
{% for usr_id, usr_login in admins %}
<li>
@@ -108,16 +108,16 @@
{% endfor %}
</ul>
<div class="input-append" style="margin-left:20px">
<input class="admin_adder input-large" placeholder="{% trans %}Add an admin{% endtrans %}"/>
<input type="submit" class="btn btn-warning" value="{% trans %}boutton::valider{% endtrans %}" />
<input class="admin_adder input-large" placeholder="{{ 'Add an admin' | trans }}"/>
<input type="submit" class="btn btn-warning" value="{{ 'boutton::valider' | trans }}" />
</div>
<input type="hidden" class="new" name="admins[]" />
</fieldset>
</form>
<form id="admin_reset" action="{{ path('admin_dashboard_reset_admin_rights') }}" method="post" class="form-inline" style="display:inline">
<fieldset>
<legend>{% trans %}setup:: Reinitialisation des droits admins{% endtrans %}</legend>
<input type="submit" class="btn btn-warning" value="{% trans %}boutton::reinitialiser{% endtrans %}" />
<legend>{{ 'setup:: Reinitialisation des droits admins' | trans }}</legend>
<input type="submit" class="btn btn-warning" value="{{ 'boutton::reinitialiser' | trans }}" />
</fieldset>
</form>
</div>
@@ -126,10 +126,10 @@
<div class="section">
<form id="mail_checker" method="post" action="{{ path('admin_dashboard_test_mail') }}" target="_self" class="form-inline">
<fieldset>
<legend>{% trans %}setup::Tests d\'envois d\'emails{% endtrans %}</legend>
<legend>{{ 'setup::Tests d\'envois d\'emails' | trans }}</legend>
<div class="input-append">
<input class="span3" id="appendedInputButton" type="text" placeholder="{% trans %}Email{% endtrans %}">
<input type="submit" class="btn btn-warning" value="{% trans %}Send{% endtrans %}"/>
<input type="submit" class="btn btn-warning" value="{{ 'Send' | trans }}"/>
</div>
</fieldset>
</form>

View File

@@ -371,7 +371,7 @@
add: function(e, data) {
if( ! /(\.|\/)(jpe?g)$/i.test(data.files[0].type)) {
{% set supported_file_types = ['jpg']|join(' | ') %}
alert("{% trans %} Invalid file type, only ({{ supported_file_types }}) file formats are supported {% endtrans %}");
alert("{{ 'Invalid file type, only (%supported_file_types%) file formats are supported' | trans({'%supported_file_types%' : supported_file_types}) | e('js') }}");
return false;
}

View File

@@ -119,14 +119,14 @@
{% endif %}
{% else %}
{% set display_name = main_user.get_display_name() %}
{% trans %}
Edition des droits de {{ display_name }}
{% trans with {'%display_name%' : display_name} %}
Edition des droits de %display_name%
{% endtrans %}
{% endif %}
{% else %}
{% set number = users|length %}
{% trans %}
Edition des droits de {{ number }} utilisateurs
{% trans with {'%number%' : number} %}
Edition des droits de %number% utilisateurs
{% endtrans %}
{% endif %}
</td>

View File

@@ -39,11 +39,11 @@
<h1>{{ 'Quotas' | trans }}</h1>
<div>
{% set base = collection.get_databox().get_label(app['locale.I18n']) %}
{% trans %}Base {{base}}{% endtrans %}
{% trans with {'%base%' : base} %}Base %base%{% endtrans %}
</div>
<div>
{% set collection = base_id|bas_labels(app) %}
{% trans %}Collection {{collection}}{% endtrans %}
{% trans with {'%collection%' : collection} %}Collection %collection%{% endtrans %}
</div>
<form>
<div>{{ 'Restrictions de telechargement' | trans }}</div>

View File

@@ -1,11 +1,11 @@
<h1>{{ 'Limite temporelle' | trans }}</h1>
<div>
{% set base = collection.get_databox().get_label(app['locale.I18n']) %}
{% trans %}Base {{base}}{% endtrans %}
{% trans with {'%base%' : base} %}Base %base%{% endtrans %}
</div>
<div>
{% set collection = base_id|bas_labels(app) %}
{% trans %}Collection {{collection}}{% endtrans %}
{% trans with {'%collection%' : collection} %}Collection %collection%{% endtrans %}
</div>
<form>
<table>

View File

@@ -1,7 +1,7 @@
<h1>{{ 'Limite temporelle' | trans }}</h1>
<div>
{% set base = databox.get_viewname() %}
{% trans %}Base {{base}}{% endtrans %}
{% trans with {'%base%' : base} %}Base %base%{% endtrans %}
</div>
<form>
<table>

View File

@@ -73,8 +73,8 @@
{% else %}
<p class="alert">
{% set name = value['name'] %}
{% trans %}
erreur avec la valeur {{ name }}
{% trans with {'%name%' : name} %}
erreur avec la valeur %name%
{% endtrans %}
</p>
{% endif %}
@@ -90,8 +90,8 @@
<div class="controls">
<p class='alert'>
{% set name = value['name'] %}
{% trans %}
erreur avec la valeur {{ name }}
{% trans with {'%name%' : name} %}
erreur avec la valeur %name%
{% endtrans %}
</p>
{% endif %}

View File

@@ -177,7 +177,7 @@ $(document).ready(function(){
$.each(data.files, function(i, file) {
{% set supported_file_types = ['png', 'jpg', 'gif']|join(' | ') %}
if( ! /(\image|\/)(png|jpeg|jpg|pjpg|gif)$/i.test(file.type)) {
alert("{% trans %} Invalid file type, only ({{ supported_file_types }}) file formats are supported {% endtrans %}");
alert("{{ 'Invalid file type, only (%supported_file_types%) file formats are supported' | trans({'%supported_file_types%' : supported_file_types}) | e('js') }}");
return false;
}

View File

@@ -33,8 +33,8 @@
{% set updateTime %}
<span id="pingTime"></span>
{% endset %}
{% trans %}
Last update on {{ updateTime }}
{% trans with {'%updateTime%' : updateTime} %}
Last update on %updateTime%
{% endtrans %}
</small>
</h1>

View File

@@ -163,7 +163,7 @@
if (window.console) {
console.log(data.message);
}
alert("{% trans %}An error occured{% endtrans %} "+data.message);
alert("{{ 'An error occured' | trans | e('js') }}" + data.message);
}
}
, error:function(jqXHR, textStatus, errorThrown) {

View File

@@ -53,7 +53,7 @@ $(function () {
add: function(e, data) {
if( ! /(\.|\/)(csv|rtf)$/i.test(data.files[0].type)) {
{% set supported_file_types = ['csv', 'rtf']|join(' | ') %}
alert("{% trans %} Invalid file type, only ({{ supported_file_types }}) file formats are supported {% endtrans %}");
alert("{{ 'Invalid file type, only (%supported_file_types%) file formats are supported' | trans({'%supported_file_types%' : supported_file_types}) | e('js') }}");
return false;
}

View File

@@ -12,8 +12,8 @@
The user has been created.
{% endtrans %}
{% else %}
{% trans %}
{{ user_count }} users have been created.
{% trans with {'%user_count%' : user_count} %}
%user_count% users have been created.
{% endtrans %}
{% endif %}
</div>
@@ -203,11 +203,11 @@
{% endif %}
<select name="per_page" class="input-medium">
{% set n_par_page = 10 %}
<option value="10" {% if parm['per_page'] == 10%}selected="selected"{% endif %}>{% trans %}{{n_par_page}} par page {% endtrans %}</option>
<option value="10" {% if parm['per_page'] == 10%}selected="selected"{% endif %}>{% trans with {'%n_par_page%' : n_par_page} %}%n_par_page% par page {% endtrans %}</option>
{% set n_par_page = 20 %}
<option value="20" {% if parm['per_page'] == 20%}selected="selected"{% endif %}>{% trans %}{{n_par_page}} par page {% endtrans %}</option>
<option value="20" {% if parm['per_page'] == 20%}selected="selected"{% endif %}>{% trans with {'%n_par_page%' : n_par_page} %}%n_par_page% par page {% endtrans %}</option>
{% set n_par_page = 50 %}
<option value="50" {% if parm['per_page'] == 50%}selected="selected"{% endif %}>{% trans %}{{n_par_page}} par page {% endtrans %}</option>
<option value="50" {% if parm['per_page'] == 50%}selected="selected"{% endif %}>{% trans with {'%n_par_page%' : n_par_page} %}%n_par_page% par page {% endtrans %}</option>
</select>
<button class="user_modifier btn">{{ 'boutton::modifier' | trans }}</button>
<button class="user_deleter btn">{{ 'Supprimer' | trans }}</button>

View File

@@ -43,8 +43,8 @@
<p class="login_error">{{ 'Erreur de login / mot de passe' | trans }}</p>
{% endif %}
<p class="login_hello">
{% trans %}
Bonjour, veuillez vous identifier sur {{home_title}} :
{% trans with {'%home_title%' : home_title} %}
Bonjour, veuillez vous identifier sur %home_title% :
{% endtrans %}
</p>
<input id="myLogin" name="login" class="span6" type="text" placeholder="{{ 'admin::compte-utilisateur identifiant' | trans }}" />
@@ -60,8 +60,8 @@
{% set username = '<b>' ~ app['authentication'].getUser().get_display_name() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans %}
Hello {{username}}
{% trans with {'%username%' : username} %}
Hello %username%
{% endtrans %}
</p>
</div>
@@ -69,13 +69,13 @@
{% if auth.getClient() is not none %}
<div id="text-box" class="span6 offset3">
<div id="top-text-box">
<h4>{% trans %}Autorisation d'acc&egrave;s{% endtrans %}</h4>
<h4>{% trans %}Autorisation d'acces{% endtrans %}</h4>
</div>
<div id="main-text-box">
{% set application_name = auth.getClient.get_name() %}
{% set application_name = "<span>" ~ auth.getClient.get_name() ~ "</span>" %}
<p>
{% trans %}
Autorisez-vous l'application "<span>{{application_name}}</span>" &agrave; acc&eacute;der &agrave; votre contenu sur {{home_title}} ?
{% trans with {'%application_name%' : application_name, '%home_title%' : home_title} %}
Autorisez-vous l'application %application_name% a acceder a votre contenu sur %home_title% ?
{% endtrans %}
</p>
</div>

View File

@@ -41,8 +41,8 @@
{% set username = '<b>' ~ app['authentication'].getUser().get_display_name() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans %}
Hello {{username}}
{% trans with {'%username%' : username} %}
Hello %username%
{% endtrans %}
</p>
</div>
@@ -54,8 +54,8 @@
</div>
<div id="main-text-box">
<p>
{% trans %}
{{error}}
{% trans with {'%error%' : error} %}
%error%
{% endtrans %}
</p>
<input type="text" class="input-xlarge" name="authorize_token" value="{{code}}" size="{{code|length}}"/>
@@ -67,7 +67,7 @@
<div id="main-text-box">
<p>
{% trans %}
Copiez le code ci-dessous, retournez dans votre application et collez-le &agrave l'endroit requis :
Copiez le code ci-dessous, retournez dans votre application et collez-le a l'endroit requis :
{% endtrans %}
</p>
<input type="text" class="input-xlarge" name="authorize_token" value="{{code}}" size="{{code|length}}"/>

View File

@@ -32,8 +32,8 @@
<b>
{{ query_string[0:36] }}{% if query_string|length > 36 %}...{% endif %}
</b>
{% trans %}
client::answers: {{ available_results }} reponses
{% trans with {'%available_results%' : available_results} %}
client::answers: %available_results% reponses
{% endtrans %}
<a style="float:none;display:inline-block;padding:2px 3px" class="infoTips" title="{{ tooltip_html }}">&nbsp;</a>

View File

@@ -6,8 +6,8 @@
{% if selected_basket is not none %}
{{ selected_basket.getName() }}
:
{% trans %}
paniers:: {{ nb_basket_elements }} documents dans le panier
{% trans with {'%nb_basket_elements%' : nb_basket_elements} %}
paniers:: %nb_basket_elements% documents dans le panier
{% endtrans %}
{% if app['phraseanet.registry'].get('GV_viewSizeBaket') %}
({{ selected_basket.getSize(app) }} Mo)
@@ -64,8 +64,8 @@
{% if selected_basket is not none and selected_basket.getPusher(app) is not none %}
{% set pusher_name = selected_basket.getPusher(app).get_display_name() %}
<div class="txtPushClient">
{% trans %}
paniers:: panier emis par {{ pusher_name }}
{% trans with {'%pusher_name%' : pusher_name} %}
paniers:: panier emis par %pusher_name%
{% endtrans %}
</div>
{% endif %}
@@ -135,8 +135,8 @@
{% if selected_basket is not none %}
{{ selected_basket.getName() }}
:
{% trans %}
paniers:: {{ nb_basket_elements }} documents dans le panier
{% trans with {'%nb_basket_elements%' : nb_basket_elements} %}
paniers:: %nb_basket_elements% documents dans le panier
{% endtrans %}
{% endif %}
<span style="width:16px;height:16px;position: absolute; right: 10px;background-position:center center;" class='baskIndicator'></span></div>

View File

@@ -151,8 +151,8 @@
<input type="checkbox" name="TOU_accept" id="TOU_acceptDL" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
{% set end_link = '</a>' %}
{% trans %}
By checking this box, you accept {{ beginning_link }} Terms of Use {{ end_link }}
{% trans with {'%beginning_link%' : beginning_link, '%end_link%' : end_link} %}
By checking this box, you accept %beginning_link% Terms of Use %end_link%
{% endtrans %}
</label>
</div>
@@ -177,7 +177,7 @@
{% if my_email != '' %}
<label class="checkbox">
<input type="checkbox" name="reading_confirm" value="1" />
{% trans %}Recevoir un accuse de reception a {{my_email}}{% endtrans %}
{% trans with {'%my_email%' : my_email} %}Recevoir un accuse de reception a %my_email%{% endtrans %}
</label>
{% else %}
<label class="checkbox">
@@ -234,8 +234,8 @@
<input type="checkbox" name="TOU_accept" id="TOU_acceptMail" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
{% set end_link = '</a>' %}
{% trans %}
By checking this box, you accept {{ beginning_link }} Terms of Use {{ end_link }}
{% trans with {'%beginning_link%' : beginning_link, '%end_link%' : end_link} %}
By checking this box, you accept %beginning_link% Terms of Use %end_link%
{% endtrans %}
</label>
</div>
@@ -258,14 +258,14 @@
{% if docs_orderable <= 1 %}
{% trans %}Un document commande{% endtrans %}
{% else %}
{% trans %}{{docs_orderable}} documents commandes{% endtrans %}
{% trans with {'%docs_orderable%' : docs_orderable} %}%docs_orderable% documents commandes{% endtrans %}
{% endif %}
{% set docs_not_orderable = values.total - values.available %}
{% if docs_not_orderable > 0%}
{% if docs_not_orderable == 1 %}
{% trans %}Un document ne peut etre commande{% endtrans %}
{% else %}
{% trans %}{{docs_not_orderable}} documents ne peuvent pas etre commandes{% endtrans %}
{% trans with {'%docs_not_orderable%' : docs_not_orderable} %}%docs_not_orderable% documents ne peuvent pas etre commandes{% endtrans %}
{% endif %}
{% endif %}
{% if values.refused|length > 0 %}
@@ -389,8 +389,8 @@
<input type="checkbox" name="TOU_accept" id="TOU_acceptOrder" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
{% set end_link = '</a>' %}
{% trans %}
By checking this box, you accept {{ beginning_link }} Terms of Use {{ end_link }}
{% trans with {'%beginning_link%' : beginning_link, '%end_link%' : end_link} %}
By checking this box, you accept %beginning_link% Terms of Use %end_link%
{% endtrans %}
</label>
</div>
@@ -472,8 +472,8 @@
<input type="checkbox" name="TOU_accept" id="TOU_acceptFTP" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
{% set end_link = '</a>' %}
{% trans %}
By checking this box, you accept {{ beginning_link }} Terms of Use {{ end_link }}
{% trans with {'%beginning_link%' : beginning_link, '%end_link%' : end_link} %}
By checking this box, you accept %beginning_link% Terms of Use %end_link%
{% endtrans %}
</label>
</div>
@@ -649,7 +649,7 @@
{% set max_download = app['phraseanet.registry'].get('GV_download_max', 120) %}
{% set alert_too_big_one %}
{% trans %} You can not directly download more than {{max_download}} Mo ; time to package all documents is too long{% endtrans %}
{% trans with {'%max_download%' : max_download} %} You can not directly download more than %max_download% Mo ; time to package all documents is too long{% endtrans %}
{% endset %}
{% set alert_too_big_two %}
{{ 'You can alternatively receive an email when the download is ready.' | trans }}

View File

@@ -131,8 +131,8 @@
{{ phraseanetTitle }}
</a>
{% endset %}
{% trans %}
Pour gérer l'envoi d'email automatique, connectez-vous à {{ link }}
{% trans with {'%link%' : link} %}
Pour gérer l'envoi d'email automatique, connectez-vous à %link%
{% endtrans %}
</td>
</tr>

View File

@@ -61,7 +61,7 @@
{% endif %}
</td>
<td class="right">
({% trans %}{{basket_length}} documents{% endtrans %})
({% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %})
</td>
</tr>
<tr style="height:20px;">
@@ -119,7 +119,7 @@
</h2>
</td>
<td class="right">
({% trans %}{{basket_length}} documents{% endtrans %})
({% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %})
</td>
</tr>
<tr style="height:20px;">

View File

@@ -62,7 +62,7 @@
{% endif %}
</td>
<td class="right">
({% trans %}{{basket_length}} documents{% endtrans %})
({% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %})
</td>
</tr>
<tr style="height:20px;">
@@ -120,7 +120,7 @@
</h2>
</td>
<td class="right">
({% trans %}{{basket_length}} documents{% endtrans %})
({% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %})
</td>
</tr>
<tr style="height:20px;">

View File

@@ -0,0 +1,8 @@
{% block form_errors %}
{% import "login/common/macros.html.twig" as auth_macro %}
{% spaceless %}
{% if errors|length > 0 %}
{{ auth_macro.fieldError(errors) }}
{% endif %}
{% endspaceless %}
{% endblock form_errors %}

View File

@@ -1,4 +1,6 @@
{% if form is defined %}
{% form_theme form 'login/common/fields.html.twig' %}
{% endif %}
<!DOCTYPE html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->

View File

@@ -25,8 +25,8 @@
<br/><span class="app-name">{{ provider_name }}</span><br/>
{% endset %}
{% trans %}
Do you authorize the application {{ application_name }} to access to your Phraseanet content?
{% trans with {'%application_name%' : application_name} %}
Do you authorize the application %application_name% to access to your Phraseanet content?
{% endtrans %}
</div>
</div>

View File

@@ -16,8 +16,8 @@
</div>
<div class="match-hint">
{% set provider_name = provider.getName() %}
{% trans %}
Your {{ provider_name }} account matchs a Phraseanet account
{% trans with {'%provider_name%' : provider_name} %}
Your %provider_name% account matchs a Phraseanet account
{% endtrans %}
</div>
</div>

View File

@@ -15,8 +15,8 @@
{{ "Inscription" | trans }}
</div>
<div class="sidebar-hint">
{% trans %}
Complete the fields below to register on {{ instance_title }}!
{% trans with {'%instance_title%' : instance_title} %}
Complete the fields below to register on %instance_title%!
{% endtrans %}
</div>
</div>

View File

@@ -14,8 +14,8 @@
<div style="margin:5px 0;text-align:right;font-style:italic;position:relative;">
{% set nb_records = basket.getElements()|length %}
{% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %}
{% trans %}
{{ nb_records }} records
{% trans with {'%nb_records%' : nb_records} %}
%nb_records% records
{% endtrans %}
- {{ date }}
<hr/>

View File

@@ -13,8 +13,8 @@
{% set element_name = field.get_dces_element().get_label() %}
<div>
<p>
{% trans %}
Ce champ est decrit comme l'element DublinCore {{element_name}}
{% trans with {'%element_name%' : element_name} %}
Ce champ est decrit comme l'element DublinCore %element_name%
{% endtrans %}
</p>
<p>
@@ -22,8 +22,8 @@
</p>
<p>
{% set lien = '<a href="' ~ field.get_dces_element().get_documentation_link() ~ '" target="_blank">' ~ field.get_dces_element().get_documentation_link() ~ '</a>' %}
{% trans %}
Pour davantage d'informations, consulter le lien suivant {{ lien }}
{% trans with {'%lien%' : lien} %}
Pour davantage d'informations, consulter le lien suivant %lien%
{% endtrans %}
</p>
</div>

View File

@@ -54,8 +54,8 @@
<hr/>
<div>
{% set DublinCoreElementSet = '<a href="http://dublincore.org/documents/dces/" target="_blank">DublinCore Element Set</a>' %}
{% trans %}
Ce champ est decrit comme element du {{ DublinCoreElementSet }}
{% trans with {'%DublinCoreElementSet%' : DublinCoreElementSet} %}
Ce champ est decrit comme element du %DublinCoreElementSet%
{% endtrans %}
</div>
{% endif %}

View File

@@ -8,14 +8,14 @@
<div>
{% if field.get_tag().getMinLength() > 0 %}
{% set minLength = field.get_tag().getMinLength() %}
{% trans %}
Le champ doit contenir {{ minLength }} caracteres minimum.
{% trans with {'%minLength%' : minLength} %}
Le champ doit contenir %minLength% caracteres minimum.
{% endtrans %}<br/>
{% endif %}
{% if field.get_tag().getMaxLength() > 0 %}
{% set maxLength = field.get_tag().getMaxLength() %}
{% trans %}
Le champ ne peut contenir plus de {{ maxLength }} caracteres.
{% trans with {'%maxLength%' : maxLength} %}
Le champ ne peut contenir plus de %maxLength% caracteres.
{% endtrans %}<br/>
{% endif %}
</div>
@@ -26,8 +26,8 @@
{{ 'Les indications donnees ci dessous sont a titre informatif.' | trans }}<br/>
{{ 'Si vous ne les respectez pas, les documents seront correctement indexes, mais les metadonnees inscrites risquent d\'etre erronnees' | trans }}<br/>
{% set norm_name = '<span style="font-style:normal;font-weight:bold;">' ~ field.get_tag().getGroupName() ~ '</span>' %}
{% trans %}
Ces informations sont directement fournies par la norme de metadonnees de ce champ : {{ norm_name }}
{% trans with {'%norm_name%' : norm_name} %}
Ces informations sont directement fournies par la norme de metadonnees de ce champ : %norm_name%
{% endtrans %}
</small>
</blockquote>

View File

@@ -11,8 +11,8 @@
<div style="margin:5px 0;text-align:right;font-style:italic;position:relative;">
{% set nb_records = Story.get_children().get_elements()|length %}
{% set date = app['date-formatter'].getPrettyString(Story.get_modification_date()) %}
{% trans %}
{{ nb_records }} records
{% trans with {'%nb_records%' : nb_records} %}
%nb_records% records
{% endtrans %}
- {{ date }}
<hr/>

View File

@@ -40,8 +40,8 @@
<div class="PNB10">
<p>
{% set user_name = '<a tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).get_id() }) ~ '" href="/user/' ~ Basket.getPusher(app).get_id() ~ '/" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% trans %}
Received from {{ user_name }}
{% trans with {'%user_name%' : user_name} %}
Received from %user_name%
{% endtrans %}
</p>
</div>
@@ -65,8 +65,8 @@
~ Participant.getUser(app).get_display_name
~ '</a>' %}
{% endfor %}
{% trans %}
Sent for validation to {{ list_participants }}
{% trans with {'%list_participants%' : list_participants} %}
Sent for validation to %list_participants%
{% endtrans %}
</p>
</div>
@@ -83,7 +83,7 @@
{% elseif ElementsCount == 1 %}
{{ '1 record' | trans }}
{% else %}
{% trans %}{{ ElementsCount }} records{% endtrans %}
{% trans with {'%ElementsCount%' : ElementsCount} %}%ElementsCount% records{% endtrans %}
{% endif %}
</div>
</div>

View File

@@ -9,7 +9,7 @@
{% elseif Total == 1 %}
{{ '1 result' | trans }}
{% else %}
{% trans %}{{ Total }} results{% endtrans %}
{% trans with {'%Total%' : Total} %}%Total% results{% endtrans %}
{% endif %}
</td>
<td class="paginator">
@@ -70,8 +70,8 @@
{% if Basket.getPusher(app) %}
<p>
{% set user_name = '<a href="/user/' ~ Basket.getPusher(app).get_id() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).get_id() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% trans %}
Received from {{ user_name }}
{% trans with {'%user_name%' : user_name} %}
Received from %user_name%
{% endtrans %}
</p>
{% endif %}
@@ -90,8 +90,8 @@
{% set list_participants = list_participants ~ Participant.getUser(app).get_display_name %}
{% set list_participants = list_participants ~ '</a>' %}
{% endfor %}
{% trans %}
Sent for validation to {{ list_participants }}
{% trans with {'%list_participants%' : list_participants} %}
Sent for validation to %list_participants%
{% endtrans %}
</p>
{% endif %}
@@ -116,7 +116,7 @@
{% elseif Total == 1 %}
{{ '1 result' | trans }}
{% else %}
{% trans %}{{ Total }} results{% endtrans %}
{% trans with {'%Total%' : Total} %}%Total% results{% endtrans %}
{% endif %}
</td>
<td class="paginator">

View File

@@ -115,7 +115,7 @@
{% set pusher = basket.getPusher(app).get_display_name() %}
<img
class="basketTips"
title="{% trans %}paniers:: panier recu de {{pusher}}{% endtrans %}"
title="{% trans with {'%pusher%' : pusher} %}paniers:: panier recu de %pusher%{% endtrans %}"
src="/skins/icons/push16.png"/>
</td>
{% endif %}

View File

@@ -2,12 +2,12 @@
<li>
{% set nb_view = element.get_view_count|default(0) %}
{% if nb_view <= 1 %}
{% trans %}
{{ nb_view }} vue
{% trans with {'%nb_view%' : nb_view} %}
%nb_view% vue
{% endtrans %}
{% else %}
{% trans %}
{{ nb_view }} vues
{% trans with {'%nb_view%' : nb_view} %}
%nb_view% vues
{% endtrans %}
{% endif %}
</li>
@@ -16,12 +16,12 @@
{% if element.get_rating > 0 %}
<li>
{% if nb_rating <= 1 %}
{% trans %}
{{ nb_rating }} like
{% trans with {'%nb_rating%' : nb_rating} %}
%nb_rating% like
{% endtrans %}
{% else %}
{% trans %}
{{ nb_rating }} likes
{% trans with {'%nb_rating%' : nb_rating} %}
%nb_rating% likes
{% endtrans %}
{% endif %}
</li>

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Suppression de {{n_element}} playlists
{% trans with {'%n_element%' : n_element} %}
Suppression de %n_element% playlists
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Etes vous sur de supprimer {{ number }} playlists ?
{% trans with {'%number%' : number} %}
Etes vous sur de supprimer %number% playlists ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Suppression de {{n_element}} videos
{% trans with {'%n_element%' : n_element} %}
Suppression de %n_element% videos
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Etes vous sur de supprimer {{ number }} videos ?
{% trans with {'%number%' : number} %}
Etes vous sur de supprimer %number% videos ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Deplacement {{n_element}} elements
{% trans with {'%n_element%' : n_element} %}
Deplacement %n_element% elements
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Which playlist you want to put you {{number}} elements into ?
{% trans with {'%number%' : number} %}
Which playlist you want to put you %number% elements into ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -2,12 +2,12 @@
<li>
{% set nb_view = element.get_view_count|default(0) %}
{% if nb_view <= 1 %}
{% trans %}
{{ nb_view }} vue
{% trans with {'%nb_view%' : nb_view} %}
%nb_view% vue
{% endtrans %}
{% else %}
{% trans %}
{{ nb_view }} vues
{% trans with {'%nb_view%' : nb_view} %}
%nb_view% vues
{% endtrans %}
{% endif %}
</li>

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Suppression de {{n_element}} photos
{% trans with {'%n_element%' : n_element} %}
Suppression de %n_element% photos
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Etes vous sur de supprimer {{ number }} photos ?
{% trans with {'%number%' : number} %}
Etes vous sur de supprimer %number% photos ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Deplacement {{n_element}} elements
{% trans with {'%n_element%' : n_element} %}
Deplacement %n_element% elements
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Which photosets you want to put you {{number}} photos into ?
{% trans with {'%number%' : number} %}
Which photosets you want to put you %number% photos into ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Suppression de {{n_element}} photosets
{% trans with {'%n_element%' : n_element} %}
Suppression de %n_element% photosets
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Etes vous sur de supprimer {{ number }} photosets ?
{% trans with {'%number%' : number} %}
Etes vous sur de supprimer %number% photosets ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -20,14 +20,14 @@
{% else %}
{% if elements_length != elements_received_length %}
{% set n_elements = elements_received_length - elements_length %}
{% trans %}
{{n_elements}} elements ne peuvent etre uploades
{% trans with {'%n_elements%' : n_elements} %}
%n_elements% elements ne peuvent etre uploades
{% endtrans %}
{% endif %}
<form class='bridge_form' name="upload_form" action="{{ path('prod_bridge_do_upload') }}" method="post">
{% trans %}
Upload sur Flickr de {{ elements_length }} elements
{% trans with {'%elements_length%' : elements_length} %}
Upload sur Flickr de %elements_length% elements
{% endtrans %}
<input type="hidden" name="lst" value="{{ route.get_serialize_list() }}" />
<input type="hidden" name="account_id" value="{{ account.get_id() }}" />

View File

@@ -2,12 +2,12 @@
<li>
{% set nb_view = element.get_view_count|default(0) %}
{% if nb_view <= 1 %}
{% trans %}
{{ nb_view }} vue
{% trans with {'%nb_view%' : nb_view} %}
%nb_view% vue
{% endtrans %}
{% else %}
{% trans %}
{{ nb_view }} vues
{% trans with {'%nb_view%' : nb_view} %}
%nb_view% vues
{% endtrans %}
{% endif %}
</li>
@@ -15,12 +15,12 @@
{% if value > 0 %}
<li>
{% if value <= 1 %}
{% trans %}
{{ value }} like
{% trans with {'%value%' : value} %}
%value% like
{% endtrans %}
{% else %}
{% trans %}
{{ value }} likes
{% trans with {'%value%' : value} %}
%value% likes
{% endtrans %}
{% endif %}
</li>

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Suppression de {{n_element}} playlists
{% trans with {'%n_element%' : n_element} %}
Suppression de %n_element% playlists
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Etes vous sur de supprimer {{ number }} playlists ?
{% trans with {'%number%' : number} %}
Etes vous sur de supprimer %number% playlists ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -106,8 +106,8 @@
<p>
{# see http://code.google.com/intl/en/apis/youtube/terms.html#}
{% set lien_term_youtube = '<a target="_blank" href="http://www.youtube.com/t/terms">http://www.youtube.com/t/terms</a>' %}
{% trans %}
En cliquant sur "ajouter" vous certifiez que vous possedez les droits pour le contenu ou que vous etes autorisé par le proprietaire à rendre le contenu accessible au public sur YouTube, et qu'il est autrement conforme aux Conditions d'utilisation de YouTubesitue a {{lien_term_youtube}}
{% trans with {'%lien_term_youtube%' : lien_term_youtube} %}
En cliquant sur "ajouter" vous certifiez que vous possedez les droits pour le contenu ou que vous etes autorisé par le proprietaire à rendre le contenu accessible au public sur YouTube, et qu'il est autrement conforme aux Conditions d'utilisation de YouTubesitue a %lien_term_youtube%
{% endtrans %}
</p>
<script type="text/javascript">

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Suppression de {{n_element}} videos
{% trans with {'%n_element%' : n_element} %}
Suppression de %n_element% videos
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Etes vous sur de supprimer {{ number }} videos ?
{% trans with {'%number%' : number} %}
Etes vous sur de supprimer %number% videos ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -3,8 +3,8 @@
{% set n_element = elements|length %}
{% block menu %}
{% trans %}
Deplacement {{n_element}} elements
{% trans with {'%n_element%' : n_element} %}
Deplacement %n_element% elements
{% endtrans %}
{% endblock %}
@@ -12,8 +12,8 @@
<form method="POST" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}">
<p>
{% set number = elements|length %}
{% trans %}
Which playlist you want to put you {{number}} elements into ?
{% trans with {'%number%' : number} %}
Which playlist you want to put you %number% elements into ?
{% endtrans %}
</p>
{% for id in elements %}

View File

@@ -3,11 +3,11 @@
<div class="PNB" >
<p style="width:100%;text-align:center;margin-top:30px;padding:10px;font-size:14px;font-weight:900">
{% set name = api.get_connector().get_name() %}
{% trans %}
{{ name }} est momentanement indisponible a cause d'un trop grand nombre de requetes
{% trans with {'%name%' : name} %}
%name% est momentanement indisponible a cause d'un trop grand nombre de requetes
{% endtrans %}
{%trans %}
{% trans %}
le service sera de nouveau disponible dans quelques minutes
{% endtrans %}
</p>

View File

@@ -23,8 +23,8 @@
<!--<td style="width:40px;">
<div class="menu_nb_element">
{% set nb_elements = elements.get_total_items() %}
{% trans %}
{{nb_elements}} elements
{% trans with {'%nb_elements%' : nb_elements} %}
%nb_elements% elements
{% endtrans %}
</div>
</td>-->
@@ -87,8 +87,8 @@
{% if element.get_category != '' %}
{% set category = element.get_category %}
{% trans %}
dans {{category}}
{% trans with {'%category%' : category} %}
dans %category%
{% endtrans %}
{% endif %}
</div>

View File

@@ -22,8 +22,8 @@
{% set url = path('document_download', {'token': token}) %}
{% set before_link = '<a href="' ~ url ~ '" target="_self">' %}
{% set after_link = '</a>' %}
{% trans %}
Your documents are ready. If the download does not start, {{ before_link }}click here{{ after_link }}
{% trans with {'%before_link%' : before_link, '%after_link%' : after_link} %}
Your documents are ready. If the download does not start, %before_link%click here%after_link%
{% endtrans %}
</div>
{% endif %}

View File

@@ -87,8 +87,8 @@
</div>
<div class="PNB" style="top:auto;height:20px;text-align:right;line-height:20px;">
{% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
{% trans %}
{{ length }} peoples
{% trans with {'%length%' : length} %}
%length% peoples
{% endtrans %}
{% if query.get_page() > 1 %}
<a class="prev" value="{{ query.get_page() - 1 }}" href="#">< {{ 'Previous' | trans }}</a>

View File

@@ -39,7 +39,7 @@
<div class="PNB" style="height:25px; bottom:auto;">
<p>
{% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
{% trans %}{{ length }} peoples{% endtrans %}
{% trans with {'%length%' : length} %}%length% peoples{% endtrans %}
{% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<button class="EditToggle btn btn-inverse">{{ 'Edit' | trans }}</button>
{% endif %}

View File

@@ -20,8 +20,8 @@
<img src="/skins/icons/SHARE16.png" />
{% endif %}
{{ list.getName() }}
{% trans %}
({{ length }})
{% trans with {'%length%' : length} %}
(%length%)
{% endtrans %}
</a>
</li>

View File

@@ -21,8 +21,8 @@
You have selected one record.
{% endtrans %}
{% else %}
{% trans %}
You have selected {{ nbReceivedDocuments }} records.
{% trans with {'%nbReceivedDocuments%' : nbReceivedDocuments} %}
You have selected %nbReceivedDocuments% records.
{% endtrans %}
{% endif %}
@@ -35,8 +35,8 @@
Only one record can be modified.
{% endtrans %}
{% else %}
{% trans %}
Only {{ nbEditableDocuments }} records can be modified.
{% trans with {'%nbEditableDocuments%' : nbEditableDocuments} %}
Only %nbEditableDocuments% records can be modified.
{% endtrans %}
{% endif %}
{% endif %}

View File

@@ -114,8 +114,8 @@
{% if total > 4 %}
{% set n = total - 4%}
{% set and_many_more %}
{% trans %}
and {{ n }} more peoples
{% trans with {'%n%' : n} %}
and %n% more peoples
{% endtrans %}
{% endset %}
{% set recommendation = recommendation
@@ -126,12 +126,12 @@
{% if recommendation != '' %}
{% set recommendation = '<br/>' ~ recommendation %}
{% if context == 'Push' %}
{% trans %}
Please consider send this push to the following users : {{ recommendation }}
{% trans with {'%recommendation%' : recommendation} %}
Please consider send this push to the following users : %recommendation%
{% endtrans %}
{% else %}
{% trans %}
Please consider send this validation to the following users : {{ recommendation }}
{% trans with {'%recommendation%' : recommendation} %}
Please consider send this validation to the following users : %recommendation%
{% endtrans %}
{% endif %}
{% endif %}
@@ -179,18 +179,18 @@
{% if 'Push' == context %}
{% set nb_push_items = push.get_count_actionable() %}
{% if push.get_count_not_actionable() == 0 %}
{% trans %}You are about to push {{ nb_push_items }} records.{% endtrans %}
{% trans with {'%nb_push_items%' : nb_push_items} %}You are about to push %nb_push_items% records.{% endtrans %}
{% else %}
{% set nb_not_available = push.get_count_not_actionable() %}
{% trans %}You are about to push {{ nb_push_items }} records, {{ nb_not_available }} records can not be processed.{% endtrans %}
{% trans with {'%nb_push_items%' : nb_push_items, '%nb_not_available%' : nb_not_available} %}You are about to push %nb_push_items% records, %nb_not_available% records can not be processed.{% endtrans %}
{% endif %}
{% else %}
{% set nb_push_items = push.get_count_actionable() %}
{% if push.get_count_not_actionable() == 0 %}
{% trans %}You are about to ask for feedback for {{ nb_push_items }} records.{% endtrans %}
{% trans with {'%nb_push_items%' : nb_push_items} %}You are about to ask for feedback for %nb_push_items% records.{% endtrans %}
{% else %}
{% set nb_not_available = push.get_count_not_actionable() %}
{% trans %}You are about to ask for feedback for {{ nb_push_items }} records, {{ nb_not_available }} records can not be processed.{% endtrans %}
{% trans with {'%nb_push_items%' : nb_push_items, '%nb_not_available%' : nb_not_available} %}You are about to ask for feedback for %nb_push_items% records, %nb_not_available% records can not be processed.{% endtrans %}
{% endif %}
{% endif %}
</td>

View File

@@ -24,8 +24,8 @@
One document can not be modified.
{% endtrans %}
{% else %}
{% trans %}
{{countable}} documents can not be modified.
{% trans with {'%countable%' : countable} %}
%countable% documents can not be modified.
{% endtrans %}
{% endif %}
</div>
@@ -38,8 +38,8 @@
Move one record to the chosen collection in the list.
{% endtrans %}
{% else %}
{% trans %}
Move {{ countable }} records to the chosen collection in the list.
{% trans with {'%countable%' : countable} %}
Move %countable% records to the chosen collection in the list.
{% endtrans %}
{% endif %}
</div>

View File

@@ -68,7 +68,7 @@
{% macro HTML_fieldlist(recordsRequest, fields) %}
<div class="edit_field" id="EditFieldBox_status" onclick="return(edit_mdwn_status(event));" >
{%trans 'prod::editing::fields: status ' %}
{% trans %}prod::editing::fields: status{% endtrans %}
</div>
{% set cssfile = '000000' %}
{% if app['authentication'].getUser().getPrefs('css') %}
@@ -410,9 +410,9 @@
});
{% else %}
{% if not_actionable > 1 %}
alert("{% trans %}prod::editing: {{not_actionable}} documents ne peuvent etre edites car vos droits sont induffisants{% endtrans %}");
alert("{{ 'prod::editing: %not_actionable% documents ne peuvent etre edites car vos droits sont induffisants' | trans({'%not_actionable%' : not_actionable}) | e('js') }}");
{% elseif not_actionable == 1 %}
alert("{{ 'prod::editing: 1 document ne peut etre edite car vos droits sont induffisants' | trans }}");
alert("{{ 'prod::editing: 1 document ne peut etre edite car vos droits sont induffisants' | trans | e('js') }}");
{% endif %}
startThisEditing({{ databox.get_sbas_id }},{% if recordsRequest.isSingleStory() %}'GRP'{% else %}'LST'{% endif %},"",'');
{% endif %}

View File

@@ -15,7 +15,7 @@
{% endif %}
{{ entry.getTitle() }}
{% set author = entry.getAuthorName() %}
<span class="author">{% trans %}Par {{ author }}{% endtrans %}</span>
<span class="author">{% trans with {'%author%' : author} %}Par %author%{% endtrans %}</span>
</h1>
</td>
<td style="width:60px;text-align:right;">
@@ -39,8 +39,8 @@
{% if created_on != updated_on %}
<span class="updated_on">
(
{% trans %}
Derniere mise a jour le {{ updated_on }}
{% trans with {'%updated_on%' : updated_on} %}
Derniere mise a jour le %updated_on%
{% endtrans %}
)
</span>
@@ -48,8 +48,8 @@
{% if feed.isAggregated() %}
<a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.getFeed().getId() }) }}">
{% set feed_name = entry.getFeed().getTitle() %}
{% trans %}
dans {{feed_name}}
{% trans with {'%feed_name%' : feed_name} %}
dans %feed_name%
{% endtrans %}
<img style="height:16px;" src="{% if entry.getFeed().getIconUrl() == false %}
/skins/icons/rss32.gif

View File

@@ -25,7 +25,7 @@
<thead>
<tr>
<th>
{% trans %}Page {{page}}{% endtrans %}
{% trans with {'%page%' : page} %}Page %page%{% endtrans %}
</th>
</tr>
</thead>

View File

@@ -2,7 +2,7 @@
{% set displayName = order.getUser(app).get_display_name() %}
<div class="page-header">
<h1>{% trans %} {{ displayName }} wants to place an order {% endtrans %}</h1>
<h1>{% trans with {'%displayName%' : displayName} %} %displayName% wants to place an order {% endtrans %}</h1>
</div>
<div id="order_manager">
@@ -63,7 +63,7 @@
{% set name = element.getOrderMasterName(app) %}
{% if element.getDeny() == true %}
{% set title %}
{% trans %}Document refuse par {{name}} {% endtrans %}
{% trans with {'%name%' : name} %}Document refuse par %name% {% endtrans %}
{% endset %}
{% set title_send %}
{% trans %}Forcer l'envoi du document{% endtrans %}
@@ -72,7 +72,7 @@
<img style="cursor:pointer;" class="force_sender" src="/skins/icons/reload.png" title="{% spaceless %}{{title_send|e}}{% endspaceless %}" />
{% else %}
{% set title %}
{% trans %}Document envoye par {{name}} {% endtrans %}
{% trans with {'%name%' : name} %}Document envoye par %name% {% endtrans %}
{% endset %}
<img style="cursor:help;" src="/skins/icons/ok.png" title="{% spaceless %}{{title|e}}{% endspaceless %}" />
{% endif %}

View File

@@ -13,40 +13,40 @@
{% set n_user = done['final']|length %}
{% set appbox = '<span class="provenance">' ~ site %}
{% set appbox = appbox ~ '</span>' %}
{% trans %}report::Push vers {{n_user}} utilisateurs depuis lapplication box {{appbox}}{% endtrans %}
{% trans with {'%n_user%' : n_user, '%appbox%' : appbox} %}report::Push vers %n_user% utilisateurs depuis lapplication box %appbox%{% endtrans %}
{% elseif action == 'validate' %}
{% set n_user = done['final']|length %}
{% set appbox = '<span class="provenance">' ~ site %}
{% set appbox = appbox ~ '</span>' %}
{% trans %}report::Demande de validation vers {{n_user}} utilisateurs depuis lapplication box {{appbox}}{% endtrans %}
{% trans with {'%n_user%' : n_user, '%appbox%' : appbox} %}report::Demande de validation vers %n_user% utilisateurs depuis lapplication box %appbox%{% endtrans %}
{% elseif action == 'edit' %}
{{ 'report::Edition des meta-donnees' | trans }}
{% elseif action == 'collection' %}
{% set dest = done['final']|join(', ') %}
{% set coll_name = dest|bas_labels(app) %}
{% trans %}report::Changement de collection vers : {{coll_name}}{% endtrans %}
{% trans with {'%coll_name%' : coll_name} %}report::Changement de collection vers : %coll_name%{% endtrans %}
{% elseif action == 'status' %}
{{ 'report::Edition des status' | trans }}
{% elseif action == 'print' %}
{% set format = done['final']|join(', ') %}
{% trans %}report::Impression des formats : {{format}}{% endtrans %}
{% trans with {'%format%' : format} %}report::Impression des formats : %format%{% endtrans %}
{% elseif action == 'substit' %}
{% set dest = done['final']|join(', ') %}
{% trans %}report::Substitution de {{dest}}{% endtrans %}
{% trans with {'%dest%' : dest} %}report::Substitution de %dest%{% endtrans %}
{% elseif action == 'publish' %}
{% set dest = done['final']|join(', ') %}
{% trans %}report::Publication de {{dest}}{% endtrans %}
{% trans with {'%dest%' : dest} %}report::Publication de %dest%{% endtrans %}
{% elseif action == 'download' %}
{% set dest = done['final']|join(', ') %}
{% trans %}report::Telechargement de {{dest}}{% endtrans %}
{% trans with {'%dest%' : dest} %}report::Telechargement de %dest%{% endtrans %}
{% elseif action == 'mail' %}
{% set dest = done['comment']|join(', ') %}
{% set content = done['final']|join(', ') %}
{% trans %}Envoi par mail a {{dest}} de {{content}}{% endtrans %}
{% trans with {'%dest%' : dest, '%content%' : content} %}Envoi par mail a %dest% de %content%{% endtrans %}
{% elseif action == 'ftp' %}
{% set dest = done['comment']|join(', ') %}
{% set content = done['final']|join(', ') %}
{% trans %}Envoi par ftp a {{dest}} de {{content}}{% endtrans %}
{% trans with {'%dest%' : dest, '%content%' : content} %}Envoi par ftp a %dest% de %content%{% endtrans %}
{% elseif action == 'delete' %}
{{ 'report::supression du document' | trans }}
{% elseif action == 'add' %}
@@ -58,7 +58,7 @@
{% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'canreport') %}
{% if done['user'] and done['user'].get_id() != app['authentication'].getUser().get_id() %}
{% set user_infos = done['user'].get_display_name() %}
{% trans %}report:: par {{ user_infos }}{% endtrans %}
{% trans with {'%user_infos%' : user_infos} %}report:: par %user_infos%{% endtrans %}
{% endif %}
{% endif %}

View File

@@ -10,8 +10,8 @@
{% if suggestions %}
{% set suggestions = suggestions|e %}
{% set link = '<a href="#" onclick="doSpecialSearch(\'' ~ suggestions ~ '\');return false;">' ~ suggestions ~ '</a>' %}
{% trans %}
Voulez-vous dire {{link}} ?
{% trans with {'%link%' : link} %}
Voulez-vous dire %link% ?
{% endtrans %}
<br/>
{% endif %}

View File

@@ -14,8 +14,8 @@
{% if suggestions %}
{% set link = '<a href="#" onclick="doSpecialSearch(\'' ~ suggestions ~ '\');return false;">' ~ suggestions ~ '</a>' %}
{% trans %}
Voulez-vous dire {{link}} ?
{% trans with {'%link%' : link} %}
Voulez-vous dire %link% ?
{% endtrans %}
<br/>
{% endif %}

View File

@@ -1309,7 +1309,7 @@ function startThesaurus(){
[
{% for lng_code, lng in thesau_languages %}
{
label:'{% trans %}prod::thesaurusTab:cmenu:Accepter en {{lng_code}}{% endtrans %}',
label:'{% trans with {'%lng_code%' : lng_code} %}prod::thesaurusTab:cmenu:Accepter en %lng_code%{% endtrans %}',
onclick:function(menuItem, menu)
{
C_MenuOption(menuItem, menu, "ACCEPT", {'lng':'{{lng_code}}'});

View File

@@ -269,8 +269,8 @@
{% if file.getSession().getUser(app) is not none %}
<p>
{% set username = '<a href="#" class="username userTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : file.getSession().getUser(app).get_id() }) ~ '/">' ~ file.getSession().getUser(app).get_display_name() ~ '</a>' %}
{% trans %}
Uploaded by : {{ username }}
{% trans with {'%username%' : username} %}
Uploaded by : %username%
{% endtrans %}
</p>
{% endif %}
@@ -311,8 +311,8 @@
A record matches the unique identifier :
{% endtrans %}
{% else %}
{% trans %}
{{ record_count }} records match the unique identifier :
{% trans with {'%record_count%' : record_count} %}
%record_count% records match the unique identifier :
{% endtrans %}
{% endif %}
</h5>

View File

@@ -30,7 +30,7 @@
<span id="spanSWFUploadButton" class="span2"></span>
<br />
<span class="comment">
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %})
({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %} maximum : %maxFileSizeReadable% {% endtrans %})
</span>
</td>
<td class='uploader-icon'>
@@ -287,7 +287,7 @@
reasons = "{{ "The upload violates a security restriction, please retry" | trans }}";
break;
case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
reasons = "{% trans %} File upload limit ({{ maxFileSizeReadable }}) has been reached {% endtrans %}";
reasons = "{% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %} File upload limit (%maxFileSizeReadable%) has been reached {% endtrans %}";
break;
case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
reasons = "{{ "Could not initiate upload, please retry" | trans }}";

View File

@@ -33,7 +33,7 @@
</span>
<br />
<span class="comment">
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %})
({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %} maximum : %maxFileSizeReadable% {% endtrans %})
</span>
</td>
<td class='uploader-icon'>
@@ -99,7 +99,7 @@
{# upload box #}
<div class='upload-box' style="display: none;">
{% set quantity = '<span class="number-files">0</span>' %}
<h5>{% trans %}{{ quantity }}selected files{% endtrans %}</h5>
<h5>{% trans with {'%quantity%' : quantity} %}%quantity% selected files{% endtrans %}</h5>
<button type="button" class="clear-queue btn btn-inverse input-medium" style="margin-bottom: 10px;">{{ 'Clear list' | trans }}</button>
<button type="button" class="upload-submitter btn btn-inverse input-medium" style="margin-bottom: 10px;">{{ 'Send' | trans }}</button>
<div class="clear"></div>

View File

@@ -9,46 +9,82 @@
{% if "activity"|key_exists(item) %}
{{ dash.table_activity("mytablehour", "report:: activite par heure", "report:: Connexion", item.activity)}}
{% set title = 'report:: activite par heure' | trans %}
{% set title_abscisse = 'report:: Connexion' | trans %}
{{ dash.table_activity("mytablehour", title, title_abscisse, item.activity)}}
{% endif %}
{% if "activity_day"|key_exists(item) %}
{{dash.table_activity("mytabledaytotal", "report:: activite par jour" , "report:: Connexion", item.activity_day)}}
{% set title = 'report:: activite par jour' | trans %}
{% set title_abscisse = 'report:: Connexion' | trans %}
{{dash.table_activity("mytabledaytotal", title , title_abscisse, item.activity_day)}}
{%endif%}
{% if "activity_added"|key_exists(item) %}
{{ dash.table_activity("mytableadded", "report:: activite document ajoute" , "", item.activity_added)}}
{% set title = 'report:: activite document ajoute' | trans %}
{{ dash.table_activity("mytableadded", title , "", item.activity_added)}}
{%endif %}
{% if "activity_edited"|key_exists(item) %}
{{ dash.table_activity("mytableedited", "report:: activite document edite" , "", item.activity_edited)}}
{% set title = 'report:: activite document edite' | trans %}
{{ dash.table_activity("mytableedited", title , "", item.activity_edited)}}
{% endif %}
{% if "nb_conn"|key_exists(item) and "nb_dl"|key_exists(item)%}
{{ dash.connexion_download("report:: Cumul telechargements & connexions", "report:: telechargements", "report::Connexion", item.nb_dl, item.nb_conn, dashboard.getTitleDate('dmin'),dashboard.getTitleDate('dmax'))}}
{% set title = 'report:: Cumul telechargements & connexions' | trans %}
{% set title_left = 'report:: telechargements' | trans %}
{% set title_right = 'report::Connexion' | trans %}
{{ dash.connexion_download(title, title_left, title_right, item.nb_dl, item.nb_conn, dashboard.getTitleDate('dmin'),dashboard.getTitleDate('dmax'))}}
{% endif %}
{% if "top_ten_user_doc"|key_exists(item)%}
{{ dash.table('report:: Utilisateurs les plus actifs' , 'report:: utilisateurs' , 'report:: telechargements document', item.top_ten_user_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{% set title = 'report:: Utilisateurs les plus actifs' | trans %}
{% set title_left = 'report:: utilisateurs' | trans %}
{% set title_right = 'report:: telechargements document' | trans %}
{{ dash.table(title, title_left, title_right, item.top_ten_user_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{% endif %}
{% if "top_ten_user_prev"|key_exists(item) %}
{{ dash.table('report:: Utilisateurs les plus actifs' , 'report:: utilisateurs' , 'report:: telechargements preview', item.top_ten_user_prev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{% set title = 'report:: Utilisateurs les plus actifs' | trans %}
{% set title_left = 'report:: utilisateurs' | trans %}
{% set title_right = 'report:: telechargements preview' | trans %}
{{ dash.table(title, title_left, title_right, item.top_ten_user_prev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{%endif %}
{% if "top_ten_user_poiddoc"|key_exists(item) %}
{{ dash.table('report:: Utilisateurs les plus actifs' , 'report:: utilisateurs' , 'report:: poids document', item.top_ten_user_poiddoc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }}
{% set title = 'report:: Utilisateurs les plus actifs' | trans %}
{% set title_left = 'report:: utilisateurs' | trans %}
{% set title_right = 'report:: poids document' | trans %}
{{ dash.table(title, title_left, title_right, item.top_ten_user_poiddoc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }}
{%endif %}
{% if "top_ten_user_poidprev"|key_exists(item) %}
{{ dash.table('report:: Utilisateurs les plus actifs' , 'report:: utilisateurs' , 'report:: poids preview', item.top_ten_user_poidprev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }}
{% set title = 'report:: Utilisateurs les plus actifs' | trans %}
{% set title_left = 'report:: utilisateurs' | trans %}
{% set title_right = 'report:: poids preview' | trans %}
{{ dash.table(title, title_left, title_right, item.top_ten_user_poidprev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }}
{%endif %}
{% if "top_dl_doc"|key_exists(item) %}
{{ dash.table('report:: documents les plus telecharges' , 'report:: document' , 'report:: telechargements', item.top_dl_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "true") }}
{% set title = 'report:: documents les plus telecharges' | trans %}
{% set title_left = 'report:: document' | trans %}
{% set title_right = 'report:: telechargements' | trans %}
{{ dash.table(title, title_left, title_right, item.top_dl_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "true") }}
{%endif %}
{% if "top_dl_preview"|key_exists(item) %}
{{ dash.table('report:: preview les plus telecharges' , 'report:: preview' , 'report:: telechargements', item.top_dl_preview, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "true") }}
{% set title = 'report:: preview les plus telecharges' | trans %}
{% set title_left = 'report:: preview' | trans %}
{% set title_right = 'report:: telechargements' | trans %}
{{ dash.table(title, title_left, title_right, item.top_dl_preview, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "true") }}
{%endif %}
{% if "ask"|key_exists(item) %}
{{ dash.table('report:: Les questions les plus posees' , 'report:: utilisateurs' , 'report:: question', item.ask, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{% set title = 'report:: Les questions les plus posees' | trans %}
{% set title_left = 'report:: utilisateurs' | trans %}
{% set title_right = 'report:: question' | trans %}
{{ dash.table(title, title_left, title_right, item.ask, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{%endif %}
{% if "top_ten_question"|key_exists(item) %}
{{dash.top_ten_question(app['phraseanet.registry'].get('GV_homeTitle'), "report:: question", "report:: poids preview" , item.top_ten_question,dashboard.getTitleDate('dmin') , dashboard.getTitleDate('dmax')) }}
{% set title = 'report:: question' | trans %}
{% set title_left = 'report:: question' | trans %}
{% set title_right = 'report:: poids preview' | trans %}
{{dash.top_ten_question(app['phraseanet.registry'].get('GV_homeTitle'), title_left, title_right, item.top_ten_question,dashboard.getTitleDate('dmin') , dashboard.getTitleDate('dmax')) }}
{%endif %}
{% if "top_ten_site"|key_exists(item) %}
{{ dash.table('report:: site d\'ou les photo sont les plus consultees' , 'report:: site' , 'report:: nombre de vue', item.top_ten_site, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{% set title_left = 'report:: site' | trans %}
{% set title_right = 'report:: nombre de vue' | trans %}
{% set title = 'report:: site d\'ou les photo sont les plus consultees' | trans %}
{{ dash.table(title , title_left, title_right, item.top_ten_site, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{%endif %}
{%endblock currentDashboard %}

View File

@@ -2,11 +2,11 @@
{% macro table(title, titleLeft, titleRight, object, dmin, dmax, unite, sbasid) %}
{% if object|length > 0 %}
<table style="margin:0 auto; margin-bottom:30px;">
<caption>{% trans title %}</caption>
<caption>{{ title }}</caption>
<thead>
<tr>
<th>{% trans titleLeft %}</th>
<th>{% trans titleRight %}</th>
<th>{{ titleLeft }}</th>
<th>{{ titleRight }}</th>
</tr>
</thead>
<tbody>
@@ -38,11 +38,11 @@
{% macro top_ten_question(home_title, title_left, title_right, item, dmin, dmax)%}
{% if item|length > 0 %}
<table style="margin:0 auto; margin-bottom:30px;">
<caption>{% trans %} report:: Volumetrie des questions posees sur {{home_title}} {% endtrans %}</caption>
<caption>{% trans with {'%home_title%' : home_title} %} report:: Volumetrie des questions posees sur %home_title% {% endtrans %}</caption>
<thead>
<tr>
<th>{% trans title_left %}</th>
<th>{% trans title_right %}</th>
<th>{{ title_left }}</th>
<th>{{ title_right }}</th>
</tr>
</thead>
<tbody>
@@ -64,11 +64,11 @@
{% macro connexion_download(title, title_left, title_right, itemco, itemdl, dmin, dmax ) %}
<table style="margin:0 auto; margin-bottom:30px;">
<caption>{% trans title %}</caption>
<caption>{{ title }}</caption>
<thead>
<tr>
<th>{% trans title_left %}</th>
<th>{% trans title_right %}</th>
<th>{{ title_left }}</th>
<th>{{ title_right }}</th>
</tr>
</thead>
<tbody>
@@ -88,7 +88,7 @@
{% macro table_activity( id, title, title_abscisse, item) %}
{% if item|length > 0 %}
<table border='1' class="center imgdash" id = "{{id}}">
<caption>{% trans title %}</caption>
<caption>{{ title }}</caption>
<thead>
<tr>
<th></th>
@@ -101,7 +101,7 @@
<tr>
<th>
{% if title_abscisse|length > 0 %}
{% trans title_abscisse%}
{{ title_abscisse }}
{% endif %}
</th>
{% for value in item %}

View File

@@ -37,8 +37,8 @@
1 result
{% endtrans %}
{% else %}
{% trans %}
{{ total_count }} results
{% trans with {'%total_count%' : total_count} %}
%total_count% results
{% endtrans %}
{% endif %}

View File

@@ -95,7 +95,7 @@
{% include "report/form_date_and_base.html.twig" %}
{% block form_telechargement %}
<div class="form3">
<div class="form_titre">{%trans "report:: 3 - Type de report" %}</div>
<div class="form_titre">{% trans %}report:: 3 - Type de report{% endtrans %}</div>
{% if anonymous %}
<div>
<input name="tbl" type="radio" value="USR" data-action="{{ path('report_activity_users_downloads') }}" id="USR-dl" class="formsubmiter" />

View File

@@ -592,8 +592,8 @@
<p style="margin:10px 0;">
{% set debut_lien = '<a href="#" class="ab_opt_toggler">' %}
{% set fin_lien = '</a>' %}
{% trans %}
Si vous aviez besoin de plus de parametres, {{debut_lien}}Afficher d'avantage d'options{{fin_lien}}
{% trans with {'%debut_lien%' : debut_lien, '%fin_lien%' : fin_lien} %}
Si vous aviez besoin de plus de parametres, %debut_lien%Afficher d'avantage d'options%fin_lien%
{% endtrans %}
</p>
</td>
@@ -618,8 +618,8 @@
<p>
{% set link_start = '<a href="https://mariadb.org/" target="_blank">' %}
{% set link_end = '</a>' %}
{% trans %}
Phraseanet strongly recommends the use of {{link_start}}MariaDB{{link_end}} as a replacement for MySQL.
{% trans with {'%link_start%' : link_start, '%link_end%' : link_end} %}
Phraseanet strongly recommends the use of %link_start%MariaDB%link_end% as a replacement for MySQL.
{% endtrans %}
<br/>
<br/>

View File

@@ -146,8 +146,8 @@
<br/><br/>
<input type='radio' name='as' value='SY'>
{% set fullpath_tgt_raw = fullpath_tgt | raw %}
{% trans %}
thesaurus:: comme synonyme de {{ fullpath_tgt_raw }}
{% trans with {'%fullpath_tgt_raw%' : fullpath_tgt_raw} %}
thesaurus:: comme synonyme de %fullpath_tgt_raw%
{% endtrans %}
<br/>
{% else %}
@@ -169,8 +169,8 @@
<br/>
<br/>
<br/>
{% trans %}
thesaurus:: A cet emplacement du thesaurus , un candidat du champ {{ cfield }} ne peut etre accepte
{% trans with {'%cfield%' : cfield} %}
thesaurus:: A cet emplacement du thesaurus , un candidat du champ %cfield% ne peut etre accepte
{% endtrans %}
<br/>
<br/>

View File

@@ -75,8 +75,8 @@
</div>
<div style="white-space:nowrap">
<input type='radio' name='ofm' value='toscreen' onclick="chgFormat();">
{% trans %}
thesaurus:: exporter a l'ecran pour la langue {{ piv }}
{% trans with {'%piv%' : piv} %}
thesaurus:: exporter a l'ecran pour la langue %piv%
{% endtrans %}
</div>
</div>

View File

@@ -47,8 +47,8 @@
<input type="hidden" name="tid" value="{{ tid }}">
{% set branch = "<br/><b>" ~ fullBranch ~ "</b><br/>" %}
{% trans %}
thesaurus:: Lier la branche de thesaurus au champ {{ branch }}
{% trans with {'%branch%' : branch} %}
thesaurus:: Lier la branche de thesaurus au champ %branch%
{% endtrans %}
<div style="width:70%; height:200px; overflow:scroll;" class="x3Dbox">

View File

@@ -38,8 +38,8 @@
{% if branches['old_branch'] %}
{% set old_branch = branches['old_branch'] %}
<b>{{ fieldname }}</b>
{% trans %}
thesaurus:: Ce champ a ete modifie ; ancienne branche : {{ old_branch }}
{% trans with {'%old_branch%' : old_branch} %}
thesaurus:: Ce champ a ete modifie ; ancienne branche : %old_branch% }}
{% endtrans %}
<br/>
{% endif %}

View File

@@ -12,21 +12,21 @@
<form onsubmit="return(false);">
<div style="width:70%; height:200px; overflow:scroll;" class="x3Dbox">
{% for field in field2del %}
{% trans %}
thesaurus:: suppression du lien du champ {{ field }}
{% trans with {'%field%' : field} %}
thesaurus:: suppression du lien du champ %field%
{% endtrans %}
<br/>
{% endfor %}
{% for candidate in candidates2del %}
{% set field = candidate2del["field"] %}
{% trans %}
thesaurus:: suppression de la branche de mot candidats pour le champ {{ field }}
{% trans with {'%field%' : field} %}
thesaurus:: suppression de la branche de mot candidats pour le champ %field%
{% endtrans %}
<br/>
{% endfor %}
{% for field in branch2del %}
{% trans %}
thesaurus:: suppression de la branche de mot candidats pour le champ {{ field }}
{% trans with {'%field%' : field} %}
thesaurus:: suppression de la branche de mot candidats pour le champ %field%
{% endtrans %}
<br/>
{% endfor %}
@@ -37,8 +37,8 @@
{% endif %}
{% for field in field2del %}
{% trans %}
thesaurus:: suppression des indexes vers le thesaurus pour le champ {{ field }}
{% trans with {'%field%' : field} %}
thesaurus:: suppression des indexes vers le thesaurus pour le champ %field%
{% endtrans %}
<br/>
{% endfor %}

View File

@@ -14,14 +14,14 @@
{% if context is not none %}
{% set zterm %}
{% trans %}
thesaurus:: le terme {{ term }} avec contexte {{ context }}
{% trans with {'%term%' : term, '%context%' : context} %}
thesaurus:: le terme %term% avec contexte %context%
{% endtrans %}
{% endset %}
{% else %}
{% set zterm %}
{% trans %}
thesaurus:: le terme {{ term }} sans contexte
{% trans with {'%term%' : term} %}
thesaurus:: le terme %term% sans contexte
{% endtrans %}
{% endset %}
{% endif %}

View File

@@ -56,8 +56,8 @@
{% if typ == "CT" %}
<br/>
{% elseif typ == "TH" %}
{% trans %}
thesaurus:: {{ hits }} reponses retournees
{% trans with {'%hits%' : hits} %}
thesaurus:: %hits% reponses retournees
{% endtrans %}
<br/>
<br/>

View File

@@ -23,7 +23,7 @@ class DevelopersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{
$crawler = self::$DI['client']->request('GET', '/developers/application/new/');
$this->assertTrue(self::$DI['client']->getResponse()->isOk());
$form = $crawler->selectButton(_('boutton::valider'))->form();
$form = $crawler->selectButton(self::$DI['app']['translator']->trans('boutton::valider'))->form();
$this->assertEquals('/developers/application/', $form->getFormNode()->getAttribute('action'));
$this->assertEquals('POST', $form->getMethod());
}
@@ -44,7 +44,7 @@ class DevelopersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
]);
$this->assertTrue(self::$DI['client']->getResponse()->isOk());
$form = $crawler->selectButton(_('boutton::valider'))->form();
$form = $crawler->selectButton(self::$DI['app']['translator']->trans('boutton::valider'))->form();
$this->assertEquals('okok', $form['description']->getValue());
$this->assertEquals('my.website.com', $form['website']->getValue());
$this->assertEquals('my.callback.com', $form['callback']->getValue());