Fixed issue: Some fonts for Asian languages not properly loaded for P…

…DF output
LimeSurvey · Dec 14, 2018 · 01c7555 · 01c7555 · Shnoulle · Dec 14, 2018
1 parent cd01fa9
commit 01c7555
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 126 deletions.
diff --git a/application/helpers/userstatistics_helper.php b/application/helpers/userstatistics_helper.php
@@ -51,7 +51,7 @@ function createChart($iQuestionID, $iSurveyID, $type = null, $lbl, $gdata, $graw
         $chartfontfile = 'DejaVuSans.ttf';
         if (array_key_exists($sLanguageCode, $alternatechartfontfile)) {
             $neededfontfile = $alternatechartfontfile[$sLanguageCode];
-            if (is_file($rootdir."/fonts/".$neededfontfile)) {
+            if (is_file($rootdir."/assets/fonts/".$neededfontfile)) {
                 $chartfontfile = $neededfontfile;
             } else {
                 Yii::app()->setFlashMessage(sprintf(gT('The fonts file %s was not found in <limesurvey root folder>/fonts directory. Please, see the txt file for your language in fonts directory to generate the charts.'), $neededfontfile), 'error');

diff --git a/assets/fonts/font-src/FreeSans - CREDITS → assets/fonts/FreeSans - CREDITS b/assets/fonts/font-src/FreeSans - CREDITS → assets/fonts/FreeSans - CREDITS
diff --git a/assets/fonts/font-src/FreeSans.ttf → assets/fonts/FreeSans.ttf b/assets/fonts/font-src/FreeSans.ttf → assets/fonts/FreeSans.ttf
diff --git a/.../fonts/font-src/TlwgTypist - Thai.ttf.txt → assets/fonts/TlwgTypist - Thai.ttf.txt b/.../fonts/font-src/TlwgTypist - Thai.ttf.txt → assets/fonts/TlwgTypist - Thai.ttf.txt
@@ -2,4 +2,4 @@ For package size reasons the TlwgTypist font to show Thai characters in the stat
 is not included with LimeSurvey.
 
 Please download it from http://linux.thai.net/projects/fonts-tlwg , 
-unzip and put the TlwgTypist.tff file into the /fonts directory of your LimeSurvey installation.
+unzip and put the TlwgTypist.tff file into the /assets/fonts/ directory of your LimeSurvey installation.
diff --git a/.../fonts/font-src/UnBatang - Korean.ttf.txt → assets/fonts/UnBatang - Korean.ttf.txt b/.../fonts/font-src/UnBatang - Korean.ttf.txt → assets/fonts/UnBatang - Korean.ttf.txt
@@ -2,4 +2,4 @@ For package size reasons the UnBatang font to show Chinese characters in the sta
 is not included with LimeSurvey.
 
 Please download it from http://kldp.net/projects/unfonts/ , 
-unzip and put the UnBatang.tff file into the /fonts directory of your LimeSurvey installation.
+unzip and put the UnBatang.tff file into the /assets/fonts directory of your LimeSurvey installation.
diff --git a/assets/fonts/fireflysung - Chinese.ttf.txt b/assets/fonts/fireflysung - Chinese.ttf.txt
@@ -0,0 +1,6 @@
+For package size reasons the Firefly Sung font to show Chinese characters in the statistics graphs 
+is not included with LimeSurvey.
+
+Please download it http://www.study-area.org/apt/firefly-font/fireflysung-1.3.0.tar.gz , 
+unzip and put the fireflysung.tff file into the /assets/fonts directory of your LimeSurvey installation.
+
diff --git a/assets/fonts/font-src/DejaVuSans - CREDITS b/assets/fonts/font-src/DejaVuSans - CREDITS
diff --git a/assets/fonts/font-src/DejaVuSans.ttf b/assets/fonts/font-src/DejaVuSans.ttf
diff --git a/assets/fonts/font-src/fireflysung - Chinese.ttf.txt b/assets/fonts/font-src/fireflysung - Chinese.ttf.txt
diff --git a/...-src/migmix-1p-regular - Japanese.ttf.txt → ...onts/migmix-1p-regular - Japanese.ttf.txt b/...-src/migmix-1p-regular - Japanese.ttf.txt → ...onts/migmix-1p-regular - Japanese.ttf.txt
@@ -2,4 +2,4 @@ For package size reasons the migmix-1p-regular.ttf font to show Japanese charact
 is not included with LimeSurvey.
 
 Please download it from http://mix-mplus-ipa.sourceforge.jp/migmix/ , 
-unzip and put the migmix-1p-regular.ttf file into the /fonts directory of your LimeSurvey installation.
+unzip and put the migmix-1p-regular.ttf file into the /assets/fonts directory of your LimeSurvey installation.