Changeset 5208

Timestamp:

Mar 21, 2010, 12:14:30 AM (14 years ago)

Author:

patdenice

Message:

feature 1522: Move local css local files and local language files to local directory.
Add $conftemplate_force_compile to help developpers.

Location:

trunk

Files:

• about.php (modified) (1 diff)
• include/common.inc.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (3 diffs)
• include/functions_mail.inc.php (modified) (1 diff)
• include/template.class.php (modified) (3 diffs)
• local (added)
• local/config (added)
• local/config/index.php (added)
• local/css (added)
• local/css/index.php (added)
• local/index.php (added)
• local/language (added)
• local/language/index.php (added)
• nbm.php (modified) (1 diff)
• plugins/language_switch/language_switch.inc.php (modified) (1 diff)

trunk/about.php

@@ -40 +40 @@
 
 /**
- * set in ./language/en_UK.iso-8859-1/local.lang.php (maybe to create)
+ * set in ./local/language/en_UK.lang.php (maybe to create)
  * for example for clear theme:
   $lang['Theme: clear'] = 'This is the clear theme based on yoga template. '.

trunk/include/common.inc.php

@@ -137 +137 @@
 }
 trigger_action('loading_lang');
-load_language('local.lang', '', array('no_fallback'=>true) );
+load_language('lang', PHPWG_ROOT_PATH.'local/', array('no_fallback'=>true, 'local'=>true) );
 
 // only now we can set the localized username of the guest user (and not in

trunk/include/config_default.inc.php

@@ -475 +475 @@
 // better performance.
 $conf['template_compile_check'] = true;
+
+// This forces Smarty to (re)compile templates on every invocation. This is
+// handy for development and debugging. It should never be used in a
+// production environment.
+$conf['template_force_compile'] = false;
 
 // this permit to show the php errors reporting (see INI 'error_reporting'

trunk/include/functions.inc.php

@@ -584 +584 @@
     load_language('common.lang');
     trigger_action('loading_lang');
-    load_language('local.lang', '', array('no_fallback'=>true) );
+    load_language('lang', PHPWG_ROOT_PATH.'local/', array('no_fallback'=>true, 'local'=>true) );
     $template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme());
   }
@@ -1169 +1169 @@
  *     target_charset -
  *     no_fallback - the language must be respected
+ *     local - if true, get local language file
  * @return boolean success status or a string if options['return'] is true
  */
@@ -1218 +1219 @@
   foreach ($languages as $language)
   {
-    $f = $dirname.$language.'/'.$filename;
+    $f = @$options['local'] ?
+      $dirname.$language.'.'.$filename:
+      $dirname.$language.'/'.$filename;
+
     if (file_exists($f))
     {

trunk/include/functions_mail.inc.php

@@ -256 +256 @@
     load_language('admin.lang', '', array('language'=>$language) );
     trigger_action('loading_lang');
-    load_language('local.lang', '', array('language'=>$language, 'no_fallback'=>true));
+    load_language('lang', PHPWG_ROOT_PATH.'local/',
+      array('language'=>$language, 'no_fallback'=>true, 'local'=>true)
+    );
 
     $switch_lang['language'][$language]['lang_info'] = $lang_info;

trunk/include/template.class.php

@@ -50 +50 @@
     $this->smarty = new Smarty;
     $this->smarty->debugging = $conf['debug_template'];
-    $this->smarty->compile_check=$conf['template_compile_check'];
+    $this->smarty->compile_check = $conf['template_compile_check'];
+    $this->smarty->force_compile = $conf['template_force_compile'];
 
     $compile_dir = $conf['local_data_dir'].'/templates_c';
@@ -71 +72 @@
     $this->smarty->template_dir = array();
     if ( !empty($theme) )
+    {
       $this->set_theme($root, $theme, $path);
+      $this->set_prefilter( 'header', array('Template', 'prefilter_local_css') );
+    }
     else
       $this->set_template_dir($root);
@@ -546 +550 @@
     return $source;
   }
+
+  static function prefilter_local_css($source, &$smarty)
+  {
+    $css = array();
+
+    foreach ($smarty->get_template_vars('themes') as $theme)
+    {
+      if (file_exists(PHPWG_ROOT_PATH.'local/css/'.$theme['id'].'-rules.css'))
+      {
+        array_push($css, '<link rel="stylesheet" type="text/css" href="{$ROOT_URL}local/css/'.$theme['id'].'-rules.css">');
+      }
+    }
+    if (file_exists(PHPWG_ROOT_PATH.'local/css/rules.css'))
+    {
+      array_push($css, '<link rel="stylesheet" type="text/css" href="{$ROOT_URL}local/css/rules.css">');
+    }
+
+    if (!empty($css))
+    {
+      $source = str_replace("\n</head>", "\n".implode( "\n", $css )."\n</head>", $source);
+    }
+
+    return $source;
+  }
 }
 

trunk/nbm.php

@@ -35 +35 @@
 // Need to update a second time
 trigger_action('loading_lang');
-load_language('local.lang', '', array('no_fallback'=>true) );
+load_language('lang', PHPWG_ROOT_PATH.'local/', array('no_fallback'=>true, 'local'=>true) );
 
 

trunk/plugins/language_switch/language_switch.inc.php

@@ -50 +50 @@
     if ( $same !== $user['language']) {
       load_language('common.lang', '', array('language'=>$user['language']) );
-      load_language('local.lang', '', array('language'=>$user['language'], 'no_fallback'=>true) );
+      load_language('lang', PHPWG_ROOT_PATH.'local/',
+        array('language'=>$user['language'], 'no_fallback'=>true, 'local'=>true)
+      );
       if (defined('IN_ADMIN') and IN_ADMIN) { // Never currently
         load_language('admin.lang', '', array('language'=>$user['language']) );