diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-31 04:42:22 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-01-09 00:13:31 +0300 |
| commit | b1aca50678da78016490bfce02f49f073471f946 (patch) | |
| tree | 33193bf9d2802bd816f60572d22c2b15a3ff3995 | |
| parent | 6708a431479b8e1d2d59fd4580afb9f941b99ea1 (diff) | |
Moved some data files into the Intl component
| -rw-r--r-- | core/Intl/Data/Provider/LanguageDataProvider.php | 4 | ||||
| -rw-r--r-- | core/Intl/Data/Provider/RegionDataProvider.php | 4 | ||||
| -rw-r--r-- | core/Intl/Data/Resources/Countries.php (renamed from core/DataFiles/Countries.php) | 0 | ||||
| -rw-r--r-- | core/Intl/Data/Resources/LanguageToCountry.php (renamed from core/DataFiles/LanguageToCountry.php) | 0 | ||||
| -rw-r--r-- | core/Intl/Data/Resources/Languages.php (renamed from core/DataFiles/Languages.php) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/core/Intl/Data/Provider/LanguageDataProvider.php b/core/Intl/Data/Provider/LanguageDataProvider.php index 44fcfab5d0..d4758995b6 100644 --- a/core/Intl/Data/Provider/LanguageDataProvider.php +++ b/core/Intl/Data/Provider/LanguageDataProvider.php @@ -22,7 +22,7 @@ class LanguageDataProvider */ public static function getLanguageList() { - require PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php'; + require __DIR__ . '/../Resources/Languages.php'; return $GLOBALS['Piwik_LanguageList']; } @@ -36,7 +36,7 @@ class LanguageDataProvider */ public static function getLanguageToCountryList() { - require PIWIK_INCLUDE_PATH . '/core/DataFiles/LanguageToCountry.php'; + require __DIR__ . '/../Resources/LanguageToCountry.php'; return $GLOBALS['Piwik_LanguageToCountry']; } diff --git a/core/Intl/Data/Provider/RegionDataProvider.php b/core/Intl/Data/Provider/RegionDataProvider.php index a859ac80ba..3471124ef0 100644 --- a/core/Intl/Data/Provider/RegionDataProvider.php +++ b/core/Intl/Data/Provider/RegionDataProvider.php @@ -21,7 +21,7 @@ class RegionDataProvider */ public function getContinentList() { - require PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php'; + require __DIR__ . '/../Resources/Countries.php'; return $GLOBALS['Piwik_ContinentList']; } @@ -35,7 +35,7 @@ class RegionDataProvider */ public static function getCountryList($includeInternalCodes = false) { - require PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php'; + require __DIR__ . '/../Resources/Countries.php'; $countriesList = $GLOBALS['Piwik_CountryList']; $extras = $GLOBALS['Piwik_CountryList_Extras']; diff --git a/core/DataFiles/Countries.php b/core/Intl/Data/Resources/Countries.php index 4d752d75ae..4d752d75ae 100644 --- a/core/DataFiles/Countries.php +++ b/core/Intl/Data/Resources/Countries.php diff --git a/core/DataFiles/LanguageToCountry.php b/core/Intl/Data/Resources/LanguageToCountry.php index fdfbb97e72..fdfbb97e72 100644 --- a/core/DataFiles/LanguageToCountry.php +++ b/core/Intl/Data/Resources/LanguageToCountry.php diff --git a/core/DataFiles/Languages.php b/core/Intl/Data/Resources/Languages.php index d41b443ff4..d41b443ff4 100644 --- a/core/DataFiles/Languages.php +++ b/core/Intl/Data/Resources/Languages.php |