Changeset 1033

Timestamp:

Feb 11, 2006, 8:36:09 PM (18 years ago)

Author:

rvelices

Message:

remake Remote Site/Synchro - bug on commentable + use l10n instead of get_lang

Location:

trunk

Files:

• admin/site_manager.php (modified) (10 diffs)
• admin/site_update.php (modified) (10 diffs)
• include/functions.inc.php (modified) (5 diffs)

trunk/admin/site_manager.php

@@ -64 +64 @@
   else
   {
-    array_push($page['errors'], get_lang('remote_site_file_not_found'));
+    array_push($page['errors'], l10n('remote_site_file_not_found'));
   }
 }
@@ -100 +100 @@
   {
     array_push($page['errors'],
-      get_lang('remote_site_already_exists').' ['.$url.']');
+      l10n('remote_site_already_exists').' ['.$url.']');
   }
   if (count($page['errors']) == 0)
@@ -115 +115 @@
         {
           array_push($page['errors'],
-                     get_lang('remote_site_error').' : '.$first_line);
+                     l10n('remote_site_error').' : '.$first_line);
         }
       }
       else
       {
-        array_push($page['errors'], get_lang('remote_site_file_not_found') );
+        array_push($page['errors'], l10n('remote_site_file_not_found') );
       }
     }
@@ -128 +128 @@
       {
         array_push($page['errors'],
-          get_lang('Directory does not exist').' ['.$url.']');
+          l10n('Directory does not exist').' ['.$url.']');
       }
     }
@@ -143 +143 @@
     pwg_query($query);
     array_push($page['infos'],
-               $url.' '.get_lang('remote_site_created'));
+               $url.' '.l10n('remote_site_created'));
   }
 }
@@ -166 +166 @@
     case 'generate' :
     {
-      $title = $galleries_url.' : '.get_lang('remote_site_generate');
+      $title = $galleries_url.' : '.l10n('remote_site_generate');
       $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
       remote_output($galleries_url.'create_listing_file.php?action=generate');
@@ -173 +173 @@
     case 'test' :
     {
-      $title = $galleries_url.' : '.get_lang('remote_site_test');
+      $title = $galleries_url.' : '.l10n('remote_site_test');
       $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
       remote_output($galleries_url.'create_listing_file.php?action=test&version='.PHPWG_VERSION);
@@ -180 +180 @@
     case 'clean' :
     {
-      $title = $galleries_url.' : '.get_lang('remote_site_clean');
+      $title = $galleries_url.' : '.l10n('remote_site_clean');
       $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
       remote_output($galleries_url.'create_listing_file.php?action=clean');
@@ -189 +189 @@
       delete_site($page['site']);
       array_push($page['infos'],
-                 $galleries_url.' '.get_lang('remote_site_deleted'));
+                 $galleries_url.' '.l10n('remote_site_deleted'));
       break;
     }
@@ -232 +232 @@
     array(
       'NAME' => $row['galleries_url'],
-      'TYPE' => get_lang( $is_remote ? 'Remote' : 'Local' ),
+      'TYPE' => l10n( $is_remote ? 'Remote' : 'Local' ),
       'CATEGORIES' => $row['nb_categories'],
       'IMAGES' => isset($row['nb_images']) ? $row['nb_images'] : 0,

trunk/admin/site_update.php

@@ -51 +51 @@
 
 $error_labels = array(
-  'PWG-UPDATE-1' => array( get_lang('update_wrong_dirname_short'), 
-                           get_lang('update_wrong_dirname_info') ),
-  'PWG-UPDATE-2' => array( get_lang('update_missing_tn_short'),
-                           get_lang('update_missing_tn_info') 
+  'PWG-UPDATE-1' => array( l10n('update_wrong_dirname_short'), 
+                           l10n('update_wrong_dirname_info') ),
+  'PWG-UPDATE-2' => array( l10n('update_missing_tn_short'),
+                           l10n('update_missing_tn_info') 
                            . implode(',', $conf['picture_ext']) ),
-  'PWG-ERROR-NO-FS' => array( get_lang('Does not exist'), 
-                             get_lang('update_missing_file_or_dir_info')),
-  'PWG-ERROR-VERSION' => array( get_lang('Invalid PhpWebGalley version'), 
-                             get_lang('update_pwg_version_differs_info')),
-  'PWG-ERROR-NOLISTING' => array( get_lang('remote_site_listing_not_found'), 
-                             get_lang('remote_site_listing_not_found_info'))
+  'PWG-ERROR-NO-FS' => array( l10n('Does not exist'), 
+                             l10n('update_missing_file_or_dir_info')),
+  'PWG-ERROR-VERSION' => array( l10n('Invalid PhpWebGalley version'), 
+                             l10n('update_pwg_version_differs_info')),
+  'PWG-ERROR-NOLISTING' => array( l10n('remote_site_listing_not_found'), 
+                             l10n('remote_site_listing_not_found_info'))
                       );
 $errors = array();
@@ -227 +227 @@
       else
       {
-        $insert{'uploadable'} = false;
+        $insert{'uploadable'} = 'false';
       }
       $insert{'status'} = $conf{'newcat_default_status'};
@@ -260 +260 @@
       array_push($inserts, $insert);
       array_push($infos, array('path' => $fulldir,
-                               'info' => get_lang('update_research_added')));
+                               'info' => l10n('update_research_added')));
 
       // add the new category to $db_categories and $db_fulldirs array
@@ -301 +301 @@
     unset($db_fulldirs[$fulldir]);
     array_push($infos, array('path' => $fulldir,
-                             'info' => get_lang('update_research_deleted')));
+                             'info' => l10n('update_research_deleted')));
   }
   if (count($to_delete) > 0)
@@ -417 +417 @@
                          'category_id' => $insert{'storage_category_id'}));
         array_push($infos, array('path' => $insert{'path'},
-                                 'info' => get_lang('update_research_added')));
+                                 'info' => l10n('update_research_added')));
       }
       else
@@ -447 +447 @@
                        'category_id' => $insert{'storage_category_id'}));
       array_push($infos, array('path' => $insert{'path'},
-                               'info' => get_lang('update_research_added')));
+                               'info' => l10n('update_research_added')));
     }
   }
@@ -475 +475 @@
     array_push($to_delete_elements, array_search($path, $db_elements));
     array_push($infos, array('path' => $path,
-                             'info' => get_lang('update_research_deleted')));
+                             'info' => l10n('update_research_deleted')));
   }
   if (count($to_delete_elements) > 0)
@@ -664 +664 @@
 if (isset($simulate) and $simulate)
 {
-  $result_title.= get_lang('update_simulation_title').' ';
+  $result_title.= l10n('update_simulation_title').' ';
 }
 
@@ -672 +672 @@
 if ($site_is_remote and !isset($_POST['submit']) )
 {
-  $used_metadata.= ' + ' . get_lang('Aditionnal remote attributes');
+  $used_metadata.= ' + ' . l10n('Aditionnal remote attributes');
 }
 
@@ -679 +679 @@
     'SITE_URL'=>$site_url,
     'U_SITE_MANAGER'=> PHPWG_ROOT_PATH.'admin.php?page=site_manager',
-    'L_RESULT_UPDATE'=>$result_title.get_lang('update_part_research'),
-    'L_RESULT_METADATA'=>$result_title.get_lang('update_result_metadata'),
+    'L_RESULT_UPDATE'=>$result_title.l10n('update_part_research'),
+    'L_RESULT_METADATA'=>$result_title.l10n('update_result_metadata'),
     'METADATA_LIST' => $used_metadata
     ));

trunk/include/functions.inc.php

@@ -431 +431 @@
 function pwg_query($query)
 {
-  global $conf,$page,$debug;
+  global $conf,$page,$debug,$t2;
   
   $start = get_moment();
@@ -456 +456 @@
     $output.= "\n".'(total SQL time  : ';
     $output.= number_format($page['queries_time'], 3, '.', ' ').' s)';
+    $output.= "\n".'(total time      : ';
+    $output.= number_format( ($time+$start-$t2), 3, '.', ' ').' s)';
     $output.= "</pre>\n";
     
@@ -466 +468 @@
 function pwg_debug( $string )
 {
-  global $debug,$t2,$count_queries;
+  global $debug,$t2,$page;
 
   $now = explode( ' ', microtime() );
@@ -474 +476 @@
   $debug .= '<p>';
   $debug.= '['.$time.', ';
-  $debug.= $count_queries.' queries] : '.$string;
+  $debug.= $page['count_queries'].' queries] : '.$string;
   $debug.= "</p>\n";
 }
@@ -975 +977 @@
 
 /**
- * returns the $str in current language if possible or $str enclosed 
- * in special chars
- */
-function get_lang($str)
-{
-  global $lang;
-  if ( isset($lang[$str]) )
-  {
-    return $lang[$str];
-  }
-  return '@@'.$str.'@@';
-}
-
-/**
  * which upgrades are available ?
  *