Merge branch '4.4' into 5.2
* 4.4: Add missing validators translation Improve usage of twig ternary skip test
This commit is contained in:
Fabien Potencier
commit
34a5dafcee
|
|
@ -27,7 +27,7 @@
|
|||
{%- endblock button_row -%}
|
||||
|
||||
{%- block hidden_row -%}
|
||||
{%- set style = row_attr.style is defined ? (row_attr.style ~ (row_attr.style|trim|last != ';' ? '; ')) : '' -%}
|
||||
{%- set style = row_attr.style is defined ? (row_attr.style ~ (row_attr.style|trim|last != ';' ? '; ')) -%}
|
||||
<tr{% with {attr: row_attr|merge({style: (style ~ ' display: none')|trim})} %}{{ block('attributes') }}{% endwith %}>
|
||||
<td colspan="2">
|
||||
{{- form_widget(form) -}}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
{% block toolbar %}
|
||||
{% if collector.token %}
|
||||
{% set is_authenticated = collector.enabled and collector.authenticated %}
|
||||
{% set color_code = is_authenticated ? '' : 'yellow' %}
|
||||
{% set color_code = not is_authenticated ? 'yellow' %}
|
||||
{% elseif collector.enabled %}
|
||||
{% set color_code = collector.authenticatorManagerEnabled ? 'yellow' : 'red' %}
|
||||
{% else %}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block menu %}
|
||||
<span class="label label-status-{{ collector.symfonyState == 'eol' ? 'red' : collector.symfonyState in ['eom', 'dev'] ? 'yellow' : '' }}">
|
||||
<span class="label label-status-{{ collector.symfonyState == 'eol' ? 'red' : collector.symfonyState in ['eom', 'dev'] ? 'yellow' }}">
|
||||
<span class="icon">{{ include('@WebProfiler/Icon/config.svg') }}</span>
|
||||
<strong>Configuration</strong>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
{% block toolbar %}
|
||||
{% if collector.data.nb_errors > 0 or collector.data.forms|length %}
|
||||
{% set status_color = collector.data.nb_errors ? 'red' : '' %}
|
||||
{% set status_color = collector.data.nb_errors ? 'red' %}
|
||||
{% set icon %}
|
||||
{{ include('@WebProfiler/Icon/form.svg') }}
|
||||
<span class="sf-toolbar-value">
|
||||
|
|
|
|||
|
|
@ -201,11 +201,11 @@
|
|||
|
||||
<tbody>
|
||||
{% for log in logs %}
|
||||
{% set css_class = is_deprecation ? ''
|
||||
: log.priorityName in ['CRITICAL', 'ERROR', 'ALERT', 'EMERGENCY'] ? 'status-error'
|
||||
{% set css_class = not is_deprecation
|
||||
? log.priorityName in ['CRITICAL', 'ERROR', 'ALERT', 'EMERGENCY'] ? 'status-error'
|
||||
: log.priorityName == 'WARNING' ? 'status-warning'
|
||||
%}
|
||||
<tr class="{{ css_class }}"{% if show_level %} data-filter-level="{{ log.priorityName|lower }}"{% endif %}{% if channel_is_defined %} data-filter-channel="{{ log.channel is not null ? log.channel : '' }}"{% endif %}>
|
||||
<tr class="{{ css_class }}"{% if show_level %} data-filter-level="{{ log.priorityName|lower }}"{% endif %}{% if channel_is_defined %} data-filter-channel="{{ log.channel }}"{% endif %}>
|
||||
<td class="font-normal text-small" nowrap>
|
||||
{% if show_level %}
|
||||
<span class="colored text-bold">{{ log.priorityName }}</span>
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
{% block menu %}
|
||||
{% set events = collector.events %}
|
||||
|
||||
<span class="label {{ events.messages|length ? '' : 'disabled' }}">
|
||||
<span class="label {{ events.messages|empty ? 'disabled' }}">
|
||||
<span class="icon">{{ include('@WebProfiler/Icon/mailer.svg') }}</span>
|
||||
|
||||
<strong>E-mails</strong>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{% block toolbar %}
|
||||
{% set icon %}
|
||||
{% set status_color = (collector.memory / 1024 / 1024) > 50 ? 'yellow' : '' %}
|
||||
{% set status_color = (collector.memory / 1024 / 1024) > 50 ? 'yellow' %}
|
||||
{{ include('@WebProfiler/Icon/memory.svg') }}
|
||||
<span class="sf-toolbar-value">{{ '%.1f'|format(collector.memory / 1024 / 1024) }}</span>
|
||||
<span class="sf-toolbar-label">MiB</span>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
{% set has_time_events = collector.events|length > 0 %}
|
||||
{% set total_time = has_time_events ? '%.0f'|format(collector.duration) : 'n/a' %}
|
||||
{% set initialization_time = collector.events|length ? '%.0f'|format(collector.inittime) : 'n/a' %}
|
||||
{% set status_color = has_time_events and collector.duration > 1000 ? 'yellow' : '' %}
|
||||
{% set status_color = has_time_events and collector.duration > 1000 ? 'yellow' %}
|
||||
|
||||
{% set icon %}
|
||||
{{ include('@WebProfiler/Icon/time.svg') }}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{% block toolbar %}
|
||||
{% if collector.violationsCount > 0 or collector.calls|length %}
|
||||
{% set status_color = collector.violationsCount ? 'red' : '' %}
|
||||
{% set status_color = collector.violationsCount ? 'red' %}
|
||||
{% set icon %}
|
||||
{{ include('@WebProfiler/Icon/validator.svg') }}
|
||||
<span class="sf-toolbar-value">
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@
|
|||
{%- endif -%}
|
||||
{%- endset %}
|
||||
{% if menu is not empty %}
|
||||
<li class="{{ name }} {{ name == panel ? 'selected' : '' }}">
|
||||
<li class="{{ name }} {{ name == panel ? 'selected' }}">
|
||||
<a href="{{ path('_profiler', { token: token, panel: name }) }}">{{ menu|raw }}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -879,6 +879,10 @@ EOD;
|
|||
|
||||
public function testTraversableMultiselectAutocomplete()
|
||||
{
|
||||
if (!Terminal::hasSttyAvailable()) {
|
||||
$this->markTestSkipped('`stty` is required to test autocomplete functionality');
|
||||
}
|
||||
|
||||
// <NEWLINE>
|
||||
// F<TAB><NEWLINE>
|
||||
// A<3x UP ARROW><TAB>,F<TAB><NEWLINE>
|
||||
|
|
|
|||
|
|
@ -386,6 +386,10 @@
|
|||
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
|
||||
<target>Ova vrijednost nije ispravan međunarodni identifikacijski broj vrijednosnih papira (ISIN).</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="100">
|
||||
<source>This value should be a valid expression.</source>
|
||||
<target>Ova vrijednost mora biti valjani izraz.</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
|
|
|
|||
Reference in New Issue