Skip to content

Commit b617f22

Browse files
committed
minor symfony#11546 [Intl] Renamed Regions to Countries (javiereguiluz)
This PR was merged into the 4.3 branch. Discussion ---------- [Intl] Renamed Regions to Countries This fixes symfony#11532. Commits ------- a9788bc [Intl] Renamed Regions to Countries
2 parents e26c419 + a9788bc commit b617f22

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

components/intl.rst

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Accessing ICU Data
212212
This component provides the following ICU data:
213213

214214
* `Language and Script Names`_
215-
* `Country and Region Names`_
215+
* `Country Names`_
216216
* `Locales`_
217217
* `Currencies`_
218218
* `Timezones`_
@@ -283,42 +283,40 @@ You can also check if a given script code is valid::
283283

284284
The ``Scripts`` class was introduced in Symfony 4.3.
285285

286-
.. _country-names:
286+
Country Names
287+
~~~~~~~~~~~~~
287288

288-
Country and Region Names
289-
~~~~~~~~~~~~~~~~~~~~~~~~
289+
The ``Countries`` class provides access to the name of all countries according
290+
to the `ISO 3166-1 alpha-2`_ list of officially recognized countries and
291+
territories::
290292

291-
In the world there are some territorial disputes that make it hard to define
292-
what a country is. That's why the Intl component provides a ``Regions`` class
293-
instead of a ``Countries`` class::
294-
295-
use Symfony\Component\Intl\Regions;
293+
use Symfony\Component\Intl\Countries;
296294

297295
\Locale::setDefault('en');
298296

299-
$countries = Regions::getNames();
300-
// ('regionCode' => 'regionName')
297+
$countries = Countries::getNames();
298+
// ('countryCode' => 'countryName')
301299
// => ['AF' => 'Afghanistan', 'AX' => 'Åland Islands', ...]
302300

303-
$country = Regions::getName('GB');
301+
$country = Countries::getName('GB');
304302
// => 'United Kingdom'
305303

306304
All methods accept the translation locale as the last, optional parameter,
307305
which defaults to the current default locale::
308306

309-
$countries = Regions::getNames('de');
307+
$countries = Countries::getNames('de');
310308
// => ['AF' => 'Afghanistan', 'EG' => 'Ägypten', ...]
311309

312-
$country = Regions::getName('GB', 'de');
310+
$country = Countries::getName('GB', 'de');
313311
// => 'Vereinigtes Königreich'
314312

315-
You can also check if a given region code is valid::
313+
You can also check if a given country code is valid::
316314

317-
$isValidRegion = Regions::exists($regionCode);
315+
$isValidCountry = Countries::exists($countryCode);
318316

319317
.. versionadded:: 4.3
320318

321-
The ``Regions`` class was introduced in Symfony 4.3.
319+
The ``Countries`` class was introduced in Symfony 4.3.
322320

323321
Locales
324322
~~~~~~~
@@ -451,3 +449,4 @@ Learn more
451449
.. _install the intl extension: https://php.net/manual/en/intl.setup.php
452450
.. _ICU library: http://site.icu-project.org/
453451
.. _`Unicode ISO 15924 Registry`: https://www.unicode.org/iso15924/iso15924-codes.html
452+
.. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2

0 commit comments

Comments
 (0)