Merge pull request #40 from php-gettext/check-usascii-exports

Check US-ASCII exports

Author: mlocati

src/Language.php

@@ -389,26 +389,23 @@ private static function asciifier(&$value)
     {
         if (is_string($value) && $value !== '') {
             // Avoid converting from 'Ÿ' to '"Y', let's prefer 'Y'
-            $transliterated = strtr($value, array(
-                'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A',
+            $value = strtr($value, array(
+                'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A',
                 'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E',
                 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I',
                 'Ñ' => 'N',
                 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O',
                 'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U',
                 'Ÿ' => 'Y', 'Ý' => 'Y',
-                'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a',
+                'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'a',
                 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
                 'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i',
                 'ñ' => 'n', 'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o',
                 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u',
                 'ý' => 'y', 'ÿ' => 'y',
+                '…' => '...',
+                'ʼ' => "'", '’' => "'",
             ));
-            $transliterated = @iconv('UTF-8', 'US-ASCII//IGNORE//TRANSLIT', $transliterated);
-            if ($transliterated === false || $transliterated === '') {
-                throw new Exception("Unable to transliterate '{$value}'");
-            }
-            $value = $transliterated;
         }
     }
 }

tests/test/USAsciiTest.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Gettext\Languages\Test;
+
+use Gettext\Languages\Exporter\Php;
+use Gettext\Languages\Language;
+
+class USAsciiTest extends TestCase
+{
+    public function testExportUSAscii()
+    {
+        $array = $this->getExportedPhpArray();
+        foreach ($array as $localeID => $localeData) {
+            $this->assertUSAscii($localeID, $localeData);
+        }
+    }
+
+    /**
+     * @param string $key
+     */
+    private function assertUSAscii($key, $value)
+    {
+        switch (gettype($value)) {
+            case 'string':
+                $this->assertSame(1, preg_match('/^[\x20-\x7F\n]*$/s', $value), "The string at {$key} does not contain only US-ASCII characters: {$value}");
+                break;
+            case 'array':
+                foreach ($value as $valueKey => $valueValue) {
+                    $this->assertUSAscii("{$key}.{$valueKey}", $valueValue);
+                }
+                break;
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function getExportedPhpArray()
+    {
+        $phpCode = Php::toString(Language::getAll(), array('us-ascii' => true));
+
+        return eval(preg_replace('/^<\?php\n/', '', $phpCode));
+    }
+}