[Rt-commit] rt branch, 4.2/font-path, created. rt-4.2.3-185-geb170e9

[Alex Vandiver]

The branch, 4.2/font-path has been created
        at  eb170e906ef3c7367cbfdf7dda09394b56a664f8 (commit)

- Log -----------------------------------------------------------------
commit eb170e906ef3c7367cbfdf7dda09394b56a664f8
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu May 1 17:26:07 2014 -0400

    Use the configured font path (from layout), rather than hardcoding it
    
    RT already allows configuring an explicit font path; respect it.
    
    Fixes I#29794.

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index f9b24be..9f92b64 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -1169,10 +1169,10 @@ RT comes with two TrueType fonts covering most available languages.
 
 Set(
     %ChartFont,
-    'zh-cn'  => "$RT::BasePath/share/fonts/DroidSansFallback.ttf",
-    'zh-tw'  => "$RT::BasePath/share/fonts/DroidSansFallback.ttf",
-    'ja'     => "$RT::BasePath/share/fonts/DroidSansFallback.ttf",
-    'others' => "$RT::BasePath/share/fonts/DroidSans.ttf",
+    'zh-cn'  => "$RT::FontPath/DroidSansFallback.ttf",
+    'zh-tw'  => "$RT::FontPath/DroidSansFallback.ttf",
+    'ja'     => "$RT::FontPath/DroidSansFallback.ttf",
+    'others' => "$RT::FontPath/DroidSans.ttf",
 );
 
 =item C<$ChartsTimezonesInDB>
diff --git a/lib/RT.pm b/lib/RT.pm
index e45f8b9..1a69b6b 100644
--- a/lib/RT.pm
+++ b/lib/RT.pm
@@ -64,6 +64,7 @@ use vars qw($BasePath
  $BinPath
  $SbinPath
  $VarPath
+ $FontPath
  $LexiconPath
  $StaticPath
  $PluginPath
@@ -791,7 +792,7 @@ sub CanonicalizeGeneratedPaths {
 
         for my $path (
                     qw/EtcPath BinPath SbinPath VarPath LocalPath StaticPath LocalEtcPath
-                    LocalLibPath LexiconPath LocalLexiconPath PluginPath
+                    LocalLibPath LexiconPath LocalLexiconPath PluginPath FontPath
                     LocalPluginPath LocalStaticPath MasonComponentRoot MasonLocalComponentRoot
                     MasonDataDir MasonSessionDir/
                      )
diff --git a/lib/RT/Generated.pm.in b/lib/RT/Generated.pm.in
index d1b09fe..288c64a 100644
--- a/lib/RT/Generated.pm.in
+++ b/lib/RT/Generated.pm.in
@@ -60,6 +60,7 @@ $EtcPath = '@RT_ETC_PATH@';
 $BinPath = '@RT_BIN_PATH@';
 $SbinPath = '@RT_SBIN_PATH@';
 $VarPath = '@RT_VAR_PATH@';
+$FontPath = '@RT_FONT_PATH@';
 $LexiconPath = '@RT_LEXICON_PATH@';
 $StaticPath = '@RT_STATIC_PATH@';
 $PluginPath = '@RT_PLUGIN_PATH@';

-----------------------------------------------------------------------