Fixed issue #6846: Graph statistics in Arabic are bad

LimeSurvey · Nov 9, 2012 · ffe5f8a · ffe5f8a
1 parent f8190bb
commit ffe5f8a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/application/controllers/Statistics_userController.php b/application/controllers/Statistics_userController.php
@@ -148,22 +148,6 @@ function actionAction($surveyid,$language)
             $language = Survey::model()->findByPk($iSurveyID)->language;
 
 
-
-		$chartfontfile = Yii::app()->getConfig("chartfontfile");
-		//pick the best font file if font setting is 'auto'
-		if ($chartfontfile=='auto')
-		{
-		    $chartfontfile='vera.ttf';
-		    if ( $language=='ar')
-		    {
-		        $chartfontfile='KacstOffice.ttf';
-		    }
-		    elseif  ($language=='fa' )
-		    {
-		        $chartfontfile='KacstFarsi.ttf';
-		    }
-		}
-
 		//set survey language for translations
 		$clang = SetSurveyLanguage($iSurveyID, $language);
 

diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -39,8 +39,7 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
     $scriptname = Yii::app()->getConfig("scriptname");
     $chartfontfile = Yii::app()->getConfig("chartfontfile");
     $chartfontsize = Yii::app()->getConfig("chartfontsize");
-    $language = Survey::model()->findByPk($iSurveyID)->language;
-    $statlang = $oLanguage;
+    $language = $oLanguage->langcode;
     $cachefilename = "";
 
     /* Set the fonts for the chart */
@@ -163,7 +162,7 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
             $i = 0;
             while (isset ($gdata[$i]))
             {
-                if ($gdata[$i] == 0 || ($type == "O" && substr($lbl[$i],0,strlen($statlang->gT("Comments")))==$statlang->gT("Comments")))
+                if ($gdata[$i] == 0 || ($type == "O" && substr($lbl[$i],0,strlen($oLanguage->gT("Comments")))==$oLanguage->gT("Comments")))
                 {
                     array_splice ($gdata, $i, 1);
                     array_splice ($lbl, $i, 1);
@@ -176,7 +175,7 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
             if ($language=='ar')
             {
                 $lblout=$lbl; //reset text order to original
-                Yii::import('application.libraries.admin.Arabic', true);
+                Yii::import('application.libraries.Arabic', true);
                 $Arabic = new Arabic('ArGlyphs');
                 foreach($lblout as $kkey => $kval){
                     if (preg_match("^[A-Za-z]^", $kval)) { //auto detect if english

diff --git a/application/libraries/Arabic.php b/application/libraries/Arabic.php
@@ -123,7 +123,7 @@ class Arabic
      */
     public function __construct($library)
     {
-        if($library[0]) $this->load($library[0]);
+        $this->load($library);
     }
 
     public function load($library)