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

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f1a9d70

Browse files
fabpotfabpot
committed
Merge branch '4.0'
* 4.0: [Form] Fix typo in Upgrade 3.4/4.0 [EventDispatcher] Dispatcher in stopEventPropagation test now registers correct listener Update da translations Fix Typo in Guard Factory
2 parents dc29b27 + 5ea5ee2 commit f1a9d70

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

‎UPGRADE-4.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ Form
368368
```php
369369
class MyTimezoneType extends TimezoneType
370370
{
371-
public function loadChoices()
371+
public function loadChoiceList()
372372
{
373373
// override the method
374374
}

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private function determineEntryPoint($defaultEntryPointId, array $config)
119119

120120
// we have multiple entry points - we must ask them to configure one
121121
throw new \LogicException(sprintf(
122-
'Because you have multiple guard configurators, you need to set the "guard.entry_point" key to one of you configurators (%s)',
122+
'Because you have multiple guard configurators, you need to set the "guard.entry_point" key to one of your configurators (%s)',
123123
implode(', ', $authenticatorIds)
124124
));
125125
}

‎src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function testStopEventPropagation()
158158
// be executed
159159
// Manually set priority to enforce $this->listener to be called first
160160
$this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'), 10);
161-
$this->dispatcher->addListener('post.foo', array($otherListener, 'preFoo'));
161+
$this->dispatcher->addListener('post.foo', array($otherListener, 'postFoo'));
162162
$this->dispatcher->dispatch(self::postFoo);
163163
$this->assertTrue($this->listener->postFooInvoked);
164164
$this->assertFalse($otherListener->postFooInvoked);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
</trans-unit>
99
<trans-unit id="29">
1010
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
11-
<target>Den oploadede fil var for stor. Opload venligst en mindre fil.</target>
11+
<target>Den uploadede fil var for stor. Upload venligst en mindre fil.</target>
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target>CSRF nøglen er ugyldig.</target>
15+
<target>CSRF-token er ugyldig.</target>
1616
</trans-unit>
1717
</body>
1818
</file>

‎src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
</trans-unit>
2525
<trans-unit id="6">
2626
<source>Not privileged to request the resource.</source>
27-
<target>Ingen tilladselese at anvende kilden.</target>
27+
<target>Ingen adgang til at forespørge ressourcen.</target>
2828
</trans-unit>
2929
<trans-unit id="7">
3030
<source>Invalid CSRF token.</source>
31-
<target>Ugyldigt CSRF token.</target>
31+
<target>Ugyldig CSRF-token.</target>
3232
</trans-unit>
3333
<trans-unit id="9">
3434
<source>No authentication provider found to support the authentication token.</source>

‎src/Symfony/Component/Validator/Resources/translations/validators.da.xlf

Lines changed: 25 additions & 25 deletions
< AB74 tr class="diff-line-row">
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,39 @@
2020
</trans-unit>
2121
<trans-unit id="5">
2222
<source>The value you selected is not a valid choice.</source>
23-
<target>Værdien skal være en af de givne muligheder.</target>
23+
<target>Den valgte værdi er ikke gyldig.</target>
2424
</trans-unit>
2525
<trans-unit id="6">
2626
<source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
27-
<target>Du skal vælge mindst {{ limit }} muligheder.</target>
27+
<target>Du skal vælge mindst én mulighed.|Du skal vælge mindst {{ limit }} muligheder.</target>
2828
</trans-unit>
2929
<trans-unit id="7">
3030
<source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
31-
<target>Du kan højest vælge {{ limit }} muligheder.</target>
31+
<target>Du kan højst vælge én mulighed.|Du kan højst vælge {{ limit }} muligheder.</target>
3232
</trans-unit>
3333
<trans-unit id="8">
3434
<source>One or more of the given values is invalid.</source>
35-
<target>En eller flere af de oplyste værdier er ugyldige.</target>
35+
<target>En eller flere af de angivne værdier er ugyldige.</target>
3636
</trans-unit>
3737
<trans-unit id="9">
3838
<source>This field was not expected.</source>
3939
<target>Feltet blev ikke forventet.</target>
4040
</trans-unit>
4141
<trans-unit id="10">
4242
<source>This field is missing.</source>
43-
<target>Dette felt er mangler.</target>
43+
<target>Dette felt mangler.</target>
4444
</trans-unit>
4545
<trans-unit id="11">
4646
<source>This value is not a valid date.</source>
4747
<target>Værdien er ikke en gyldig dato.</target>
4848
</trans-unit>
4949
<trans-unit id="12">
5050
<source>This value is not a valid datetime.</source>
51-
<target>Værdien er ikke en gyldig dato og tid.</target>
51+
<target>Værdien er ikke et gyldigt tidspunkt.</target>
5252
</trans-unit>
5353
<trans-unit id="13">
5454
<source>This value is not a valid email address.</source>
55-
<target>Værdien er ikke en gyldig e-mail adresse.</target>
55+
<target>Værdien er ikke en gyldig e-mailadresse.</target>
5656
</trans-unit>
5757
<trans-unit id="14">
5858
<source>The file could not be found.</source>
@@ -64,27 +64,27 @@
6464
</trans-unit>
6565
<trans-unit id="16">
6666
<source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
67-
<target>Filen er for stor ({{ size }} {{ suffix }}). Tilladte maksimale størrelse {{ limit }} {{ suffix }}.</target>
67+
<target>Filen er for stor ({{ size }} {{ suffix }}). Maksimale tilladte størrelse er {{ limit }} {{ suffix }}.</target>
6868
</trans-unit>
6969
<trans-unit id="17">
7070
<source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
71-
<target>Mimetypen af filen er ugyldig ({{ type }}). Tilladte mimetyper er {{ types }}.</target>
71+
<target>Filens MIME-type er ugyldig ({{ type }}). Tilladte MIME-typer er {{ types }}.</target>
7272
</trans-unit>
7373
<trans-unit id="18">
7474
<source>This value should be {{ limit }} or less.</source>
7575
<target>Værdien skal være {{ limit }} eller mindre.</target>
7676
</trans-unit>
7777
<trans-unit id="19">
7878
<source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
79-
<target>Værdien er for lang. Den skal have {{ limit }} bogstaver eller mindre.</target>
79+
<target>Værdien er for lang. Den må højst indeholde {{ limit }} tegn.</target>
8080
</trans-unit>
8181
<trans-unit id="20">
8282
<source>This value should be {{ limit }} or more.</source>
8383
<target>Værdien skal være {{ limit }} eller mere.</target>
8484
</trans-unit>
8585
<trans-unit id="21">
8686
<source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
87-
<target>Værdien er for kort. Den skal have {{ limit }} tegn eller flere.</target>
87+
<target>Værdien er for kort. Den skal indeholde mindst {{ limit }} tegn.</target>
8888
</trans-unit>
8989
<trans-unit id="22">
9090
<source>This value should not be blank.</source>
@@ -104,7 +104,7 @@
104104
</trans-unit>
105105
<trans-unit id="26">
106106
<source>This value is not a valid time.</source>
107-
<target>Værdien er ikke en gyldig tid.</target>
107+
<target>Værdien er ikke et gyldigt klokkeslæt.</target>
108108
</trans-unit>
109109
<trans-unit id="27">
110110
<source>This value is not a valid URL.</source>
@@ -136,7 +136,7 @@
136136
</trans-unit>
137137
<trans-unit id="37">
138138
<source>This is not a valid IP address.</source>
139-
<target>Dette er ikke en gyldig IP adresse.</target>
139+
<target>Dette er ikke en gyldig IP-adresse.</target>
140140
</trans-unit>
141141
<trans-unit id="38">
142142
<source>This value is not a valid language.</source>
@@ -160,31 +160,31 @@
160160
</trans-unit>
161161
<trans-unit id="43">
162162
<source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
163-
<target>Billedbredden er for stor ({{ width }}px). Tilladt maksimumsbredde er {{ max_width }}px.</target>
163+
<target>Billedet er for bredt ({{ width }}px). Største tilladte bredde er {{ max_width }}px.</target>
164164
</trans-unit>
165165
<trans-unit id="44">
166166
<source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
167-
<target>Billedebredden er for lille ({{ width }}px). Forventet minimumshøjde er {{ min_width }}px.</target>
167+
<target>Billedet er for smalt ({{ width }}px). Mindste forventede bredde er {{ min_width }}px.</target>
168168
</trans-unit>
169169
<trans-unit id="45">
170170
<source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
171-
<target>Billedhøjden er for stor ({{ height }}px). Tilladt maksimumshøjde er {{ max_height }}px.</target>
171+
<target>Billedet er for højt ({{ height }}px). Største tilladte højde er {{ max_height }}px.</target>
172172
</trans-unit>
173173
<trans-unit id="46">
174174
<source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
175-
<target>Billedhøjden er for lille ({{ height }}px). Forventet minimumshøjde er {{ min_height }}px.</target>
175+
<target>Billedet er for lavt ({{ height }}px). Mindste forventede højde er {{ min_height }}px.</target>
176176
</trans-unit>
177177
<trans-unit id="47">
178178
<source>This value should be the user's current password.</source>
179-
<target>Værdien skal være brugerens nuværende password.</target>
179+
<target>Værdien skal være brugerens nuværende adgangskode.</target>
180180
</trans-unit>
181181
<trans-unit id="48">
182182
<source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
183-
<target>Værdien skal have præcis {{ limit }} tegn.</target>
183+
<target>Værdien skal være på præcis {{ limit }} tegn.</target>
184184
</trans-unit>
185185
<trans-unit id="49">
186186
<source>The file was only partially uploaded.</source>
187-
<target>Filen var kun delvis uploadet.</target>
187+
<target>Filen blev kun delvist uploadet.</target>
188188
</trans-unit>
189189
<trans-unit id="50">
190190
<source>No file was uploaded.</source>
@@ -200,19 +200,19 @@
200200
</trans-unit>
201201
<trans-unit id="53">
202202
<source>A PHP extension caused the upload to fail.</source>
203-
<target>En PHP udvidelse forårsagede fejl i upload.</target>
203+
<target>En PHP-udvidelse forårsagede fejl i upload.</target>
204204
</trans-unit>
205205
<trans-unit id="54">
206206
<source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
207-
<target>Denne samling skal indeholde {{ limit }} element eller flere.|Denne samling skal indeholde {{ limit }} elementer eller flere.</target>
207+
<target>Denne samling skal indeholde mindst ét element.|Denne samling skal indeholde mindst {{ limit }} elementer.</target>
208208
</trans-unit>
209209
<trans-unit id="55">
210210
<source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
211-
<target>Denne samling skal indeholde {{ limit }} element eller mindre.|Denne samling skal indeholde {{ limit }} elementer eller mindre.</target>
211+
<target>Denne samling skal indeholde højst ét element.|Denne samling skal indeholde højst {{ limit }} elementer.</target>
212212
</trans-unit>
213213
<trans-unit id="56">
214214
<source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
215-
<target>Denne samling skal indeholde præcis {{ limit }} element.|Denne samling skal indeholde præcis {{ limit }} elementer.</target>
215+
<target>Denne samling skal indeholde præcis ét element.|Denne samling skal indeholde præcis {{ limit }} elementer.</target>
216216
</trans-unit>
217217
<trans-unit id="57">
218218
<source>Invalid card number.</source>
@@ -224,7 +224,7 @@
224224
</trans-unit>
225225
<trans-unit id="59">
226226
<source>This is not a valid International Bank Account Number (IBAN).</source>
227-
<target>Det er ikke en gyldig International Bank Account Number (IBAN).</target>
227+
<target>Det er ikke et gyldigt International Bank Account Number (IBAN).</target>
228228
</trans-unit>
229229
<trans-unit id="60">
230230
<source>This value is not a valid ISBN-10.</source>

0 commit comments

Comments
 (0)
0