8000 Merge branch '2.0' · sdboyer/symfony@f15cbc6 · GitHub
[go: up one dir, main page]
Skip to content

Commit f15cbc6

Browse files
fabpotfabpot
committed
Merge branch '2.0'
* 2.0: fix italian translation for branch 2.0 Added missing method to HTTP Digest entry point
2 parents 89df6bb + 11023be commit f15cbc6

File tree

2 files changed

+53
-3
lines changed

2 files changed

+53
-3
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.it.xliff

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</trans-unit>
3333
<trans-unit id="8">
3434
<source>One or more of the given values is invalid</source>
35-
<target>One or more of the given values is invalid</target>
35+
<target>Uno o più valori inseriti non sono validi</target>
3636
</trans-unit>
3737
<trans-unit id="9">
3838
<source>The fields {{ fields }} were not expected</source>
@@ -119,13 +119,53 @@
119119
<target>Il file caricato è troppo grande. Per favore caricare un file più piccolo</target>
120120
</trans-unit>
121121
<trans-unit id="30">
122-
<source>The CSRF token is invalid</source>
123-
<target>Il token CSRF non è valido</target>
122+
<source>The CSRF token is invalid. Please try to resubmit the form</source>
123+
<target>Il token CSRF non è valido. Provare a reinviare la form</target>
124124
</trans-unit>
125125
<trans-unit id="31">
126126
<source>The two values should be equal</source>
127127
<target>I due valori dovrebbero essere uguali</target>
128128
</trans-unit>
129+
<trans-unit id="32">
130+
<source>The file is too large. Allowed maximum size is {{ limit }}</source>
131+
<target>Il file è troppo grande. La dimensione massima è {{ limit }}</target>
132+
</trans-unit>
133+
<trans-unit id="33">
134+
<source>The file is too large</source>
135+
<target>Il file è troppo grande</target>
136+
</trans-unit>
137+
<trans-unit id="34">
138+
<source>The file could not be uploaded</source>
139+
<target>Il file non può essere caricato</target>
140+
</trans-unit>
141+
<trans-unit id="35">
142+
<source>This value should be a valid number</source>
143+
<target>Questo valore dovrebbe essere un numero</target>
144+
</trans-unit>
145+
<trans-unit id="36">
146+
<source>This file is not a valid image</source>
147+
<target>Questo file non è una immagine valida</target>
148+
</trans-unit>
149+
<trans-unit id="37">
150+
<source>This is not a valid IP address</source>
151+
<target>Questo valore non è un indirizzo IP valido</target>
152+
</trans-unit>
153+
<trans-unit id="38">
154+
<source>This value is not a valid language</source>
155+
<target>Questo valore non è una lingua valida</target>
156+
</trans-unit>
157+
<trans-unit id="39">
158+
<source>This value is not a valid locale</source>
159+
<target>Questo valore non è una impostazione regionale valida</target>
160+
</trans-unit>
161+
<trans-unit id="40">
162+
<source>This value is not a valid country</source>
163+
<target>Questo valore non è una nazione valida</target>
164+
</trans-unit>
165+
<trans-unit id="41">
166+
<source>This value is already used</source>
167+
<target>Questo valore è già stato utilizzato</target>
168+
</trans-unit>
129169
</body>
130170
</file>
131171
</xliff>

‎src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,14 7ECA @@ public function start(Request $request, AuthenticationException $authException =
6161

6262
return $response;
6363
}
64+
65+
public function getKey()
66+
{
67+
return $this->key;
68+
}
69+
70+
public function getRealmName()
71+
{
72+
return $this->realmName;
73+
}
6474
}

0 commit comments

Comments
 (0)
0