8000 merged branch jdreesen/trans-update-2 (PR #2112) · symfony/symfony@89df6bb · GitHub
[go: up one dir, main page]
Skip to content

Commit 89df6bb

Browse files
fabpotfabpot
committed
merged branch jdreesen/trans-update-2 (PR #2112)
Commits ------- 1134c1a [Validator] Fixed typo in Image constraint 428a01c Merge branch 'master' of git://github.com/symfony/symfony into trans-update-2 3843afa [FrameworkBundle] Improved German validator translation ac54080 [FrameworkBundle] Updated German translations for image validator Discussion ---------- Updated/improved german validator translation & fixed typos in Image constraint
2 parents 6acc4f3 + 1134c1a commit 89df6bb

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</trans-unit>
6565
<trans-unit id="16">
6666
<source>The file is too large ({{ size }}). Allowed maximum size is {{ limit }}</source>
67-
<target>Die Datei ist zu groß ({{ size }}). Die maximal zugelassene Größe beträgt {{ limit }}</target>
67+
<target>Die Datei ist zu groß ({{ size }}). Die maximal zulässige Größe beträgt {{ limit }}</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>
@@ -128,7 +128,7 @@
128128
</trans-unit>
129129
<trans-unit id="32">
130130
<source>The file is too large. Allowed maximum size is {{ limit }}</source>
131-
<target>Die Datei ist zu groß. Die maximal zugelassene Größe beträgt {{ limit }}</target>
131+
<target>Die Datei ist zu groß. Die maximal zulässige Größe beträgt {{ limit }}</target>
132132
</trans-unit>
133133
<trans-unit id="33">
134134
<source>The file is too large</source>
@@ -166,6 +166,26 @@
166166
<source>This value is already used</source>
167167
<target>Dieser Wert wird bereits verwendet</target>
168168
</trans-unit>
169+
<trans-unit id="42">
170+
<source>The size of the image could not be detected</source>
171+
<target>Die Größe des Bildes konnte nicht ermittlet werden</target>
172+
</trans-unit>
173+
<trans-unit id="43">
174+
<source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px</source>
175+
<target>Die Bildbreite ist zu groß ({{ width }}px). Die maximal zulässige Breite beträgt {{ max_width }}px</target>
176+
</trans-unit>
177+
<trans-unit id="44">
178+
<source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px</source>
179+
<target>Die Bildbreite ist zu gering ({{ width }}px). Die erwartete Mindestbreite beträgt {{ min_width }}px</target>
180+
</trans-unit>
181+
<trans-unit id="45">
182+
<source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px</source>
183+
<target>Die Bildhöhe ist zu groß ({{ height }}px). Die maximal zulässige Höhe beträgt {{ max_height }}px</target>
184+
</trans-unit>
185+
<trans-unit id="46">
186+
<source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px</source>
187+
<target>Die Bildhöhe ist zu gering ({{ height }}px). Die erwartete Mindesthöhe beträgt {{ min_height }}px</target>
188+
</trans-unit>
169189
</body>
170190
</file>
171191
</xliff>

‎src/Symfony/Component/Validator/Constraints/Image.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ class Image extends File
2828
public $sizeNotDetectedMessage = 'The size of the image could not be detected';
2929
public $maxWidthMessage = 'The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px';
3030
public $minWidthMessage = 'The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px';
31-
public $maxHeightMessage = 'The image height is too big ({{ height }}px). Allowed maximum width is {{ max_height }}px';
32-
public $minHeightMessage = 'The image width is too small ({{ height }}px). Minimum height expected is {{ min_height }}px';
31+
public $maxHeightMessage = 'The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px';
32+
public $minHeightMessage = 'The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px';
3333
}

0 commit comments

Comments
 (0)
0