8000 Merge branch '5.1' into 5.x · symfony/symfony@93d0276 · GitHub
[go: up one dir, main page]
Skip to content

Commit 93d0276

Browse files
derrabusderrabus
committed
Merge branch '5.1' into 5.x
2 parents eb8d909 + 5b2f88b commit 93d0276

File tree

16 files changed

+624
-12
lines changed

16 files changed

+624
-12
lines changed

‎src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ public function testGetMetadata()
116116

117117
$item = $cache->getItem('foo');
118118

119-
$expected = [
120-
CacheItem::METADATA_EXPIRY => 9.5 + time(),
121-
CacheItem::METADATA_CTIME => 1000,
122-
];
123-
$this->assertEqualsWithDelta($expected, $item->getMetadata(), .6, 'Item metadata should embed expiry and ctime.');
119+
$metadata = $item->getMetadata();
120+
$this->assertArrayHasKey(CacheItem::METADATA_CTIME, $metadata);
121+
$this->assertEqualsWithDelta(1000, $metadata[CacheItem::METADATA_CTIME], 6);
122+
$this->assertArrayHasKey(CacheItem::METADATA_EXPIRY, $metadata);
123+
$this->assertEqualsWithDelta(9.5 + time(), $metadata[CacheItem::METADATA_EXPIRY], 0.6);
124124
}
125125

126126
public function testDefaultLifeTime()

‎src/Symfony/Component/Form/Resources/translations/validators.fr.xlf

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,122 @@
1818
<source>This value is not a valid HTML5 color.</source>
1919
<target>Cette valeur n'est pas une couleur HTML5 valide.</target>
2020
</trans-unit>
21+
<trans-unit id="100">
22+
<source>Please enter a valid birthdate.</source>
23+
<target>Veuillez entrer une date de naissance valide.</target>
24+
</trans-unit>
25+
<trans-unit id="101">
26+
<source>The selected choice is invalid.</source>
27+
<target>Le choix sélectionné est invalide.</target>
28+
</trans-unit>
29+
<trans-unit id="102">
30+
A36C <source>The collection is invalid.</source>
31+
<target>La collection est invalide.</target>
32+
</trans-unit>
33+
<trans-unit id="103">
34+
<source>Please select a valid color.</source>
35+
<target>Veuillez sélectionner une couleur valide.</target>
36+
</trans-unit>
37+
<trans-unit id="104">
38+
<source>Please select a valid country.</source>
39+
<target>Veuillez sélectionner un pays valide.</target>
40+
</trans-unit>
41+
<trans-unit id="105">
42+
<source>Please select a valid currency.</source>
43+
<target>Veuillez sélectionner une devise valide.</target>
44+
</trans-unit>
45+
<trans-unit id="106">
46+
<source>Please choose a valid date interval.</source>
47+
<target>Veuillez choisir un intervalle de dates valide.</target>
48+
</trans-unit>
49+
<trans-unit id="107">
50+
<source>Please enter a valid date and time.</source>
51+
<target>Veuillez saisir une date et une heure valides.</target>
52+
</trans-unit>
53+
<trans-unit id="108">
54+
<source>Please enter a valid date.</source>
55+
<target>Veuillez entrer une date valide.</target>
56+
</trans-unit>
57+
<trans-unit id="109">
58+
<source>Please select a valid file.</source>
59+
<target>Veuillez sélectionner un fichier valide.</target>
60+
</trans-unit>
61+
<trans-unit id="110">
62+
<source>The hidden field is invalid.</source>
63+
<target>Le champ masqué n'est pas valide.</target>
64+
</trans-unit>
65+
<trans-unit id="111">
66+
<source>Please enter an integer.</source>
67+
<target>Veuillez saisir un entier.</target>
68+
</trans-unit>
69+
<trans-unit id="112">
70+
<source>Please select a valid language.</source>
71+
<target>Veuillez sélectionner une langue valide.</target>
72+
</trans-unit>
73+
<trans-unit id="113">
74+
<source>Please select a valid locale.</source>
75+
<target>Veuillez sélectionner une langue valide.</target>
76+
</trans-unit>
77+
<trans-unit id="114">
78+
<source>Please enter a valid money amount.</source>
79+
<target>Veuillez saisir un montant valide.</target>
80+
</trans-unit>
81+
<trans-unit id="115">
82+
<source>Please enter a number.</source>
83+
<target>Veuillez saisir un nombre.</target>
84+
</trans-unit>
85+
<trans-unit id="116">
86+
<source>The password is invalid.</source>
87+
<target>Le mot de passe est invalide.</target>
88+
</trans-unit>
89+
<trans-unit id="117">
90+
<source>Please enter a percentage value.</source>
91+
<target>Veuillez saisir un pourcentage valide.</target>
92+
</trans-unit>
93+
<trans-unit id="118">
94+
<source>The values do not match.</source>
95+
<target>Les valeurs ne correspondent pas.</target>
96+
</trans-unit>
97+
<trans-unit id="119">
98+
<source>Please enter a valid time.</source>
99+
<target>Veuillez saisir une heure valide.</target>
100+
</trans-unit>
101+
<trans-unit id="120">
102+
<source>Please select a valid timezone.</source>
103+
<target>Veuillez sélectionner un fuseau horaire valide.</target>
104+
</trans-unit>
105+
<trans-unit id="121">
106+
<source>Please enter a valid URL.</source>
107+
<target>Veuillez saisir une URL valide.</target>
108+
</trans-unit>
109+
<trans-unit id="122">
110+
<source>Please enter a valid search term.</source>
111+
<target>Veuillez saisir un terme de recherche valide.</target>
112+
</trans-unit>
113+
<trans-unit id="123">
114+
<source>Please provide a valid phone number.</source>
115+
<target>Veuillez fournir un numéro de téléphone valide.</target>
116+
</trans-unit>
117+
<trans-unit id="124">
118+
<source>The checkbox has an invalid value.</source>
119+
<target>La case à cocher a une valeur non valide.</target>
120+
</trans-unit>
121+
<trans-unit id="125">
122+
<source>Please enter a valid email address.</source>
123+
<target>Veuillez saisir une adresse email valide.</target>
124+
</trans-unit>
125+
<trans-unit id="126">
126+
<source>Please select a valid option.</source>
127+
<target>Veuillez sélectionner une option valide.</target>
128+
</trans-unit>
129+
<trans-unit id="127">
130+
<source>Please select a valid range.</source>
131+
<target>Veuillez sélectionner une plage valide.</target>
132+
</trans-unit>
133+
<trans-unit id="128">
134+
<source>Please enter a valid week.</source>
135+
<target>Veuillez entrer une semaine valide.</target>
136+
</trans-unit>
21137
</body>
22138
</file>
23139
</xliff>

‎src/Symfony/Component/Form/Resources/translations/validators.lv.xlf

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,126 @@
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
1515
<target>Dotais CSRF talons nav derīgs. Lūdzu mēģiniet vēlreiz iesniegt veidlapu.</target>
1616
</trans-unit>
17+
<trans-unit id="99">
18+
<source>This value is not a valid HTML5 color.</source>
19+
<target>Šī vertība nav derīga HTML5 krāsa.</target>
20+
</trans-unit>
21+
<trans-unit id="100">
22+
<source>Please enter a valid birthdate.</source>
23+
<target>Lūdzu, ievadiet derīgu dzimšanas datumu.</target>
24+
</trans-unit>
25+
<trans-unit id="101">
26+
<source>The selected choice is invalid.</source>
27+
<target>Iezīmētā izvēle nav derīga.</target>
28+
</trans-unit>
29+
<trans-unit id="102">
30+
<source>The collection is invalid.</source>
31+
<target>Kolekcija nav derīga.</target>
32+
</trans-unit>
33+
<trans-unit id="103">
34+
<source>Please select a valid color.</source>
35+
<target>Lūdzu, izvēlieties derīgu krāsu.</target>
36+
</trans-unit>
37+
<trans-unit id="104">
38+
<source>Please select a valid country.</source>
39+
<target>Lūdzu, izvēlieties derīgu valsti.</target>
40+
</trans-unit>
41+
<trans-unit id="105">
42+
<source>Please select a valid currency.</source>
43+
<target>Lūdzu, izvēlieties derīgu valūtu.</target>
44+
</trans-unit>
45+
<trans-unit id="106">
46+
<source>Please choose a valid date interval.</source>
47+
<target>Lūdzu, izvēlieties derīgu datumu intervālu.</target>
48+
</trans-unit>
49+
<trans-unit id="107">
50+
<source>Please enter a valid date and time.</source>
51+
<target>Lūdzu, ievadiet derīgu datumu un laiku.</target>
52+
</trans-unit>
53+
<trans-unit id="108">
54+
<source>Please enter a valid date.</source>
55+
<target>Lūdzu, ievadiet derīgu datumu.</target>
56+
</trans-unit>
57+
<trans-unit id="109">
58+
<source>Please select a valid file.</source>
59+
<target>Lūdzu, izvēlieties derīgu failu.</target>
60+
</trans-unit>
61+
<trans-unit id="110">
62+
<source>The hidden field is invalid.</source>
63+
<target>Slēptā lauka vērtība ir nederīga.</target>
64+
</trans-unit>
65+
<trans-unit id="111">
66+
<source>Please enter an integer.</source>
67+
<target>Lūdzu, ievadiet veselu skaitli.</target>
68+
</trans-unit>
69+
<trans-unit id="112">
70+
<source>Please select a valid language.</source>
71+
<target>Lūdzu, izvēlieties derīgu valodu.</target>
72+
</trans-unit>
73+
<trans-unit id="113">
74+
<source>Please select a valid locale.</source>
75+
<target>Lūdzu, izvēlieties derīgu lokalizāciju.</target>
76+
</trans-unit>
77+
<trans-unit id="114">
78+
<source>Please enter a valid money amount.</source>
79+
<target>Lūdzu, ievadiet derīgu naudas lielumu.</target>
80+
</trans-unit>
81+
<trans-unit id="115">
82+
<source>Please enter a number.</source>
83+
<target>Lūdzu, ievadiet skaitli.</target>
84+
</trans-unit>
85+
<trans-unit id="116">
86+
<source>The password is invalid.</source>
87+
<target>Parole ir nederīga.</target>
88+
</trans-unit>
89+
<trans-unit id="117">
90+
<source>Please enter a percentage value.</source>
91+
<target>Lūdzu, ievadiet procentuālo lielumu.</target>
92+
</trans-unit>
93+
<trans-unit id="118">
94+
<source>The values do not match.</source>
95+
<target>Vērtības nesakrīt.</target>
96+
</trans-unit>
97+
<trans-unit id="119">
98+
<source>Please enter a valid time.</source>
99+
<target>Lūdzu, ievadiet derīgu laiku.</target>
100+
</trans-unit>
101+
<trans-unit id="120">
102+
<source>Please select a valid timezone.</source>
103+
<target>Lūdzu, izvēlieties derīgu laika zonu.</target>
104+
</trans-unit>
105+
<trans-unit id="121">
106+
<source>Please enter a valid URL.</source>
107+
<target>Lūdzu, ievadiet derīgu URL.</target>
108+
</trans-unit>
109+
<trans-unit id="122">
110+
<source>Please enter a valid search term.</source>
111+
<target>Lūdzu, ievadiet derīgu meklēšanas nosacījumu.</target>
112+
</trans-unit>
113+
<trans-unit id="123">
114+
<source>Please provide a valid phone number.</source>
115+
<target>Lūdzu, ievadiet derīgu tālruņa numuru.</target>
116+
</trans-unit>
117+
<trans-unit id="124">
118+
<source>The checkbox has an invalid value.</source>
119+
<target>Izvēles rūtiņai ir nederīga vērtība.</target>
120+
</trans-unit>
121+
<trans-unit id="125">
122+
<source>Please enter a valid email address.</source>
123+
<target>Lūdzu, ievadiet derīgu e-pasta adresi.</target>
124+
</trans-unit>
125+
<trans-unit id="126">
126+
<source>Please select a valid option.</source>
127+
<target>Lūdzu, izvēlieties derīgu opciju.</target>
128+
</trans-unit>
129+
<trans-unit id="127">
130+
<source>Please select a valid range.</source>
131+
<target>Lūdzu, izvēlieties derīgu diapazonu.</target>
132+
</trans-unit>
133+
<trans-unit id="128">
134+
<source>Please enter a valid week.</source>
135+
<target>Lūdzu, ievadiet derīgu nedeļu.</target>
136+
</trans-unit>
17137
</body>
18138
</file>
19139
</xliff>

‎src/Symfony/Component/Form/Resources/translations/validators.pt_BR.xlf

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,26 @@
114114
<source>Please provide a valid phone number.</source>
115115
<target>Por favor, informe um telefone válido.</target>
116116
</trans-unit>
117+
<trans-unit id="124">
118+
<source>The checkbox has an invalid value.</source>
119+
<target>A caixa de seleção possui um valor inválido.</target>
120+
</trans-unit>
121+
<trans-unit id="125">
122+
<source>Please enter a valid email address.</source>
123+
<target>Por favor, informe um endereço de e-mail válido.</target>
124+
</trans-unit>
125+
<trans-unit id="126">
126+
<source>Please select a valid option.</source>
127+
<target>Por favor, selecione uma opção válida.</target>
128+
</trans-unit>
129+
<trans-unit id="127">
130+
<source>Please select a valid range.</source>
131+
<target>Por favor, selecione um intervalo válido.</target>
132+
</trans-unit>
133+
<trans-unit id="128">
134+
<source>Please enter a valid week.</source>
135+
<target>Por favor, informe uma semana válida.</target>
136+
</trans-unit>
117137
</body>
118138
</file>
119139
</xliff>

0 commit comments

Comments
 (0)
0