From 8f270a7a7cc81e668c7818b1ac86d0b8b5c25e7b Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 16 Dec 2009 06:07:48 +0000 Subject: [PATCH] ENHANCEMENT: added translatable support to mathspamprotection. PATCH via noini (#4755) (from r95194) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95657 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/sitefeatures/MathSpamProtection.php | 40 ++++++++++++++++++------ 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/code/sitefeatures/MathSpamProtection.php b/code/sitefeatures/MathSpamProtection.php index 29567d52..4b770610 100644 --- a/code/sitefeatures/MathSpamProtection.php +++ b/code/sitefeatures/MathSpamProtection.php @@ -25,7 +25,12 @@ class MathSpamProtection { $v1 = Session::get("mathQuestionV1"); $v2 = Session::get("mathQuestionV2"); } - return "What is ".MathSpamProtection::digitToWord($v1)." plus ".MathSpamProtection::digitToWord($v2)."?"; + + return sprintf( + _t('MathSpamProtection.WHATIS',"What is %s plus %s?"), + MathSpamProtection::digitToWord($v1), + MathSpamProtection::digitToWord($v2) + ); } /** @@ -49,13 +54,29 @@ class MathSpamProtection { * Helper method for converting digits to their equivelant english words */ static function digitToWord($num){ - $numbers = array("zero","one","two","three","four","five","six","seven","eight","nine", - "ten","eleven","twelve","thirteen","fourteen","fifteen","sixteen","seventeen","eighteen"); - if($num < 0){ - return "minus ".($numbers[-1*$num]); - } - //TODO: add checking or return null for bad value?? - return $numbers[$num]; + $numbers = array(_t('MathSpamProtection.ZERO', 'zero'), + _t('MathSpamProtection.ONE', 'one'), + _t('MathSpamProtection.TWO', 'two'), + _t('MathSpamProtection.THREE', 'three'), + _t('MathSpamProtection.FOUR', 'four'), + _t('MathSpamProtection.FIVE', 'five'), + _t('MathSpamProtection.SIX', 'six'), + _t('MathSpamProtection.SEVEN', 'seven'), + _t('MathSpamProtection.EIGHT', 'eight'), + _t('MathSpamProtection.NINE', 'nine'), + _t('MathSpamProtection.TEN', 'ten'), + _t('MathSpamProtection.ELEVEN', 'eleven'), + _t('MathSpamProtection.TWELVE', 'twelve'), + _t('MathSpamProtection.THIRTEEN', 'thirteen'), + _t('MathSpamProtection.FOURTEEN', 'fourteen'), + _t('MathSpamProtection.FIFTEEN', 'fifteen'), + _t('MathSpamProtection.SIXTEEN', 'sixteen'), + _t('MathSpamProtection.SEVENTEEN', 'seventeen'), + _t('MathSpamProtection.EIGHTEEN', 'eighteen')); + + if($num < 0) return "minus ".($numbers[-1*$num]); + + return $numbers[$num]; } @@ -67,5 +88,4 @@ class MathSpamProtection { self::$mathProtection = $math; } -} -?> \ No newline at end of file +} \ No newline at end of file