diff --git a/docs/upgrades/upgrade_4.6.7-4.6.8.sql b/docs/upgrades/upgrade_4.6.7-4.6.8.sql index eb370ac6e..db8cff4ae 100644 --- a/docs/upgrades/upgrade_4.6.7-4.6.8.sql +++ b/docs/upgrades/upgrade_4.6.7-4.6.8.sql @@ -1,4 +1,7 @@ insert into webguiVersion values ('4.6.8','upgrade',unix_timestamp()); +delete from international where internationalId=12 and namespace='Poll'); +INSERT INTO international VALUES (12,'Poll',1,'Total Votes:',1031514049); +INSERT INTO international VALUES (12,'Poll',7,'ΧάΝΆΖ±ΘΛΚύ:',1031514049);' diff --git a/lib/WebGUI/Wobject/Poll.pm b/lib/WebGUI/Wobject/Poll.pm index e16c6d3df..4072ba651 100644 --- a/lib/WebGUI/Wobject/Poll.pm +++ b/lib/WebGUI/Wobject/Poll.pm @@ -216,7 +216,7 @@ sub www_view { $totalResponses = 1; } for ($i=1; $i<=20; $i++) { - if ($_[0]->get('a'.$i) =~ /\w/) { + if ($_[0]->get('a'.$i) =~ /\C/) { $output .= '
'.$_[0]->get('a'.$i).'
'; @data = WebGUI::SQL->quickArray("select count(*), answer from Poll_answer where answer='a$i' and wobjectId=" .$_[0]->get("wobjectId")." group by answer"); @@ -226,7 +226,7 @@ sub www_view { round(100*$data[0]/$totalResponses).'% ('.($data[0]+0).')'; } } - $output .= '
Total Votes: '.$totalResponses.'
'; + $output .= '
'.WebGUI::International::get(12,$namespace).' '.$totalResponses.'
'; } return $_[0]->processMacros($output); }