diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Locale] renamed function

This commit is contained in:
Eriksen Costa 2012-08-05 23:31:21 -03:00
parent 8da99ca67a
commit 025f972973
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/Locale/Resources/data/build-data.php
View File

@ -159,7 +159,7 @@ function download_icu_data($version) {
return $checkoutPath; return $checkoutPath;
} }
function is_42_or_earlier($version) function is_icu_version_42_or_earlier($version)
{ {
return version_compare($version, '4.4', '<'); return version_compare($version, '4.4', '<');
} }
@ -271,7 +271,7 @@ check_dir($source.DIRECTORY_SEPARATOR.'.svn');
$source = realpath($source); $source = realpath($source);
// Currency, language and region data are bundled in the locales directory in ICU <= 4.2 // Currency, language and region data are bundled in the locales directory in ICU <= 4.2
if (!is_42_or_earlier($version)) { if (!is_icu_version_42_or_earlier($version)) {
check_dir($source.DIRECTORY_SEPARATOR.'curr'); check_dir($source.DIRECTORY_SEPARATOR.'curr');
check_dir($source.DIRECTORY_SEPARATOR.'lang'); check_dir($source.DIRECTORY_SEPARATOR.'lang');
check_dir($source.DIRECTORY_SEPARATOR.'region'); check_dir($source.DIRECTORY_SEPARATOR.'region');
@ -298,7 +298,7 @@ clear_directory($currDir);
// Currency data is available at the locales data files in ICU <= 4.2 and the supplementalData file is available at the // Currency data is available at the locales data files in ICU <= 4.2 and the supplementalData file is available at the
// misc directory // misc directory
if (is_42_or_earlier($version)) { if (is_icu_version_42_or_earlier($version)) {
genrb_file($currDir, $source.DIRECTORY_SEPARATOR.'locales', 'en', $icuBinPath); genrb_file($currDir, $source.DIRECTORY_SEPARATOR.'locales', 'en', $icuBinPath);
genrb_file($currDir, $source.DIRECTORY_SEPARATOR.'misc', 'supplementalData', $icuBinPath); genrb_file($currDir, $source.DIRECTORY_SEPARATOR.'misc', 'supplementalData', $icuBinPath);
} else { } else {
@ -319,7 +319,7 @@ make_directory($langDir);
clear_directory($langDir); clear_directory($langDir);
// Language data is available at the locales data files in ICU <= 4.2 // Language data is available at the locales data files in ICU <= 4.2
if (is_42_or_earlier($version)) { if (is_icu_version_42_or_earlier($version)) {
genrb($source.DIRECTORY_SEPARATOR.'locales', $langDir, $icuBinPath); genrb($source.DIRECTORY_SEPARATOR.'locales', $langDir, $icuBinPath);
} else { } else {
genrb($source.DIRECTORY_SEPARATOR.'lang', $langDir, $icuBinPath); genrb($source.DIRECTORY_SEPARATOR.'lang', $langDir, $icuBinPath);
@ -333,7 +333,7 @@ make_directory($regionDir);
clear_directory($regionDir); clear_directory($regionDir);
// Region data is available at the locales data files in ICU <= 4.2 // Region data is available at the locales data files in ICU <= 4.2
if (is_42_or_earlier($version)) { if (is_icu_version_42_or_earlier($version)) {
genrb($source.DIRECTORY_SEPARATOR.'locales', $regionDir, $icuBinPath); genrb($source.DIRECTORY_SEPARATOR.'locales', $regionDir, $icuBinPath);
} else { } else {
genrb($source.DIRECTORY_SEPARATOR.'region', $regionDir, $icuBinPath); genrb($source.DIRECTORY_SEPARATOR.'region', $regionDir, $icuBinPath);
@ -518,7 +518,7 @@ foreach ($translatedLocales as $translatedLocale) {
// Even if the source and generated file are UTF-8 encoded, for some reason the data seems not correctly encoded, leading to // Even if the source and generated file are UTF-8 encoded, for some reason the data seems not correctly encoded, leading to
// a parse error in genrb (Stopped parsing resource with U_ILLEGAL_CHAR_FOUND). So we call the genrb passing that the source // a parse error in genrb (Stopped parsing resource with U_ILLEGAL_CHAR_FOUND). So we call the genrb passing that the source
// files are UTF-8 encoded. // files are UTF-8 encoded.
if (is_42_or_earlier($version)) { if (is_icu_version_42_or_earlier($version)) {
genrb($namesGeneratedDir, $namesDir, $icuBinPath, '-e UTF-8'); genrb($namesGeneratedDir, $namesDir, $icuBinPath, '-e UTF-8');
} else { } else {
genrb($namesGeneratedDir, $namesDir, $icuBinPath); genrb($namesGeneratedDir, $namesDir, $icuBinPath);