Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commitb51de93

Browse files
committed
Merge branch '2.3'
* 2.3: Added missing column to the form's table layout Bumped Icu dependency to RC Update validators.ru.xlf remove check for PHP bug#50731 adding missing Farsi translations Revert "merged branch armetiz/master (PR#8045)"
2 parents485802d +37d9de9 commitb51de93

File tree

10 files changed

+103
-27
lines changed

10 files changed

+103
-27
lines changed

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
useSymfony\Component\Form\Exception\UnexpectedTypeException;
1515
useDoctrine\ORM\QueryBuilder;
16-
useDoctrine\ORM\EntityManagerInterface;
1716
useDoctrine\DBAL\Connection;
1817

1918
/**
@@ -34,13 +33,13 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
3433
/**
3534
* Construct an ORM Query Builder Loader
3635
*
37-
* @param QueryBuilder|\Closure$queryBuilder
38-
* @paramEntityManagerInterface $manager
39-
* @param string$class
36+
* @param QueryBuilder|\Closure $queryBuilder
37+
* @paramEntityManager $manager
38+
* @param string $class
4039
*
4140
* @throws UnexpectedTypeException
4241
*/
43-
publicfunction__construct($queryBuilder,EntityManagerInterface$manager =null,$class =null)
42+
publicfunction__construct($queryBuilder,$manager =null,$class =null)
4443
{
4544
// If a query builder was passed, it must be a closure or QueryBuilder
4645
// instance

‎src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
{%blockbutton_row %}
1818
{%spaceless %}
1919
<tr>
20-
<tdcolspan="2">
20+
<td></td>
21+
<td>
2122
{{ form_widget(form) }}
2223
</td>
2324
</tr>

‎src/Symfony/Component/ClassLoader/ClassLoader.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@ public function loadClass($class)
164164
*/
165165
publicfunctionfindFile($class)
166166
{
167-
if ('\\' ==$class[0]) {
168-
$class =substr($class,1);
169-
}
170-
171167
if (false !==$pos =strrpos($class,'\\')) {
172168
// namespaced class name
173169
$classPath =str_replace('\\',DIRECTORY_SEPARATOR,substr($class,0,$pos)).DIRECTORY_SEPARATOR;

‎src/Symfony/Component/ClassLoader/MapClassLoader.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ public function register($prepend = false)
4747
*/
4848
publicfunctionloadClass($class)
4949
{
50-
if ('\\' ===$class[0]) {
51-
$class =substr($class,1);
52-
}
53-
5450
if (isset($this->map[$class])) {
5551
require$this->map[$class];
5652
}
@@ -65,10 +61,6 @@ public function loadClass($class)
6561
*/
6662
publicfunctionfindFile($class)
6763
{
68-
if ('\\' ===$class[0]) {
69-
$class =substr($class,1);
70-
}
71-
7264
if (isset($this->map[$class])) {
7365
return$this->map[$class];
7466
}

‎src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ public function getLoadClassTests()
5454
returnarray(
5555
array('\\Namespaced2\\Foo','Namespaced2\\Foo','->loadClass() loads Namespaced2\Foo class'),
5656
array('\\Pearlike2_Foo','Pearlike2_Foo','->loadClass() loads Pearlike2_Foo class'),
57-
array('\\Namespaced2\\Bar','\\Namespaced2\\Bar','->loadClass() loads Namespaced2\Bar class with a leading slash'),
58-
array('\\Pearlike2_Bar','\\Pearlike2_Bar','->loadClass() loads Pearlike2_Bar class with a leading slash'),
5957
);
6058
}
6159

‎src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public function getLoadClassTests()
3232
returnarray(
3333
array('\\Namespaced\\Foo','Namespaced\\Foo','->loadClass() loads Namespaced\Foo class'),
3434
array('\\Pearlike_Foo','Pearlike_Foo','->loadClass() loads Pearlike_Foo class'),
35-
array('\\Namespaced\\Bar','\\Namespaced\\Bar','->loadClass() loads Namespaced\Bar class with a leading slash'),
36-
array('\\Pearlike_Bar','\\Pearlike_Bar','->loadClass() loads Pearlike_Bar class with a leading slash'),
3735
);
3836
}
3937

‎src/Symfony/Component/ClassLoader/UniversalClassLoader.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,6 @@ public function loadClass($class)
263263
*/
264264
publicfunctionfindFile($class)
265265
{
266-
if ('\\' ==$class[0]) {
267-
$class =substr($class,1);
268-
}
269-
270266
if (false !==$pos =strrpos($class,'\\')) {
271267
// namespaced class name
272268
$namespace =substr($class,0,$pos);

‎src/Symfony/Component/Intl/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
],
2626
"require": {
2727
"php":">=5.3.3",
28-
"symfony/icu":"~1.0"
28+
"symfony/icu":"~1.0-RC"
2929
},
3030
"require-dev": {
3131
"symfony/filesystem":">=2.1"

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,62 @@
222222
<source>Unsupported card type or invalid card number.</source>
223223
<target>نوع کارت پشتیبانی نمی شود یا شماره کارت نامعتبر است.</target>
224224
</trans-unit>
225+
<trans-unitid="59">
226+
<source>This is not a valid International Bank Account Number (IBAN).</source>
227+
<target>این یک شماره حساب بین المللی بانک (IBAN) درست نیست.</target>
228+
</trans-unit>
229+
<trans-unitid="60">
230+
<source>This value is not a valid ISBN-10.</source>
231+
<target>این مقدار یک ISBN-10 درست نیست.</target>
232+
</trans-unit>
233+
<trans-unitid="61">
234+
<source>This value is not a valid ISBN-13.</source>
235+
<target>این مقدار یک ISBN-13 درست نیست.</target>
236+
</trans-unit>
237+
<trans-unitid="62">
238+
<source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
239+
<target>این مقدار یک ISBN-10 درست یا ISBN-13 درست نیست.</target>
240+
</trans-unit>
241+
<trans-unitid="63">
242+
<source>This value is not a valid ISSN.</source>
243+
<target>این مقدار یک ISSN درست نیست.</target>
244+
</trans-unit>
245+
<trans-unitid="64">
246+
<source>This value is not a valid currency.</source>
247+
<target>این مقدار یک یکای پول درست نیست.</target>
248+
</trans-unit>
249+
<trans-unitid="65">
250+
<source>This value should be equal to {{ compared_value }}.</source>
251+
<target>این مقدار باید برابر با {{ compared_value }} باشد.</target>
252+
</trans-unit>
253+
<trans-unitid="66">
254+
<source>This value should be greater than {{ compared_value }}.</source>
255+
<target>این مقدار باید از {{ compared_value }} بیشتر باشد.</target>
256+
</trans-unit>
257+
<trans-unitid="67">
258+
<source>This value should be greater than or equal to {{ compared_value }}.</source>
259+
<target>این مقدار باید بزرگتر یا مساوی با {{ compared_value }} باشد.</target>
260+
</trans-unit>
261+
<trans-unitid="68">
262+
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
263+
<target>این مقدار باید با {{ compared_value_type }} {{ compared_value }} یکی باشد.</target>
264+
</trans-unit>
265+
<trans-unitid="69">
266+
<source>This value should be less than {{ compared_value }}.</source>
267+
<target>این مقدار باید کمتر از {{ compared_value }} باشد.</target>
268+
</trans-unit>
269+
<trans-unitid="70">
270+
<source>This value should be less than or equal to {{ compared_value }}.</source>
271+
<target>این مقدار باید کمتر یا مساوی با {{ compared_value }} باشد.</target>
272+
</trans-unit>
273+
<trans-unitid="71">
274+
<source>This value should not be equal to {{ compared_value }}.</source>
275+
<target>این مقدار نباید با {{ compared_value }} برابر باشد.</target>
276+
</trans-unit>
277+
<trans-unitid="72">
278+
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
279+
<target>این مقدار نباید {{ compared_value_type }} {{ compared_value }} یکی باشد.</target>
280+
</trans-unit>
225281
</body>
226282
</file>
227283
</xliff>

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,46 @@
238238
<source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
239239
<target>Значение не соответствует форматам ISBN-10 и ISBN-13</target>
240240
</trans-unit>
241+
<trans-unitid="63">
242+
<source>This value is not a valid ISSN.</source>
243+
<target>Значение не соответствует формату ISSN.</target>
244+
</trans-unit>
245+
<trans-unitid="64">
246+
<source>This value is not a valid currency.</source>
247+
<target>Некорректный формат валюты.</target>
248+
</trans-unit>
249+
<trans-unitid="65">
250+
<source>This value should be equal to {{ compared_value }}.</source>
251+
<target>Значение должно быть равно {{ compared_value }}.</target>
252+
</trans-unit>
253+
<trans-unitid="66">
254+
<source>This value should be greater than {{ compared_value }}.</source>
255+
<target>Значение должно быть больше чем {{ compared_value }}.</target>
256+
</trans-unit>
257+
<trans-unitid="67">
258+
<source>This value should be greater than or equal to {{ compared_value }}.</source>
259+
<target>Значение должно быть больше или равно {{ compared_value }}.</target>
260+
</trans-unit>
261+
<trans-unitid="68">
262+
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
263+
<target>Значение должно быть идентичным {{ compared_value_type }} {{ compared_value }}.</target>
264+
</trans-unit>
265+
<trans-unitid="69">
266+
<source>This value should be less than {{ compared_value }}.</source>
267+
<target>Значение должно быть меньше чем {{ compared_value }}.</target>
268+
</trans-unit>
269+
<trans-unitid="70">
270+
<source>This value should be less than or equal to {{ compared_value }}.</source>
271+
<target>Значение должно быть меньше или равно {{ compared_value }}.</target>
272+
</trans-unit>
273+
<trans-unitid="71">
274+
<source>This value should not be equal to {{ compared_value }}.</source>
275+
<target>Значение не должно быть равно {{ compared_value }}.</target>
276+
</trans-unit>
277+
<trans-unitid="72">
278+
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
279+
<target>Значение не должно быть идентичным {{ compared_value_type }} {{ compared_value }}.</target>
280+
</trans-unit>
241281
</body>
242282
</file>
243283
</xliff>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp