@@ -98,7 +98,7 @@ class Gettext end def scan_normal(text, line, filename, clean_filename) - text.gsub(/__\(("|')([^"]+)\1#{@domain}\)/) do + text.gsub(/__\(("|')([^\1]+)\1#{@domain}\)/) do if @translations[$2].nil? @translations[$2] = { :places => [clean_filename + ":" + line.to_s], :filter => false, @@ -110,7 +110,7 @@ class Gettext end def scan_filter(text, line, filename, clean_filename) - text.gsub(/_f\(("|')([^"]+)\1, .*?#{@domain}\)/) do + text.gsub(/_f\(("|')([^\1]+)\1, .*?#{@domain}\)/) do if @translations[$2].nil? @translations[$2] = { :places => [clean_filename + ":" + line.to_s], :filter => true, @@ -122,7 +122,7 @@ class Gettext end def scan_plural(text, line, filename, clean_filename) - text.gsub(/_p\(("|')([^"]+)\1, ("|')([^"]+)\3, .*?#{@domain}\)/) do + text.gsub(/_p\(("|')([^\1]+)\1, ("|')([^\3]+)\3, .*?#{@domain}\)/) do if @translations[$2].nil? @translations[$2] = { :places => [clean_filename + ":" + line.to_s], :filter => true, @@ -134,7 +134,7 @@ class Gettext end def scan_twig(text, line, filename, clean_filename) - text.gsub(/("|')([^"]+)\1 ?\| ?translate(?!_plural)#{@twig_domain}(?! ?\| ?format)/) do + text.gsub(/("|')([^\1]+)\1 ?\| ?translate(?!_plural)#{@twig_domain}(?! ?\| ?format)/) do if @translations[$2].nil? @translations[$2] = { :places => [clean_filename + ":" + line.to_s], :filter => false, @@ -146,7 +146,7 @@ class Gettext end def scan_twig_filter(text, line, filename, clean_filename) - text.gsub(/("|')([^"]+)\1 ?\| ?translate(?!_plural)#{@twig_domain} ?\| ?format\(.*?\).*?/) do + text.gsub(/("|')([^\1]+)\1 ?\| ?translate(?!_plural)#{@twig_domain} ?\| ?format\(.*?\).*?/) do if @translations[$2].nil? @translations[$2] = { :places => [clean_filename + ":" + line.to_s], :filter => true, @@ -158,7 +158,7 @@ class Gettext end def scan_twig_plural(text, line, filename, clean_filename) - text.gsub(/("|')([^"]+)\1 ?\| ?translate_plural\(("|')([^"]+)\3, .*?#{@domain}\) ?\| ?format\(.*?\)/) do + text.gsub(/("|')([^\1]+)\1 ?\| ?translate_plural\(("|')([^\3]+)\3, .*?#{@domain}\) ?\| ?format\(.*?\)/) do if @translations[$2].nil? @translations[$2] = { :places => [clean_filename + ":" + line.to_s], :filter => true, gettext.rb @@ -193,6 +193,14 @@ return $query; } + /** + * Function: tablefy + * Automatically prepends tables and table prefixes to a field if it doesn't already have them. + * + * Parameters: + * $field - The field to "tablefy". + * $tables - An array of tables. The first one will be used for prepending. + */ public static function tablefy(&$field, $tables) { if (!preg_match_all("/(\(|^)?([a-z_\.]+)/", $field, $matches)) return; @@ -207,7 +215,7 @@ # Does it not already have a table specified? if (!substr_count($full, ".")) { # Don't replace things that are already either prefixed or paramized. - $field = preg_replace("/([^\.:'_]|^)".preg_quote($full, "/")."/", + $field = preg_replace("/([^\.:'\"_]|^)".preg_quote($full, "/")."/", "\\1".$paren."__".$tables[0].".".$name, $field, 1); @@ -215,7 +223,7 @@ # Okay, it does, but is the table prefixed? if (substr($full, 0, 2) != "__") { # Don't replace things that are already either prefixed or paramized. - $field = preg_replace("/([^\.:'_]|^)".preg_quote($full, "/")."/", + $field = preg_replace("/([^\.:'\"_]|^)".preg_quote($full, "/")."/", "\\1".$paren."__".$name, $field, 1); includes/class/QueryBuilder.php 5650e9ed3092294fb418d7a0c2e1e706e8510a43 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/c252c563f30d461d23c3172e68cab4db2de1921e c252c563f30d461d23c3172e68cab4db2de1921e 2008-07-23T17:46:41-07:00 2008-07-23T17:46:41-07:00 * Improved QueryBuilder::tablefy * Improved gettext scanner 941bd081477c4438f03df798bfc4897fc90e2f93 Alex Suraci i.am@toogeneric.com