Changeset 2789

Timestamp:

Oct 22, 2008, 3:34:45 AM (16 years ago)

Author:

rvelices

Message:

• some german language changes
• added option for smarty $conftemplate_compile_check - default true; if false smarty doesn't check if templates need recompilation resulting in less disk accesses (good when the disk is not local)
• load_language doesnt check first for en_uk.utf-8 directory ...

Location:

branches/2.0

Files:

• include/config_default.inc.php (modified) (3 diffs)
• include/functions.inc.php (modified) (3 diffs)
• include/template.class.php (modified) (2 diffs)
• language/de_DE/common.lang.php (modified) (6 diffs)

branches/2.0/include/config_default.inc.php

@@ -412 +412 @@
 
 // +-----------------------------------------------------------------------+
-// |                                debug                                  |
+// |                            debug/performance                          |
 // +-----------------------------------------------------------------------+
 
@@ -430 +430 @@
 // die_on_sql_error: if an SQL query fails, should everything stop?
 $conf['die_on_sql_error'] = true;
+
+// if true, some language strings are replaced during template compilation
+// (insted of template output). this results in better performance. however
+// any change in the language file will not be propagated until you purge
+// the compiled templates from the admin / maintenance menu
+$conf['compiled_template_cache_language'] = false;
+
+// This tells Smarty whether to check for recompiling or not. Recompiling
+// does not need to happen unless a template is changed. false results in
+// better performance.
+$conf['template_compile_check'] = true;
 
 // +-----------------------------------------------------------------------+
@@ -696 +707 @@
 // or other plugin variables etc
 $conf['local_data_dir'] = dirname(dirname(__FILE__)).'/_data';
-
-// if true, some language strings are replaced during template compilation
-// (insted of template output). this results in better performance. however
-// any change in the language file will not be propagated until you purge
-// the compiled templates from the admin / maintenance menu
-$conf['compiled_template_cache_language'] = false;
-
 ?>

branches/2.0/include/functions.inc.php

@@ -1028 +1028 @@
   if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
   {
-    trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_NOTICE);
+    trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_WARNING);
   }
 
@@ -1347 +1347 @@
 function get_pwg_charset()
 {
-  defined('PWG_CHARSET') or fatal_error('load_language PWG_CHARSET undefined');
+  defined('PWG_CHARSET') or fatal_error('PWG_CHARSET undefined');
   return PWG_CHARSET;
 }
@@ -1418 +1418 @@
     $dir = $dirname.$language;
 
-    // exact charset match - no conversion required
-    $f = $dir.'.'.$target_charset.'/'.$filename;
-    if (file_exists($f))
-    {
-      $source_file = $f;
-      break;
+    if ($target_charset!='utf-8')
+    {
+      // exact charset match - no conversion required
+      $f = $dir.'.'.$target_charset.'/'.$filename;
+      if (file_exists($f))
+      {
+        $source_file = $f;
+        break;
+      }
     }
 

branches/2.0/include/template.class.php

@@ -56 +56 @@
     $this->smarty = new Smarty;
     $this->smarty->debugging = $conf['debug_template'];
+    $this->smarty->compile_check=$conf['template_compile_check'];
 
     $compile_dir = $conf['local_data_dir'].'/templates_c';
@@ -206 +207 @@
     return true;
   }
-  
+
   /** return template extension if exists  */
   function get_extent($filename='', $handle='')

branches/2.0/language/de_DE/common.lang.php

@@ -141 +141 @@
 $lang['became available on %s'] = 'zur Verfügung gestellt am %s';
 $lang['best_rated_cat'] = 'Am besten bewertet';
-$lang['best_rated_cat_hint'] = 'zeigt am besten bewerteten Artikel';
+$lang['best_rated_cat_hint'] = 'zeigt am besten bewertete Bilder';
 $lang['caddie'] = 'Warenkorb';
 $lang['calendar'] = 'Kalender';
@@ -196 +196 @@
 $lang['hint_customize'] = 'das Aussehen der Galerie';
 $lang['hint_search'] = 'Suche';
-$lang['home'] = 'Heim';
+$lang['home'] = 'Startseite';
 $lang['identification'] = 'Identifizierung';
 $lang['images_available_cpl'] = 'in dieser Kategorie';
@@ -229 +229 @@
 $lang['month'][8] = 'August';
 $lang['month'][9] = 'September';
-$lang['most_visited_cat'] = 'mehr gesehen';
+$lang['most_visited_cat'] = 'Am häufigsten gesehen';
 $lang['most_visited_cat_hint'] = 'zeigt am meisten besuchten Bilder';
 $lang['nb_image_line_error'] = 'Die Anzahl der Bilder pro Zeile muss ein nicht null skalare';
@@ -239 +239 @@
 $lang['new_rate'] = 'Stimmen Sie für dieses Bild';
 $lang['next_page'] = 'Vorwärts';
-$lang['no_category'] = 'Heim';
+$lang['no_category'] = 'Startseite';
 $lang['no_rate'] = 'keine Note';
 $lang['note_filter_day'] = 'Die Gesamtheit der Elemente wird gefiltert um nur die jüngsten weniger als %d Tag.';
@@ -251 +251 @@
 $lang['preferences'] = 'Einstellungen';
 $lang['previous_page'] = 'Zurück';
-$lang['random_cat'] = 'Zufalls-Bilder';
+$lang['random_cat'] = 'Zufallsbilder';
 $lang['random_cat_hint'] = 'Anzeigen eines zufälligen Bilder';
-$lang['recent_cats_cat'] = 'Kategorien jüngsten';
+$lang['recent_cats_cat'] = 'Neue Kategorien';
 $lang['recent_cats_cat_hint'] = 'Kategorien anzuzeigen, die kürzlich aktualisiert oder erstellt';
 $lang['recent_period'] = 'Vor kurzem';
@@ -290 +290 @@
 $lang['slideshow'] = 'Diashow';
 $lang['slideshow_stop'] = 'Stop die Diashow';
-$lang['special_categories'] = 'Sonderangebot';
+$lang['special_categories'] = 'Besonderes';
 $lang['sql_queries_in'] = 'SQL-Abfragen in';
 $lang['start_filter_hint'] = 'zeigt erst vor kurzem gebucht Bilder';