merge r2789 from branch 2.0:

- some german language changes
- added option for smarty $conf['template_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 ...

git-svn-id: http://piwigo.org/svn/trunk@2790 68402e56-0260-453c-a942-63ccdbb3a9ee

include/config_default.inc.php

@@ -411,7 +411,7 @@ $conf['remember_me_length'] = 5184000;
 $conf['session_length'] = 3600;
 
 // +-----------------------------------------------------------------------+
-// |                                debug                                  |
+// |                            debug/performance                          |
 // +-----------------------------------------------------------------------+
 
 // show_queries : for debug purpose, show queries and execution times
@@ -430,6 +430,17 @@ $conf['debug_template'] = false;
 // 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;
+
 // +-----------------------------------------------------------------------+
 // |                            authentication                             |
 // +-----------------------------------------------------------------------+
@@ -695,11 +706,4 @@ $conf['light_slideshow'] = true;
 // the local data directory is used to store data such as compiled templates
 // 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;
-
 ?>

include/functions.inc.php

@@ -1027,7 +1027,7 @@ function l10n($key)
 
   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);
   }
 
   return isset($lang[$key]) ? $lang[$key] : $key;
@@ -1346,7 +1346,7 @@ function get_filter_page_value($value_name)
  */
 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;
 }
 
@@ -1417,6 +1417,8 @@ function load_language($filename, $dirname = '',
   {
     $dir = $dirname.$language;
 
+    if ($target_charset!='utf-8')
+    {
       // exact charset match - no conversion required
       $f = $dir.'.'.$target_charset.'/'.$filename;
       if (file_exists($f))
@@ -1424,6 +1426,7 @@ function load_language($filename, $dirname = '',
         $source_file = $f;
         break;
       }
+    }
 
     // UTF-8 ?
     $f = $dir.'/'.$filename;

include/template.class.php

@@ -55,6 +55,7 @@ class Template {
 
     $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';
     mkgetdir( $compile_dir );

language/de_DE/common.lang.php

@@ -140,7 +140,7 @@ $lang['became available before %s (%s)'] = 'zur Verfügung gestellt, bevor die %
 $lang['became available between %s (%s) and %s (%s)'] = 'zur Verfügung gestellt von %s (%s) und das %s (%s)';
 $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';
 $lang['calendar_any'] = 'Alles';
@@ -195,7 +195,7 @@ $lang['hint_category'] = 'zeigt die Bilder an der Wurzel dieser Kategorie';
 $lang['hint_comments'] = 'Zeige die letzten Kommentare Benutzer';
 $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';
 $lang['images_available_cat'] = 'in %d Unterkategorie';
@@ -228,7 +228,7 @@ $lang['month'][6] = 'Juni';
 $lang['month'][7] = 'Juli';
 $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';
 $lang['nb_image_per_row'] = 'Anzahl der Bilder pro Zeile';
@@ -238,7 +238,7 @@ $lang['nbm_unknown_identifier'] = 'Identifikatoren unbekannt';
 $lang['new_password'] = 'Neues Passwort';
 $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.';
 $lang['note_filter_days'] = 'Die Gesamtheit der Elemente wird gefiltert um nur die jüngsten weniger als %d Tage.';
@@ -250,9 +250,9 @@ $lang['picture_show_metadata'] = 'Zeigen die Meta-Daten in der Datei';
 $lang['powered_by'] = 'Unterstützt von';
 $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';
 $lang['recent_pics_cat'] = 'Die neuesten Bilder';
@@ -289,7 +289,7 @@ $lang['show_nb_comments'] = 'Zeigen die Anzahl der Kommentare';
 $lang['show_nb_hits'] = 'Zeigen die Anzahl der Visualisierungen';
 $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';
 $lang['stop_filter_hint'] = 'Zurück zur Anzeige aller Elemente';