diff options
| author | Stefan Giehl <stefan@piwik.org> | 2017-09-13 00:20:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 00:20:38 +0300 |
| commit | 3cb7169cef259efe922912364c3c8479a986619c (patch) | |
| tree | d8d7c6c566a2f0c0288036ed61e0fd4272b615f6 /core/Intl | |
| parent | 571d96e9005518e408e2ad92ef5f2b6123b5632e (diff) | |
Show Tibet as part of China on map (#11930)
* Revert "free tibet!"
This reverts commit 4e47c8aba3bf146292f6e9d38aa0151c383e6c33.
* Remove unneeded translations
* adjust API
* fix tests
* update screenshots
* update tests files
* update screenshot
* Do not change detected location
* update tests
* Fix continent detection for old records
* submodule update
* update screenshots
* Cleanup
* use group by filters only if needed
* make filter work for datatable maps
Diffstat (limited to 'core/Intl')
| -rw-r--r-- | core/Intl/Data/Resources/countries.php | 1 | ||||
| -rw-r--r-- | core/Intl/Data/Resources/languages-to-countries.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/Intl/Data/Resources/countries.php b/core/Intl/Data/Resources/countries.php index 9048509525..e000900296 100644 --- a/core/Intl/Data/Resources/countries.php +++ b/core/Intl/Data/Resources/countries.php @@ -237,7 +237,6 @@ return array( 'tf' => 'ant', 'tg' => 'afr', 'th' => 'asi', - 'ti' => 'asi', // Tibet (no iso 3166 code) 'tj' => 'asi', 'tk' => 'oce', 'tl' => 'asi', diff --git a/core/Intl/Data/Resources/languages-to-countries.php b/core/Intl/Data/Resources/languages-to-countries.php index 91ab0940c5..5e50cd4ea3 100644 --- a/core/Intl/Data/Resources/languages-to-countries.php +++ b/core/Intl/Data/Resources/languages-to-countries.php @@ -54,7 +54,7 @@ return array( 'sr' => 'rs', // Serbian => Serbia 'sv' => 'se', // Swedish => Sweden 'th' => 'th', // Thai => Thailand - 'bo' => 'ti', // Tibetan => Tibet + 'bo' => 'cn', // Tibetan => China 'tr' => 'tr', // Turkish => Turkey 'uk' => 'ua', // Ukrainian => Ukraine ); |