Merge pull request #172 from andrewnicols/allLocales

Generate all UTF-8 locales

Author: stronk7

root/tmp/setup/php-extensions.sh

@@ -34,10 +34,9 @@ apt-get install -y --no-install-recommends apt-transport-https \
     $PACKAGES_MEMCACHED \
     $PACKAGES_LDAP
 
-# Generate the locales configuration fo rboth Australia, and the US.
+# Generate the locales configuration for all possible UTF-8 locales.
 echo 'Generating locales..'
-echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen
-echo 'en_AU.UTF-8 UTF-8' >> /etc/locale.gen
+grep UTF-8 /usr/share/i18n/SUPPORTED > /etc/locale.gen
 locale-gen
 
 echo "Installing php extensions"

tests/fixtures/test.php

@@ -30,10 +30,16 @@
     }
 }
 
-$locale = 'en_AU.UTF-8';
-if (setlocale(LC_TIME, $locale) === false) {
-    $missing[] = $locale;
+$locales = [
+    'en_AU.UTF-8',
+    'es_ES.UTF-8',
+];
+foreach ($locales as $locale) {
+    if (setlocale(LC_TIME, $locale) === false) {
+        $missing[] = $locale;
+    }
 }
+setlocale(LC_TIME, 'en_AU.UTF-8');
 
 if (php_sapi_name() === 'cli') {
     if (empty($missing)) {