http://pear.php.net/bugs/search.php?cmd=display&package_name%5B0%5D=File_Gettext Search Results en-us pear-webmaster@lists.php.net pear-webmaster@lists.php.net hourly 1 2000-01-01T12:00+00:00 http://pear.php.net/gifs/pearsmall.gif http://pear.php.net/bugs http://pear.php.net/bugs/6411 File_Gettext Feature/Change Request Reported by alan_k 2006-01-04T01:49:42+00:00 PHP: Irrelevant OS: all Package Version: Description: ------------ diff -pur File/Gettext/PO.php File.new/Gettext/PO.php --- File/Gettext/PO.php 2005-12-30 16:36:45.000000000 +0800 +++ File.new/Gettext/PO.php 2005-12-30 16:35:35.000000000 +0800 @@ -64,8 +64,8 @@ class File_Gettext_PO extends File_Gette // match all msgid/msgstr entries $matched = preg_match_all( - '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' . - '(msgstr\s+("([^"]|\\\\")*?"\s*)+)/', + '/msgid\s+((?:".*(?<!\\\\)"\s*)+)\s+' . + 'msgstr\s+((?:".*(?<!\\\\)"\s*)+)/', $contents, $matches ); unset($contents); @@ -76,10 +76,8 @@ class File_Gettext_PO extends File_Gette // get all msgids and msgtrs for ($i = 0; $i < $matched; $i++) { - $msgid = preg_replace( - '/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]); - $msgstr= preg_replace( - '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]); + $msgid = substr(trim($matches[1][$i]), 1, -1); + $msgstr = substr(trim($matches[2][$i]), 1, -1); $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr); } diff -pur File/Gettext.php File.new/Gettext.php --- File/Gettext.php 2005-12-30 16:36:45.000000000 +0800 +++ File.new/Gettext.php 2005-12-30 16:35:41.000000000 +0800 @@ -131,12 +131,12 @@ class File_Gettext function prepare($string, $reverse = false) { if ($reverse) { - $smap = array('"', "\n", "\t", "\r"); - $rmap = array('\\"', '\\n"' . "\n" . '"', '\\t', '\\r'); + $smap = array('\\', '"', "\n", "\t", "\r"); + $rmap = array('\\\\', '\\"', '\\n"' . "\n" . '"', '\\t', '\\r'); return (string) str_replace($smap, $rmap, $string); } else { - $smap = array('/"\s+"/', '/\\\\n/', '/\\\\r/', '/\\\\t/', '/\\\\"/'); - $rmap = array('', "\n", "\r", "\t", '"'); + $smap = array('/"\s+"/', '/\\\\n/', '/\\\\r/', '/\\\\t/', '/\\\\"/', '/\\\\\\\\/'); + $rmap = array('', "\n", "\r", "\t", '"', '\\'); return (string) preg_replace($smap, $rmap, $string); } }]]> File_Gettext Feature/Change Request Reported by alan_k 2006-01-04T01:49:42+00:00 PHP: Irrelevant OS: all Package Version: Description: ------------ diff -pur File/Gettext/PO.php File.new/Gettext/PO.php --- File/Gettext/PO.php 2005-12-30 16:36:45.000000000 +0800 +++ File.new/Gettext/PO.php 2005-12-30 16:35:35.000000000 +0800 @@ -64,8 +64,8 @@ class File_Gettext_PO extends File_Gette // match all msgid/msgstr entries $matched = preg_match_all( - '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' . - '(msgstr\s+("([^"]|\\\\")*?"\s*)+)/', + '/msgid\s+((?:".*(?<!\\\\)"\s*)+)\s+' . + 'msgstr\s+((?:".*(?<!\\\\)"\s*)+)/', $contents, $matches ); unset($contents); @@ -76,10 +76,8 @@ class File_Gettext_PO extends File_Gette // get all msgids and msgtrs for ($i = 0; $i < $matched; $i++) { - $msgid = preg_replace( - '/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]); - $msgstr= preg_replace( - '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]); + $msgid = substr(trim($matches[1][$i]), 1, -1); + $msgstr = substr(trim($matches[2][$i]), 1, -1); $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr); } diff -pur File/Gettext.php File.new/Gettext.php --- File/Gettext.php 2005-12-30 16:36:45.000000000 +0800 +++ File.new/Gettext.php 2005-12-30 16:35:41.000000000 +0800 @@ -131,12 +131,12 @@ class File_Gettext function prepare($string, $reverse = false) { if ($reverse) { - $smap = array('"', "\n", "\t", "\r"); - $rmap = array('\\"', '\\n"' . "\n" . '"', '\\t', '\\r'); + $smap = array('\\', '"', "\n", "\t", "\r"); + $rmap = array('\\\\', '\\"', '\\n"' . "\n" . '"', '\\t', '\\r'); return (string) str_replace($smap, $rmap, $string); } else { - $smap = array('/"\s+"/', '/\\\\n/', '/\\\\r/', '/\\\\t/', '/\\\\"/'); - $rmap = array('', "\n", "\r", "\t", '"'); + $smap = array('/"\s+"/', '/\\\\n/', '/\\\\r/', '/\\\\t/', '/\\\\"/', '/\\\\\\\\/'); + $rmap = array('', "\n", "\r", "\t", '"', '\\'); return (string) preg_replace($smap, $rmap, $string); } }]]> 2008-04-06T08:41:24+00:00 alan &#x61;&#116; akbkhome &#x64;&#111;&#x74; com File_Gettext Feature/Change Request