8000 Merge branch '3.4' into 4.4 · symfony/symfony@686ebe0 · GitHub
[go: up one dir, main page]
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 686ebe0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.4
* 3.4: [Translation] added missing Albanian translations [Form, Security, Validator] Add missing Turkish translations (tr) Display php info for extra versions in travis 38737 add missing dutch translation [Validator] Add missing Slovak translations. [Form, Security, Validator] Add missing Persian translations (fa_IR) [Form] Fix wrong translations for Ukrainian (uk) [Validator] Add missing translations for Ukrainian (uk) [Security] Add missing translations for Ukrainian (uk) [Form] Add missing translations for Ukrainian (uk) [Security] Add missing Slovak translations. [Form] Added missing Spanish translations. Fix transient tests
2 parents bc94b62 + f04745a commit 686ebe0

File tree

18 files changed

+950
-11
lines changed

18 files changed

+950
-11
lines changed

‎.travis.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ before_install:
150150
for PHP in $TRAVIS_PHP_VERSION $php_extra; do
151151
export PHP=$PHP
152152
phpenv global $PHP
153+
composer self-update
154+
composer self-update --2
153155
INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
154156
if ! php --ri sodium > /dev/null; then
155157
tfold ext.libsodium tpecl libsodium sodium.so $INI
@@ -166,9 +168,6 @@ before_install:
166168
tfold ext.apcu tpecl apcu-5.1.19 apcu.so $INI
167169
tfold ext.igbinary tpecl igbinary-3.1.6 igbinary.so $INI
168170
done
169-
- |
170-
# List all php extensions with versions
171-
php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;'
172171
173172
- |
174173
# Load fixtures
@@ -256,7 +255,18 @@ install:
256255
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
257256
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
258257
259-
- php -i
258+
- |
259+
# phpinfo
260+
phpinfo() {
261+
phpenv global $1
262+
php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;'
263+
php -i
264+
}
265+
export -f phpinfo
266+
267+
for PHP in $TRAVIS_PHP_VERSION $php_extra; do
268+
tfold $PHP phpinfo $PHP
269+
done
260270
261271
- |
262272
run_tests () {
@@ -268,7 +278,6 @@ install:
268278
return
269279
fi
270280
phpenv global $PHP
271-
composer self-update --2
272281
rm vendor/composer/package-versions-deprecated -Rf
273282
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer config platform.ext-mongodb 1.6.99; composer require --dev --no-update mongodb/mongodb ~1.5.0)
274283
tfold 'composer update' $COMPOSER_UP

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

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,126 @@
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
1515
<target>El token CSRF no es válido. Por favor, pruebe a enviar nuevamente el formulario.</target>
1616
</trans-unit>
17+
<trans-unit id="99">
18+
<source>This value is not a valid HTML5 color.</source>
19+
<target>Este valor no es un color HTML5 válido.</target>
20+
</trans-unit>
21+
<trans-unit id="100">
22+
<source>Please enter a valid birthdate.</source>
23+
<target>Por favor, ingrese una fecha de cumpleaños válida.</target>
24+
</trans-unit>
25+
<trans-unit id="101">
26+
<source>The selected choice is invalid.</source>
27+
<target>La opción seleccionada no es válida.</target>
28+
</trans-unit>
29+
<trans-unit F438 id="102">
30+
<source>The collection is invalid.</source>
31+
<target>La colección no es válida.</target>
32+
</trans-unit>
33+
<trans-unit id="103">
34+
<source>Please select a valid color.</source>
35+
<target>Por favor, seleccione un color válido.</target>
36+
</trans-unit>
37+
<trans-unit id="104">
38+
<source>Please select a valid country.</source>
39+
<target>Por favor, seleccione un país válido.</target>
40+
</trans-unit>
41+
<trans-unit id="105">
42+
<source>Please select a valid currency.</source>
43+
<target>Por favor, seleccione una moneda válida.</target>
44+
</trans-unit>
45+
<trans-unit id="106">
46+
<source>Please choose a valid date interval.</source>
47+
<target>Por favor, elija un intervalo de fechas válido.</target>
48+
</trans-unit>
49+
<trans-unit id="107">
50+
<source>Please enter a valid date and time.</source>
51+
<target>Por favor, ingrese una fecha y hora válidas.</target>
52+
</trans-unit>
53+
<trans-unit id="108">
54+
<source>Please enter a valid date.</source>
55+
<target>Por favor, ingrese una fecha valida.</target>
56+
</trans-unit>
57+
<trans-unit id="109">
58+
<source>Please select a valid file.</source>
59+
<target>Por favor, seleccione un archivo válido.</target>
60+
</trans-unit>
61+
<trans-unit id="110">
62+
<source>The hidden field is invalid.</source>
63+
<target>El campo oculto no es válido.</target>
64+
</trans-unit>
65+
<trans-unit id="111">
66+
<source>Please enter an integer.</source>
67+
<target>Por favor, ingrese un número entero.</target>
68+
</trans-unit>
69+
<trans-unit id="112">
70+
<source>Please select a valid language.</source>
71+
<target>Por favor, seleccione un idioma válido.</target>
72+
</trans-unit>
73+
<trans-unit id="113">
74+
<source>Please select a valid locale.</source>
75+
<target>Por favor, seleccione una configuración regional válida.</target>
76+
</trans-unit>
77+
<trans-unit id="114">
78+
<source>Please enter a valid money amount.</source>
79+
<target>Por favor, ingrese una cantidad de dinero válida.</target>
80+
</trans-unit>
81+
<trans-unit id="115">
82+
<source>Please enter a number.</source>
83+
<target>Por favor, ingrese un número.</target>
84+
</trans-unit>
85+
<trans-unit id="116">
86+
<source>The password is invalid.</source>
87+
<target>La contraseña no es válida.</target>
88+
</trans-unit>
89+
<trans-unit id="117">
90+
<source>Please enter a percentage value.</source>
91+
<target>Por favor, ingrese un valor porcentual.</target>
92+
</trans-unit>
93+
<trans-unit id="118">
94+
<source>The values do not match.</source>
95+
<target>Los valores no coinciden.</target>
96+
</trans-unit>
97+
<trans-unit id="119">
98+
<source>Please enter a valid time.</source>
99+
<target>Por favor, ingrese una hora válida.</target>
100+
</trans-unit>
101+
<trans-unit id="120">
102+
<source>Please select a valid timezone.</source>
103+
<target>Por favor, seleccione una zona horaria válida.</target>
104+
</trans-unit>
105+
<trans-unit id="121">
106+
<source>Please enter a valid URL.</source>
107+
<target>Por favor, ingrese una URL válida.</target>
108+
</trans-unit>
109+
<trans-unit id="122">
110+
<source>Please enter a valid search term.</source>
111+
<target>Por favor, ingrese un término de búsqueda válido.</target>
112+
</trans-unit>
113+
<trans-unit id="123">
114+
<source>Please provide a valid phone number.</source>
115+
<target>Por favor, proporcione un número de teléfono válido.</target>
116+
</trans-unit>
117+
<trans-unit id="124">
118+
<source>The checkbox has an invalid value.</source>
119+
<target>La casilla de verificación tiene un valor inválido.</target>
120+
</trans-unit>
121+
<trans-unit id="125">
122+
<source>Please enter a valid email address.</source>
123+
<target>Por favor, ingrese una dirección de correo electrónico válida.</target>
124+
</trans-unit>
125+
<trans-unit id="126">
126+
<source>Please select a valid option.</source>
127+
<target>Por favor, seleccione una opción válida.</target>
128+
</trans-unit>
129+
<trans-unit id="127">
130+
<source>Please select a valid range.</source>
131+
<target>Por favor, seleccione un rango válido.</target>
132+
</trans-unit>
133+
<trans-unit id="128">
134+
<source>Please enter a valid week.</source>
135+
<target>Por favor, ingrese una semana válida.</target>
136+
</trans-unit>
17137
</body>
18138
</file>
19139
</xliff>

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

Lines changed: 123 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,135 @@
44
<body>
55
<trans-unit id="28">
66
<source>This form should not contain extra fields.</source>
7-
<target>این فرم نباید شامل فیلد اضافه ای باشد.</target>
7+
<target>این فرم نباید شامل فیلدهای اضافی باشد.</target>
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>فایل بارگذاری شده بسیار بزرگ می باشد. لطفا فایل کوچکتری را بارگذاری نمایید.</target>
11+
<target>فایل بارگذاری‌شده بسیار بزرگ است. لطفاً فایل کوچک‌تری را بارگذاری نمایید.</target>
1212
</trans-unit>
1313
<trans-unit id="30">
1414
1241 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target>توکن CSRF نامعتبر می باشد. لطفا فرم را مجددا ارسال نمایید.</target>
15+
<target>توکن CSRF نامعتبر است. لطفاً فرم را مجدداً ارسال نمایید.</target>
16+
</trans-unit>
17+
<trans-unit id="99">
18+
<source>This value is not a valid HTML5 color.</source>
19+
<target>این مقدار یک رنگ معتبر HTML5 نیست.</target>
20+
</trans-unit>
21+
<trans-unit id="100">
22+
<source>Please enter a valid birthdate.</source>
23+
<target>لطفاً یک تاریخ تولد معتبر وارد نمایید.</target>
24+
</trans-unit>
25+
<trans-unit id="101">
26+
<source>The selected choice is invalid.</source>
27+
<target>گزینه‌ی انتخاب‌شده نامعتبر است</target>
28+
</trans-unit>
29+
<trans-unit id="102">
30+
<source>The collection is invalid.</source>
31+
<target>این مجموعه نامعتبر است.</target>
32+
</trans-unit>
33+
<trans-unit id="103">
34+
<source>Please select a valid color.</source>
35+
<target>لطفاً یک رنگ معتبر انتخاب کنید.</target>
36+
</trans-unit>
37+
<trans-unit id="104">
38+
<source>Please select a valid country.</source>
39+
<target>لطفاً یک کشور معتبر انتخاب کنید.</target>
40+
</trans-unit>
41+
<trans-unit id="105">
42+
<source>Please select a valid currency.</source>
43+
<target>لطفاً یک واحد پولی معتبر انتخاب کنید.</target>
44+
</trans-unit>
45+
<trans-unit id="106">
46+
<source>Please choose a valid date interval.</source>
47+
<target>لطفاً یک بازه‌ی زمانی معتبر انتخاب کنید.</target>
48+
</trans-unit>
49+
<trans-unit id="107">
50+
<source>Please enter a valid date and time.</source>
51+
<target>لطفاً یک تاریخ و زمان معتبر وارد کنید.</target>
52+
</trans-unit>
53+
<trans-unit id="108">
54+
<source>Please enter a valid date.</source>
55+
<target>لطفاً یک تاریخ معتبر وارد کنید.</target>
56+
</trans-unit>
57+
<trans-unit id="109">
58+
<source>Please select a valid file.</source>
59+
<target>لطفاً یک فایل معتبر انتخاب کنید.</target>
60+
</trans-unit>
61+
<trans-unit id="110">
62+
<source>The hidden field is invalid.</source>
63+
<target>فیلد مخفی نامعتبر است.</target>
64+
</trans-unit>
65+
<trans-unit id="111">
66+
<source>Please enter an integer.</source>
67+
<target>لطفاً یک عدد صحیح وارد کنید.</target>
68+
</trans-unit>
69+
<trans-unit id="112">
70+
<source>Please select a valid language.</source>
71+
<target>لطفاً یک زبان معتبر انتخاب کنید.</target>
72+
</trans-unit>
73+
<trans-unit id="113">
74+
<source>Please select a valid locale.</source>
75+
<target>لطفاً یک جغرافیای (locale) معتبر انتخاب کنید.</target>
76+
</trans-unit>
77+
<trans-unit id="114">
78+
<source>Please enter a valid money amount.</source>
79+
<target>لطفاً یک مقدار پول معتبر وارد کنید.</target>
80+
</trans-unit>
81+
<trans-unit id="115">
82+
<source>Please enter a number.</source>
83+
<target>لطفاً یک عدد وارد کنید.</target>
84+
</trans-unit>
85+
<trans-unit id="116">
86+
<source>The password is invalid.</source>
87+
<target>رمزعبور نامعتبر است.</target>
88+
</trans-unit>
89+
<trans-unit id="117">
90+
<source>Please enter a percentage value.</source>
91+
<target>لطفاً یک درصد معتبر وارد کنید.</target>
92+
</trans-unit>
93+
<trans-unit id="118">
94+
<source>The values do not match.</source>
95+
<target>مقادیر تطابق ندارند.</target>
96+
</trans-unit>
97+
<trans-unit id="119">
98+
<source>Please enter a valid time.</source>
99+
<target>لطفاً یک زمان معتبر وارد کنید.</target>
100+
</trans-unit>
101+
<trans-unit id="120">
102+
<source>Please select a valid timezone.</source>
103+
<target>لطفاً یک منطقه‌زمانی معتبر وارد کنید.</target>
104+
</trans-unit>
105+
<trans-unit id="121">
106+
<source>Please enter a valid URL.</source>
107+
<target>لطفاً یک URL معتبر وارد کنید.</target>
108+
</trans-unit>
109+
<trans-unit id="122">
110+
<source>Please enter a valid search term.</source>
111+
<target>لطفاً یک عبارت جستجوی معتبر وارد کنید.</target>
112+
</trans-unit>
113+
<trans-unit id="123">
114+
<source>Please provide a valid phone number.</source>
115+
<target>لطفاً یک شماره تلفن معتبر وارد کنید.</target>
116+
</trans-unit>
117+
<trans-unit id="124">
118+
<source>The checkbox has an invalid value.</source>
119+
<target>کادر انتخاب (checkbox) دارای مقداری نامعتبر است.</target>
120+
</trans-unit>
121+
<trans-unit id="125">
122+
<source>Please enter a valid email address.</source>
123+
<target>لطفاً یک آدرس رایانامه‌ی معتبر وارد کنید.</target>
124+
</trans-unit>
125+
<trans-unit id="126">
126+
<source>Please select a valid option.</source>
127+
<target>لطفاً یک گزینه‌ی معتبر انتخاب کنید.</target>
128+
</trans-unit>
129+
<trans-unit id="127">
130+
<source>Please select a valid range.</source>
131+
<target>لطفاً یک محدوده‌ی معتبر انتخاب کنید.</target>
132+
</trans-unit>
133+
<trans-unit id="128">
134+
<source>Please enter a valid week.</source>
135+
<target>لطفاً یک هفته‌ی معتبر وارد کنید.</target>
16136
</trans-unit>
17137
</body>
18138
</file>

0 commit comments

Comments
 (0)
0