10000 Merge branch '4.4' into 5.3 · symfony/symfony@580c9e6 · GitHub
[go: up one dir, main page]

Skip to content

Commit 580c9e6

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Use GitHub issue form templates Add missing translations for Persian (fa) Add the missing translations for Bahasa Indonesia (id) Update README.md Fix deprecations on PHP 8.2
2 parents a14ef91 + 3839bd5 commit 580c9e6

File tree

6 files changed

+78
-3
lines changed

6 files changed

+78
-3
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: 🐛 Bug Report
2+
description: ⚠️ See below for security reports
3+
labels: Bug
4+
5+
body:
6+
- type: input
7+
id: affected-versions
8+
attributes:
9+
label: Symfony version(s) affected
10+
placeholder: x.y.z
11+
validations:
12+
required: true
13+
- type: textarea
14+
id: description
15+
attributes:
16+
label: Description
17+
description: A clear and consise description of the problem
18+
validations:
19+
required: true
20+
- type: textarea
21+
id: how-to-reproduce
22+
attributes:
23+
label: How to reproduce
24+
description: |
25+
Code and/or config needed to reproduce the problem.
26+
If it's a complex bug, create a "bug reproducer" as explained in https://symfony.com/doc/current/contributing/code/reproducer.html
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: possible-solution
31+
attributes:
32+
label: Possible Solution
33+
description: "Optional: only if you have suggestions on a fix/reason for the bug"
34+
- type: textarea
35+
id: additional-context
36+
attributes:
37+
label: Additional Context
38+
description: "Optional: any other context about the problem: log messages, screenshots, etc."
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: 🚀 Feature Request
2+
description: RFC and ideas for new features and improvements
3+
body:
4+
- type: textarea
5+
id: description
6+
attributes:
7+
label: Description
8+
description: A clear and concise description of the new feature
9+
validations:
10+
required: true
11+
- type: textarea
12+
id: example
13+
attributes:
14+
label: Example
15+
description: |
16+
A simple example of the new feature in action (include PHP code, YAML config, etc.)
17+
If the new feature changes an existing feature, include a simple before/after comparison.

src/Symfony/Component/Console/Helper/QuestionHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ protected function formatChoiceQuestionChoices(ChoiceQuestion $question, string
205205
{
206206
$messages = [];
207207

208-
$maxWidth = max(array_map('self::width', array_keys($choices = $question->getChoices())));
208+
$maxWidth = max(array_map([__CLASS__, 'width'], array_keys($choices = $question->getChoices())));
209209

210210
foreach ($choices as $key => $value) {
211211
$padding = str_repeat(' ', $maxWidth - self::width($key));

src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,18 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>این مقدار باید یک عبارت معتبر باشد.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>این مقدار یک رنگ معتبر در CSS نیست.</target>
396+
</trans-unit>
397+
<trans-unit id="102">
398+
<source>This value is not a valid CIDR notation.</source>
399+
<target>این مقدار یک نماد معتبر در CIDR نیست.</target>
400+
</trans-unit>
401+
<trans-unit id="103">
402+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403+
<target>مقدار ماسک شبکه (NetMask) باید بین {{ min }} و {{ max }} باشد.</target>
404+
</trans-unit>
393405
</body>
394406
</file>
395407
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.id.xlf

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,20 @@
388388
</trans-unit>
389389
<trans-unit id="100">
390390
<source>This value should be a valid expression.</source>
391-
<target>Nilai ini harus berupa ekspresi yang valid.</target>
391+
<target>Nilai ini harus berupa ekspresi yang sah.</target>
392392
</trans-unit>
393393
<trans-unit id="101">
394394
<source>This value is not a valid CSS color.</source>
395395
<target>Nilai ini bukan merupakan warna CSS yang sah.</target>
396396
</trans-unit>
397+
<trans-unit id="102">
398+
<source>This value is not a valid CIDR notation.</source>
399+
<target>Nilai ini bukan merupakan notasi CIDR yang sah.</target>
400+
</trans-unit>
401+
<trans-unit id="103">
402+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403+
<target>Nilai dari netmask harus berada diantara {{ min }} dan {{ max }}.</target>
404+
</trans-unit>
397405
</body>
398406
</file>
399407
</xliff>

src/Symfony/Component/VarDumper/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ VarDumper Component
33

44
The VarDumper component provides mechanisms for walking through any arbitrary
55
PHP variable. It provides a better `dump()` function that you can use instead
6-
of `var_dump`.
6+
of `var_dump()`.
77

88
Resources
99
---------

0 commit comments

Comments
 (0)
0