Skip to content

Navigation Menu

Sign in
Appearance settings

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 05ab863

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.3
* 3.4: [travis] Fix build-packages script Remove useless testCanCheckIfTerminalIsInteractive test case [Validator] Add the missing translations for the Thai (\"th\") locale [Validator] Fix ValidValidator group cascading usage
2 parents bee0056 + 0272b8d commit 05ab863
Copy full SHA for 05ab863

File tree

Expand file treeCollapse file tree

4 files changed

+71
-20
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+71
-20
lines changed

‎.github/build-packages.php

Copy file name to clipboardExpand all lines: .github/build-packages.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
if (isset($preferredInstall[$package->name]) && 'source' === $preferredInstall[$package->name]) {
4848
passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
4949
} else {
50-
passthru("cd $dir && git init && git add . && git commit -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
50+
passthru("cd $dir && git init && git add . && git commit --author \"Symfony <>\" -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
5151
}
5252

5353
if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {

‎src/Symfony/Component/Console/Tests/ApplicationTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/ApplicationTest.php
-17Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,23 +1611,6 @@ public function testSetRunCustomSingleCommand()
16111611
$this->assertStringContainsString('The foo:bar command', $tester->getDisplay());
16121612
}
16131613

1614-
/**
1615-
* @requires function posix_isatty
1616-
*/
1617-
public function testCanCheckIfTerminalIsInteractive()
1618-
{
1619-
$application = new CustomDefaultCommandApplication();
1620-
$application->setAutoExit(false);
1621-
1622-
$tester = new ApplicationTester($application);
1623-
$tester->run(['command' => 'help']);
1624-
1625-
$this->assertFalse($tester->getInput()->hasParameterOption(['--no-interaction', '-n']));
1626-
1627-
$inputStream = $tester->getInput()->getStream();
1628-
$this->assertEquals($tester->getInput()->isInteractive(), @posix_isatty($inputStream));
1629-
}
1630-
16311614
public function testRunLazyCommandService()
16321615
{
16331616
$container = new ContainerBuilder();

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/ValidValidator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public function validate($value, Constraint $constraint)
3333
$this->context
3434
->getValidator()
3535
->inContext($this->context)
36-
->validate($value, null, [$this->context->getGroup()]);
36+
->validate($value, null, $this->context->getGroup());
3737
}
3838
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.th.xlf
+69-1Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
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>คอเล็กชั่นนี้ควรจะประกอบไปด้วยอ่างน้อย {{ limit }} สมาชิก</target>
207+
<target>คอเล็กชั่นนี้ควรจะประกอบไปด้วยอย่างน้อย {{ limit }} สมาชิก</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>
@@ -298,6 +298,74 @@
298298
<source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
299299
<target>ภาพนี้เป็นแนวตั้ง ({{ width }}x{{ height }}px) ไม่อนุญาตภาพที่เป็นแนวตั้ง</target>
300300
</trans-unit>
301+
<trans-unit id="78">
302+
<source>An empty file is not allowed.</source>
303+
<target>ไม่อนุญาตให้ใช้ไฟล์ว่าง</target>
304+
</trans-unit>
305+
<trans-unit id="79">
306+
<source>The host could not be resolved.</source>
307+
<target>ไม่สามารถแก้ไขชื่อโฮสต์</target>
308+
</trans-unit>
309+
<trans-unit id="80">
310+
<source>This value does not match the expected {{ charset }} charset.</source>
311+
<target>ค่านี้ไม่ตรงกับการเข้ารหัส {{ charset }}</target>
312+
</trans-unit>
313+
<trans-unit id="81">
314+
<source>This is not a valid Business Identifier Code (BIC).</source>
315+
<target>นี่ไม่ถูกต้องตามรหัสสำหรับระบุธุรกิจนี้ (BIC)</target>
316+
</trans-unit>
317+
<trans-unit id="82">
318+
<source>Error</source>
319+
<target>เกิดข้อผิดพลาด</target>
320+
</trans-unit>
321+
<trans-unit id="83">
322+
<source>This is not a valid UUID.</source>
323+
<target>นี่ไม่ใช่ UUID ที่ถูกต้อง</target>
324+
</trans-unit>
325+
<trans-unit id="84">
326+
<source>This value should be a multiple of {{ compared_value }}.</source>
327+
<target>ค่านี้ควรเป็น {{ compared_value }} หลายตัว</target>
328+
</trans-unit>
329+
<trans-unit id="85">
330+
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
331+
<target>รหัสสำหรับระบุธุรกิจนี้ (BIC) ไม่เกี่ยวข้องกับ IBAN {{ iban }}</target>
332+
</trans-unit>
333+
<trans-unit id="86">
334+
<source>This value should be valid JSON.</source>
335+
<target>ค่านี้ควรอยู่ในรูปแบบ JSON ที่ถูกต้อง</target>
336+
</trans-unit>
337+
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>คอเล็กชั่นนี้ควรมีเฉพาะสมาชิกที่ไม่ซ้ำกันเท่านั้น</target>
340+
</trans-unit>
341+
<trans-unit id="88">
342+
<source>This value should be positive.</source>
343+
<target>ค่านี้ควรเป็นค่าบวก</target>
344+
</trans-unit>
345+
<trans-unit id="89">
346+
<source>This value should be either positive or zero.</source>
347+
<target>ค่านี้ควรเป็นค่าบวกหรือค่าศูนย์</target>
348+
</trans-unit>
349+
<trans-unit id="90">
350+
<source>This value should be negative.</source>
351+
<target>ค่านี้ควรเป็นค่าลบ</target>
352+
</trans-unit>
353+
<trans-unit id="91">
354+
<source>This value should be either negative or zero.</source>
355+
<target>ค่านี้ควรเป็นค่าลบหรือค่าศูนย์</target>
356+
</trans-unit>
357+
<trans-unit id="92">
358+
<source>This value is not a valid timezone.</source>
359+
<target>ค่าเขตเวลาไม่ถูกต้อง</target>
360+
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>รหัสผ่านนี้ได้เคยรั่วไหลออกไปโดยถูกการละเมิดข้อมูล ซึ่งไม่ควรนำกลับมาใช้ กรุณาใช้รหัสผ่านอื่น</target>
364+
</trans-unit>
365+
<trans-unit id="94">
366+
<source>This value should be between {{ min }} and {{ max }}.</source>
367+
<target>ค่านี้ควรอยู่ระหว่าง {{ min }} ถึง {{ max }}</target>
368+
</trans-unit>
301369
</body>
302370
</file>
303371
</xliff>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.