Changeset 2265 for trunk/include

Timestamp:

Mar 8, 2008, 2:38:37 AM (16 years ago)

Author:

rvelices

Message:

• upload.tpl goes smarty
• start some language cleanup and a small attempt to standardize a bit ...
• debug_language now calls trigger_error instead of echo when missing language key

Location:

trunk/include

Files:

• calendar_monthly.class.php (modified) (1 diff)
• functions.inc.php (modified) (1 diff)
• functions_category.inc.php (modified) (1 diff)
• functions_html.inc.php (modified) (6 diffs)

trunk/include/calendar_monthly.class.php

@@ -481 +481 @@
             )
           );
-        $alt = $wday_labels[$dow] . ' ' . $day.
-               ' ('.sprintf("%d ".l10n('pictures'), $items[$day]['nb_images']).')';
 
         $tpl_crt_week[]   =
           array(
-              'DAY' => $day,
-              'IMAGE'     => $items[$day]['tn_url'],
-              'U_IMG_LINK'=> $url,
-              'IMAGE_STYLE'     => $css_style,
-              'IMAGE_ALT' => $alt,
+              'DAY'         => $day,
+              'DOW'         => $dow,
+              'NB_ELEMENTS' => $items[$day]['nb_images'],
+              'IMAGE'       => $items[$day]['tn_url'],
+              'U_IMG_LINK'  => $url,
+              'IMAGE_STYLE' => $css_style,
+              'IMAGE_ALT'   => $items[$day]['file'],
             );
       }

trunk/include/functions.inc.php

@@ -1085 +1085 @@
   if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
   {
-    echo '[l10n] language key "'.$key.'" is not defined<br />';
+    trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_NOTICE);
   }
 

trunk/include/functions_category.inc.php

@@ -467 +467 @@
 
     //at least one image direct or indirect
-    $display_text.= l10n_dec('image_available', 'images_available', $cat_count_images);
+    $display_text.= l10n_dec('%d element', '%d elements', $cat_count_images);
 
     if ($cat_count_categories == 0 or $cat_nb_images == $cat_count_images)

trunk/include/functions_html.inc.php

@@ -27 +27 @@
 function get_icon($date, $is_child_date = false)
 {
-  global $page, $user, $lang;
+  global $page, $user;
 
   if (empty($date))
@@ -55 +55 @@
     {
       $icons = array(false => 'recent', true => 'recent_by_child' );
-      $title = l10n('recent_image').' '.$user['recent_period']
-          .' '.l10n('days');
+      $title = sprintf(
+        l10n('elements posted during the last %d days'),
+        $user['recent_period']
+        );
       foreach ($icons as $key => $icon)
       {
@@ -79 +81 @@
   )
 {
-  global $lang, $conf;
+  global $conf;
 
   $pages_around = $conf['paginate_pages_around'];
@@ -375 +377 @@
 function get_html_menu_category($categories, $selected_category)
 {
-  global $lang;
-
   $ref_level = 0;
   $level = 0;
@@ -559 +559 @@
 function access_denied()
 {
-  global $user, $lang;
+  global $user;
 
   $login_url =
@@ -650 +650 @@
         )
       .'" title="'
-      .l10n('See pictures linked to this tag only')
+      .l10n('See elements linked to this tag only')
       .'">'
       .$page['tags'][$i]['name']