Skip to content

Commit dc0c33c

Browse files
committed
Merge remote-tracking branch 'upstream/4.3' into 4.3
* upstream/4.3: Changed names of Intl classes in form types docs uppercase
2 parents 18ea03a + 03f6f1f commit dc0c33c

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

reference/forms/types/country.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Overridden Options
7070
choices
7171
~~~~~~~
7272

73-
**default**: ``Symfony\Component\Intl\Intl::getRegionBundle()->getCountryNames()``
73+
**default**: ``Symfony\Component\Intl\Countries::getNames()``
7474

7575
The country type defaults the ``choices`` option to the whole list of countries.
7676
The locale is used to translate the countries names.

reference/forms/types/currency.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Overridden Options
6262
choices
6363
~~~~~~~
6464

65-
**default**: ``Symfony\Component\Intl\Intl::getCurrencyBundle()->getCurrencyNames()``
65+
**default**: ``Symfony\Component\Intl\Currencies::getNames()``
6666

6767
The choices option defaults to all currencies.
6868

reference/forms/types/language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Overridden Options
7272
choices
7373
~~~~~~~
7474

75-
**default**: ``Symfony\Component\Intl\Intl::getLanguageBundle()->getLanguageNames()``.
75+
**default**: ``Symfony\Component\Intl\Languages::getNames()``.
7676

7777
The choices option defaults to all languages.
7878
The default locale is used to translate the languages names.

reference/forms/types/locale.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Overridden Options
7373
choices
7474
~~~~~~~
7575

76-
**default**: ``Symfony\Component\Intl\Intl::getLocaleBundle()->getLocaleNames()``
76+
**default**: ``Symfony\Component\Intl\Locales::getNames()``
7777

7878
The choices option defaults to all locales. It uses the default locale to
7979
specify the language.

setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ stable version. If you want to use an LTS version, add the ``--version`` option:
237237

238238
.. code-block:: terminal
239239
240-
# use the most recent 'lts' version
240+
# use the most recent LTS version
241241
$ symfony new my_project_name --version=lts
242242
243243
# use the 'next' Symfony version to be released (still in development)

0 commit comments

Comments
 (0)