@@ -1,17 +1,22 @@ <?php - require '../../h2o.php'; $template = new H2o('trans.html', array( 'cache'=> false, 'i18n' => array( 'locale' => isset($_GET['lang']) ? $_GET['lang'] : false, + 'charset' => 'UTF-8', 'gettext_path' => '../bin/gettext/bin/', 'extract_message' => true, 'compile_message' => true, ) )); +# Setup custom gettext resolver + + +$time_start = microtime(true); + echo $template->render(array( 'users' => array( array( @@ -36,5 +41,6 @@ echo $template->render(array( ) ) )); +echo "in ".(microtime(true) - $time_start)." seconds\n<br/>"; ?> \ No newline at end of file example/i18n/index.php @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: template translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-25 13:38+1100\n" -"PO-Revision-Date: 2008-11-13 02:44+1000\n" -"Last-Translator: Taylor Luk\n" +"POT-Creation-Date: 2009-02-17 16:25+1100\n" +"PO-Revision-Date: 2009-02-17 16:18+1000\n" +"Last-Translator: Taylor luk <subjective@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,24 +29,18 @@ msgid "Finish" msgstr "Fertig stellen" msgid "" -" \n" " (software engineering) The act or process of making a product suitable " "for \n" " international markets, typically by making text messages easily " "translatable \n" " and ensuring support of non-Latin character sets.\n" -" \n" -"\t" msgstr "" -" \n" " (Software Engineering) Die Handlung oder Verfahren zur Herstellung " "eines Produktes geeignet für \n" " internationalen Märkten, die in der Regel durch das Erstellen von Text-" "Nachrichten leicht zu vermitteln \n" " und die Gewährleistung von Unterstützung von nicht-lateinischen " "Zeichensätzen. \n" -" \n" -"\t" msgid "Pluralization support" msgstr "Pluralisierung Unterstützung" example/i18n/locale/de/LC_MESSAGES/messages.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: template translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-25 13:38+1100\n" -"PO-Revision-Date: 2008-11-13 03:01+1000\n" -"Last-Translator: Taylor Luk\n" +"POT-Creation-Date: 2009-02-17 16:25+1100\n" +"PO-Revision-Date: 2009-02-17 16:18+1000\n" +"Last-Translator: Taylor luk <subjective@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,22 +29,16 @@ msgid "Finish" msgstr "Maali" msgid "" -" \n" " (software engineering) The act or process of making a product suitable " "for \n" " international markets, typically by making text messages easily " "translatable \n" " and ensuring support of non-Latin character sets.\n" -" \n" -"\t" msgstr "" -" \n" "(Software Engineering) Lakia tai prosessin tehdä tuote soveltuu \n" " kansainvälisillä markkinoilla, tyypillisesti tekemällä tekstiviestejä " "helposti käännettävissä \n" " ja varmistamaan tuki ei-latinalaisia merkistöjä. \n" -" \n" -"\t" msgid "Pluralization support" msgstr "Pluralization tukea" example/i18n/locale/fi/LC_MESSAGES/messages.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: template translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-25 13:38+1100\n" -"PO-Revision-Date: 2008-11-13 03:07+1000\n" -"Last-Translator: Taylor Luk\n" +"POT-Creation-Date: 2009-02-17 16:25+1100\n" +"PO-Revision-Date: 2009-02-17 16:13+1000\n" +"Last-Translator: Taylor luk <subjective@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,22 +29,18 @@ msgid "Finish" msgstr "Terminer" msgid "" -" \n" " (software engineering) The act or process of making a product suitable " "for \n" " international markets, typically by making text messages easily " "translatable \n" " and ensuring support of non-Latin character sets.\n" -" \n" -"\t" msgstr "" -" \n" -"(génie logiciel) L'acte ou processus de fabrication d'un produit adapté à \n" +" (génie logiciel) L'acte ou processus de fabrication d'un produit adapté " +"à \n" " les marchés internationaux, généralement en faisant des messages texte " "facilement traduisible \n" " et d'assurer le soutien de la non-latino-jeux de caractères. \n" " \n" -"\t" msgid "Pluralization support" msgstr "Pluralisation de soutien" @@ -75,6 +71,10 @@ msgstr[1] "" "\t\t %(name) a %(count) tâches \n" "\t\t" +# C:\workspace\h2o\example\i18n\trans.html:7 +#~ msgid " (software engineering)\n" +#~ msgstr " (software engineering fr)\n" + #~ msgid "Insert title here" #~ msgstr "Insérer le titre ici" example/i18n/locale/fr/LC_MESSAGES/messages.po @@ -1,67 +1,65 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>{% trans "Internationalized templates" %}</title> -</head> -<body> - -<div id="header"> - <h1>{{ _("Internationalized templates") }}</h1> - - {% trans "Select languages" %} - - <a href="?lang=en">{% trans "English" %}</a> | - <a href="?lang=fi">{% trans "Finish"%} </a> | - <a href="?lang=fr">{% trans "French: %}</a> | - <a href="?lang=de">{% trans "German: %}</a> - - <p> - {% blocktrans %} - - (software engineering) The act or process of making a product suitable for - international markets, typically by making text messages easily translatable - and ensuring support of non-Latin character sets. - - {% endblocktrans %} - </p> - -</div> - - -<div id="content"> - <h2>{% trans "Pluralization support" %}</h2> - - {% blocktrans count=users.length %} - there is one {{ count }} item. - {% plural %} - there are number of {{ count }} items. - {% endblocktrans %} - </p> - - <ul> - {% for index, user in users %} - {{ user.username }} - {{ user.tasks.length }} - <li style="color:{% cycle 'grey', 'pink' %}"> - {{ index }} - {% blocktrans count=user.tasks.length, name=user.username|capitalize %} - {{ name }} has {{ count }} task - {% plural %} - {{ name }} has {{ count }} tasks - {% endblocktrans %} - - <ol> - {% for task in user.tasks %} - <li>{{ task }}</li> - {% endfor %} - </ol> - </li> - {% endfor %} - </ul> -</div> - -<div id="footer"> - -</div> -</body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>{% trans "Internationalized templates" %}</title> +</head> +<body> + +<div id="header"> + <h1>{{ _("Internationalized templates") }}</h1> + + {% trans "Select languages" %} + + <a href="?lang=en">{% trans "English" %}</a> | + <a href="?lang=fi">{% trans "Finish"%} </a> | + <a href="?lang=fr">{% trans "French: %}</a> | + <a href="?lang=de">{% trans "German: %}</a> + + <p> +{% blocktrans %} + (software engineering) The act or process of making a product suitable for + international markets, typically by making text messages easily translatable + and ensuring support of non-Latin character sets. +{% endblocktrans %} + </p> + +</div> + + +<div id="content"> + <h2>{% trans "Pluralization support" %}</h2> + <p> + {% blocktrans count=users.length %} + there is one {{ count }} item. + {% plural %} + there are number of {{ count }} items. + {% endblocktrans %} + </p> + + <ul> + {% for index, user in users %} + {{ user.username }} - {{ user.tasks.length }} + <li style="color:{% cycle 'grey', 'pink' %}"> + {{ index }} + {% blocktrans count=user.tasks.length, name=user.username|capitalize %} + {{ name }} has {{ count }} task + {% plural %} + {{ name }} has {{ count }} tasks + {% endblocktrans %} + + <ol> + {% for task in user.tasks %} + <li>{{ task }}</li> + {% endfor %} + </ol> + </li> + {% endfor %} + </ul> +</div> + +<div id="footer"> + +</div> +</body> +</html> example/i18n/trans.html @@ -11,7 +11,8 @@ class Trans_Tag extends H2o_Node { function render($context, $stream) { if ($this->text) { - $stream->write(gettext($this->text)); + $gettext = H2o_I18n::$gettext; + $stream->write(call_user_func($gettext, $this->text)); } } } @@ -38,6 +39,7 @@ class Blocktrans_Tag extends H2o_Node { # Parse singular and plural block $this->singular = $parser->parse('plural', 'endblocktrans'); + if ($parser->token->content === 'plural') { $this->plural = $parser->parse('endblocktrans'); } @@ -74,7 +76,12 @@ class Blocktrans_Tag extends H2o_Node { $this->count = count($this->count); # Get translation - $output = ngettext($this->singular, $this->plural, $this->count); + $ngettext = H2o_I18n::$ngettext; + $gettext = H2o_I18n::$gettext; + if ($this->plural) + $output = call_user_func($ngettext, $this->singular, $this->plural, $this->count); + else + $output = call_user_func($gettext, $this->singular); # Variable in output foreach(array_keys($this->vars) as $var) { @@ -107,11 +114,14 @@ class Blocktrans_Tag extends H2o_Node { class H2o_I18n { var $locale; + var $charset = 'UTF-8'; var $locale_dir; var $tmp_dir; var $extensions = array('html','tpl'); var $gettext_path = ''; var $gettext_setup = false; + static $gettext = 'gettext'; + static $ngettext = 'ngettext'; function __construct($path, $options = array()) { if (is_file($path)) @@ -121,7 +131,6 @@ class H2o_I18n { $this->locale_dir = $this->searchpath .'locale'.DS; $this->options = $options; - if (isset($options['tmp_dir'])) $this->tmp_dir = $options['tmp_dir']; else @@ -129,35 +138,34 @@ class H2o_I18n { if (isset($options['ext'])) $this->extensions = $options['ext']; - - if (isset($options['locale']) && $options['locale']) { + + if (isset($options['charset'])) + $this->charset = $options['charset']; + + if (isset($options['locale']) && $options['locale']) $this->setLocale($options['locale']); - } - if (isset($options['extract_message']) && $options['extract_message']) { + if (isset($options['extract_message']) && $options['extract_message']) $this->extract(); - } - if (isset($options['compile_message']) && $options['compile_message']) { + if (isset($options['compile_message']) && $options['compile_message']) $this->compile(); - } - if (!is_dir($this->locale_dir) && !mkdir($this->locale_dir)) { + if (!is_dir($this->locale_dir) && !mkdir($this->locale_dir)) throw new Exception('locale directory not found and failed to created '.$this->searchpath); - } } function gettext($name, $context) { + $gettext = self::$gettext; if (!is_string($name)) return ; $syntax = '/_\(((?:".*?")|(?:\'.*?\'))\)/'; if (preg_match($syntax, $name, $match)) { $text = stripcslashes(substr($match[1], 1, -1)); - return gettext($text); + return call_user_func($gettext, $text); } } function setupGettext() { - if (isset($this->options['gettext_path'])) $this->gettext_path = $this->options['gettext_path']; @@ -280,13 +288,17 @@ class H2o_I18n { } } - function setLocale($locale) { + function setLocale($locale, $charset = null) { $this->locale = $locale; + if (!$charset) + $charset = $this->charset; + putenv("LC_ALL={$locale}"); setlocale(LC_ALL, $locale); if (!is_dir($this->locale_dir)) throw new Exception('Cannot find Locale message path'); bindtextdomain("messages", $this->locale_dir); + bind_textdomain_codeset('messages', $charset); textdomain("messages"); } ext/i18n.php @@ -126,31 +126,25 @@ class H2o_Context implements ArrayAccess { foreach ($parts as $part) { if (is_array($object) or $object instanceof ArrayAccess) { if (isset($object[$part])) - $object = $object[$part]; - # Support array short cuts - elseif (isset($this->arrayMethods[$part])) { - $size = count($object); - $shortcut = array_combine( - array_flip($this->arrayMethods), - array(0, $size - 1, $size, $size) - ); - - if ($part === 'size' || $part === 'length') - $object = $shortcut[$part]; - else - $object = $object[$shortcut[$part]]; - } + $object =& $object[$part]; + elseif ($part === 'first') + $object =& $object[0]; + elseif ($part === 'last') + $object =& $object[count($object) -1]; + elseif ($part === 'size' or $part === 'length') + return count($object); else return null; } elseif (is_object($object)) { - $classAllowed = in_array(get_class($object), $this->safeClass) || - (isset($object->h2o_safe) && true === $object->h2o_safe) || - (isset($object->h2o_safe) && in_array($part, $object->h2o_safe)); - - if (is_callable(array($object, $part)) && $classAllowed) { - $object = $object->$part(); - } elseif (property_exists($object, $part)) { + if (isset($object->$part)) $object = $object->$part; + elseif (is_callable(array($object, $part))) { + $methodAllowed = in_array(get_class($object), $this->safeClass) || + (isset($object->h2o_safe) && ( + $object->h2o_safe === true || in_array($part, $object->h2o_safe) + ) + ); + $object = $methodAllowed ? $object->$part() : null; } else return null; } h2o/context.php @@ -165,7 +165,7 @@ class H2O_RE { self::$filter_end = '/;/'; self::$seperator = '/,/'; self::$pipe = '/\|/'; - self::$operator = '/\s?(>|<|>=|<=|!=|==|!|and|not|or)\s?/i'; + self::$operator = '/\s?(>|<|>=|<=|!=|==|!|and |not |or )\s?/i'; self::$number = '/\d+(\.\d*)?/'; self::$name = '/[a-zA-Z][a-zA-Z0-9-_]*(?:\.[a-zA-Z_0-9][a-zA-Z0-9_-]*)*/'; h2o/parser.php @@ -63,6 +63,13 @@ class Describe_Argument_Lexer extends SimpleSpec { expects($result)->should_be($expected); } + function should_parse_variable_contains_operators() { + expects($this->parse("org"))->should_be(array(':org')); + expects($this->parse("dand"))->should_be(array(':dand')); + expects($this->parse("xor"))->should_be(array(':xor')); + expects($this->parse("notd"))->should_be(array(':notd')); + } + private function parse($string) { return H2o_Parser::parseArguments($string); } specs/parser_spec.php 34bee1be3d4f166eabe9fd2334e87ff47c42b9c7 speedmax subjective@gmail.com http://github.com/speedmax/h2o-php/commit/dbda6853f6660c0f76f9b02d570b87839cb02618 dbda6853f6660c0f76f9b02d570b87839cb02618 2009-02-16T23:35:59-08:00 2009-02-16T23:35:59-08:00 Improve i18n and chartset handling and performance optimization on context lookup - Optimize variable context lookup in main H2o_Context::getVariable() method, now context lookup is about 10% faster - Adding charset options for i18n support, updated example/i18n - Fixed issue where bind_textdomain_codeset call was missing for php-gettext to return string with properly encoding [#7 state:resolved] - Adding H2o_I18n::$gettext and H2o_I18n::$ngettext overidable static callbacks to allow usage of custom gettext lookup solution, such as pure php gettext implementations (gettext-php, cakephp I18n class) [#6 state:resolved] - Fixed a bug when using customized php-gettext solution where ngettext doesn't work for singular translation in blocktrans tag 18a1eb174bc9057463852e21ec7addb486da6157 speedmax subjective@gmail.com