Changeset 2202

Timestamp:

Jan 30, 2008, 11:16:01 PM (16 years ago)

Author:

rub

Message:

Replace old use of $lang by l10n function.

Merge BSF 2200:2201 into branch-1_7

Location:

branches/branch-1_7

Files:

• admin/cat_list.php (modified) (3 diffs)
• admin/cat_modify.php (modified) (2 diffs)
• admin/cat_options.php (modified) (5 diffs)
• admin/configuration.php (modified) (5 diffs)
• admin/element_set.php (modified) (1 diff)
• admin/element_set_global.php (modified) (1 diff)
• admin/element_set_unit.php (modified) (1 diff)
• admin/group_list.php (modified) (2 diffs)
• admin/group_perm.php (modified) (1 diff)
• admin/history.php (modified) (1 diff)
• admin/picture_modify.php (modified) (1 diff)
• admin/thumbnail.php (modified) (4 diffs)
• admin/user_list.php (modified) (2 diffs)
• admin/user_perm.php (modified) (1 diff)
• admin/ws_checker.php (modified) (5 diffs)
• include/category_cats.inc.php (modified) (1 diff)
• include/common.inc.php (modified) (3 diffs)
• include/functions_html.inc.php (modified) (6 diffs)
• include/menubar.inc.php (modified) (10 diffs)
• include/page_tail.php (modified) (1 diff)
• include/picture_rate.inc.php (modified) (1 diff)
• include/section_init.inc.php (modified) (8 diffs)
• install.php (modified) (2 diffs)

branches/branch-1_7/admin/cat_list.php

@@ -72 +72 @@
 $base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_list';
 $navigation = '<a class="" href="'.$base_url.'">';
-$navigation.= $lang['home'];
+$navigation.= l10n('home');
 $navigation.= '</a>';
 
@@ -82 +82 @@
 {
   delete_categories(array($_GET['delete']));
-  array_push($page['infos'], $lang['cat_virtual_deleted']);
+  array_push($page['infos'], l10n('cat_virtual_deleted'));
   ordering();
   update_global_rank();
@@ -167 +167 @@
   'F_ACTION'=>$form_action,
 
-  'L_ADD_VIRTUAL'=>$lang['cat_add'],
-  'L_SUBMIT'=>$lang['submit'],
-  'L_STORAGE'=>$lang['storage'],
-  'L_NB_IMG'=>$lang['pictures'],
-  'L_MOVE_UP'=>$lang['up'],
-  'L_EDIT'=>$lang['edit'],
-  'L_DELETE'=>$lang['delete'],
+  'L_ADD_VIRTUAL'=>l10n('cat_add'),
+  'L_SUBMIT'=>l10n('submit'),
+  'L_STORAGE'=>l10n('storage'),
+  'L_NB_IMG'=>l10n('pictures'),
+  'L_MOVE_UP'=>l10n('up'),
+  'L_EDIT'=>l10n('edit'),
+  'L_DELETE'=>l10n('delete'),
  ));
 

branches/branch-1_7/admin/cat_modify.php

@@ -114 +114 @@
   pwg_query($query);
 
-  array_push($page['infos'], $lang['editcat_confirm']);
+  array_push($page['infos'], l10n('editcat_confirm'));
 }
 else if (isset($_POST['set_random_representant']))
@@ -263 +263 @@
                               'checked="checked"' : '',
 
-    'L_EDIT_NAME'        => $lang['name'],
-    'L_STORAGE'          => $lang['storage'],
-    'L_REMOTE_SITE'      => $lang['remote_site'],
-    'L_EDIT_COMMENT'     => $lang['description'],
-    'L_EDIT_STATUS'      => $lang['conf_access'],
-    'L_STATUS_PUBLIC'    => $lang['public'],
-    'L_STATUS_PRIVATE'   => $lang['private'],
-    'L_EDIT_LOCK'        => $lang['lock'],
-    'L_EDIT_UPLOADABLE'  => $lang['editcat_uploadable'],
-    'L_EDIT_COMMENTABLE' => $lang['comments'],
-    'L_YES'              => $lang['yes'],
-    'L_NO'               => $lang['no'],
-    'L_SUBMIT'           => $lang['submit'],
-    'L_SET_RANDOM_REPRESENTANT'=>$lang['cat_representant'],
+    'L_EDIT_NAME'        => l10n('name'),
+    'L_STORAGE'          => l10n('storage'),
+    'L_REMOTE_SITE'      => l10n('remote_site'),
+    'L_EDIT_COMMENT'     => l10n('description'),
+    'L_EDIT_STATUS'      => l10n('conf_access'),
+    'L_STATUS_PUBLIC'    => l10n('public'),
+    'L_STATUS_PRIVATE'   => l10n('private'),
+    'L_EDIT_LOCK'        => l10n('lock'),
+    'L_EDIT_UPLOADABLE'  => l10n('editcat_uploadable'),
+    'L_EDIT_COMMENTABLE' => l10n('comments'),
+    'L_YES'              => l10n('yes'),
+    'L_NO'               => l10n('no'),
+    'L_SUBMIT'           => l10n('submit'),
+    'L_SET_RANDOM_REPRESENTANT'=>l10n('cat_representant'),
 
     'U_JUMPTO' => make_index_url(

branches/branch-1_7/admin/cat_options.php

@@ -155 +155 @@
 $template->assign_vars(
   array(
-    'L_SUBMIT'=>$lang['submit'],
-    'L_RESET'=>$lang['reset'],
+    'L_SUBMIT'=>l10n('submit'),
+    'L_RESET'=>l10n('reset'),
 
     'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_options',
@@ -239 +239 @@
     $template->assign_vars(
       array(
-        'L_SECTION' => $lang['cat_upload_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
-        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
+        'L_SECTION' => l10n('cat_upload_title'),
+        'L_CAT_OPTIONS_TRUE' => l10n('authorized'),
+        'L_CAT_OPTIONS_FALSE' => l10n('forbidden'),
         )
       );
@@ -260 +260 @@
     $template->assign_vars(
       array(
-        'L_SECTION' => $lang['cat_comments_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
-        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
+        'L_SECTION' => l10n('cat_comments_title'),
+        'L_CAT_OPTIONS_TRUE' => l10n('authorized'),
+        'L_CAT_OPTIONS_FALSE' => l10n('forbidden'),
         )
       );
@@ -281 +281 @@
     $template->assign_vars(
       array(
-        'L_SECTION' => $lang['cat_lock_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['unlocked'],
-        'L_CAT_OPTIONS_FALSE' => $lang['locked'],
+        'L_SECTION' => l10n('cat_lock_title'),
+        'L_CAT_OPTIONS_TRUE' => l10n('unlocked'),
+        'L_CAT_OPTIONS_FALSE' => l10n('locked'),
         )
       );
@@ -302 +302 @@
     $template->assign_vars(
       array(
-        'L_SECTION' => $lang['cat_status_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_public'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_private'],
+        'L_SECTION' => l10n('cat_status_title'),
+        'L_CAT_OPTIONS_TRUE' => l10n('cat_public'),
+        'L_CAT_OPTIONS_FALSE' => l10n('cat_private'),
         )
       );

branches/branch-1_7/admin/configuration.php

@@ -81 +81 @@
       if ( !url_is_remote($_POST['gallery_url']) )
       {
-        array_push($page['errors'], $lang['conf_gallery_url_error']);
+        array_push($page['errors'], l10n('conf_gallery_url_error'));
       }
       foreach( $main_checkboxes as $checkbox)
@@ -105 +105 @@
            or $_POST['nb_comment_page'] > 50)
       {
-        array_push($page['errors'], $lang['conf_nb_comment_page_error']);
+        array_push($page['errors'], l10n('conf_nb_comment_page_error'));
       }
       foreach( $comments_checkboxes as $checkbox)
@@ -147 +147 @@
       }
     }
-    array_push($page['infos'], $lang['conf_confirmation']);
+    array_push($page['infos'], l10n('conf_confirmation'));
   }
 
@@ -192 +192 @@
 $template->assign_vars(
   array(
-    'L_YES'=>$lang['yes'],
-    'L_NO'=>$lang['no'],
-    'L_SUBMIT'=>$lang['submit'],
-    'L_RESET'=>$lang['reset'],
+    'L_YES'=>l10n('yes'),
+    'L_NO'=>l10n('no'),
+    'L_SUBMIT'=>l10n('submit'),
+    'L_RESET'=>l10n('reset'),
 
     'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=configuration',
@@ -281 +281 @@
         // Reload user
         $edit_user = build_user($conf['default_user_id'], false);
-        array_push($page['infos'], $lang['conf_confirmation']);
+        array_push($page['infos'], l10n('conf_confirmation'));
       }
     }

branches/branch-1_7/admin/element_set.php

@@ -125 +125 @@
 else if ('caddie' == $_GET['cat'])
 {
-  $page['title'] = $lang['caddie'];
+  $page['title'] = l10n('caddie');
   
   $query = '

branches/branch-1_7/admin/element_set_global.php

@@ -206 +206 @@
     'CATEGORIES_NAV'=>$page['title'],
 
-    'L_SUBMIT'=>$lang['submit'],
+    'L_SUBMIT'=>l10n('submit'),
 
     'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),

branches/branch-1_7/admin/element_set_unit.php

@@ -141 +141 @@
     'CATEGORIES_NAV'=>$page['title'],
 
-    'L_SUBMIT'=>$lang['submit'],
+    'L_SUBMIT'=>l10n('submit'),
 
     'U_ELEMENTS_PAGE'

branches/branch-1_7/admin/group_list.php

@@ -88 +88 @@
   if (empty($_POST['groupname']))
   {
-    array_push($page['errors'], $lang['group_add_error1']);
+    array_push($page['errors'], l10n('group_add_error1'));
   }
   if (count($page['errors']) == 0)
@@ -101 +101 @@
     if ($count != 0)
     {
-      array_push($page['errors'], $lang['group_add_error2']);
+      array_push($page['errors'], l10n('group_add_error2'));
     }
   }

branches/branch-1_7/admin/group_perm.php

@@ -142 +142 @@
           )
         ),
-    'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
-    'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
-    'L_CAT_OPTIONS_INFO'=>$lang['permuser_info'],
+    'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
+    'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
+    'L_CAT_OPTIONS_INFO'=>l10n('permuser_info'),
     
     'F_ACTION' =>

branches/branch-1_7/admin/history.php

@@ -142 +142 @@
   else
   {
-    array_push($page['errors'], $lang['search_one_clause_at_least']);
+    array_push($page['errors'], l10n('search_one_clause_at_least'));
   }
 }

branches/branch-1_7/admin/picture_modify.php

@@ -66 +66 @@
     )
   {
-    array_push($page['errors'], $lang['err_date']);
+    array_push($page['errors'], l10n('err_date'));
   }
 }

branches/branch-1_7/admin/thumbnail.php

@@ -120 +120 @@
     if (!is_writable($tndir))
     {
-      array_push($page['errors'], '['.$tndir.'] : '.$lang['no_write_access']);
+      array_push($page['errors'], '['.$tndir.'] : '.l10n('no_write_access'));
       return false;
     }
@@ -141 +141 @@
   else
   {
-    echo $lang['tn_no_support']." ";
+    echo l10n('tn_no_support')." ";
     if ( isset( $extenstion ) )
     {
-      echo $lang['tn_format'].' '.$extension;
+      echo l10n('tn_format').' '.$extension;
     }
     else
     {
-      echo $lang['tn_thisformat'];
+      echo l10n('tn_thisformat');
     }
     exit();
@@ -162 +162 @@
 
 $template->assign_vars(array(
-  'L_THUMBNAIL_TITLE'=>$lang['tn_dirs_title'],
-  'L_UNLINK'=>$lang['tn_no_missing'],
-  'L_MISSING_THUMBNAILS'=>$lang['tn_dirs_alone'],
-  'L_RESULTS'=>$lang['tn_results_title'],
-  'L_PATH'=>$lang['path'],
-  'L_FILESIZE'=>$lang['filesize'],
-  'L_GENERATED'=>$lang['tn_results_gen_time'],
-  'L_THUMBNAIL'=>$lang['thumbnail'],
-  'L_PARAMS'=>$lang['tn_params_title'],
-  'L_GD'=>$lang['tn_params_GD'],
-  'L_CREATE'=>$lang['tn_params_create'],
-  'L_SUBMIT'=>$lang['submit'],
-  'L_REMAINING'=>$lang['tn_alone_title'],
-  'L_TN_STATS'=>$lang['tn_stats'],
-  'L_TN_NB_STATS'=>$lang['tn_stats_nb'],
-  'L_TN_TOTAL'=>$lang['tn_stats_total'],
-  'L_TN_MAX'=>$lang['tn_stats_max'],
-  'L_TN_MIN'=>$lang['tn_stats_min'],
-  'L_TN_AVERAGE'=>$lang['tn_stats_mean'],
-  'L_ALL'=>$lang['tn_all'],
+  'L_THUMBNAIL_TITLE'=>l10n('tn_dirs_title'),
+  'L_UNLINK'=>l10n('tn_no_missing'),
+  'L_MISSING_THUMBNAILS'=>l10n('tn_dirs_alone'),
+  'L_RESULTS'=>l10n('tn_results_title'),
+  'L_PATH'=>l10n('path'),
+  'L_FILESIZE'=>l10n('filesize'),
+  'L_GENERATED'=>l10n('tn_results_gen_time'),
+  'L_THUMBNAIL'=>l10n('thumbnail'),
+  'L_PARAMS'=>l10n('tn_params_title'),
+  'L_GD'=>l10n('tn_params_GD'),
+  'L_CREATE'=>l10n('tn_params_create'),
+  'L_SUBMIT'=>l10n('submit'),
+  'L_REMAINING'=>l10n('tn_alone_title'),
+  'L_TN_STATS'=>l10n('tn_stats'),
+  'L_TN_NB_STATS'=>l10n('tn_stats_nb'),
+  'L_TN_TOTAL'=>l10n('tn_stats_total'),
+  'L_TN_MAX'=>l10n('tn_stats_max'),
+  'L_TN_MIN'=>l10n('tn_stats_min'),
+  'L_TN_AVERAGE'=>l10n('tn_stats_mean'),
+  'L_ALL'=>l10n('tn_all'),
 
   'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=thumbnail',
@@ -255 +255 @@
   if (!ereg('^[0-9]{2,3}$', $_POST['width']) or $_POST['width'] < 10)
   {
-    array_push($page['errors'], $lang['tn_err_width'].' 10');
+    array_push($page['errors'], l10n('tn_err_width').' 10');
   }
   if (!ereg('^[0-9]{2,3}$', $_POST['height']) or $_POST['height'] < 10)
   {
-    array_push($page['errors'], $lang['tn_err_height'].' 10');
+    array_push($page['errors'], l10n('tn_err_height').' 10');
   }
   

branches/branch-1_7/admin/user_list.php

@@ -178 +178 @@
 
 $page['order_by_items'] = array(
-  'id' => $lang['registration_date'],
-  'username' => $lang['Username']
+  'id' => l10n('registration_date'),
+  'username' => l10n('Username')
   );
 
 $page['direction_items'] = array(
-  'asc' => $lang['ascending'],
-  'desc' => $lang['descending']
+  'asc' => l10n('ascending'),
+  'desc' => l10n('descending')
   );
 
@@ -835 +835 @@
       'PROPERTIES' =>
         (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
-        ? $lang['is_high_enabled'] : $lang['is_high_disabled']
+        ? l10n('is_high_enabled') : l10n('is_high_disabled')
       )
     );

branches/branch-1_7/admin/user_perm.php

@@ -135 +135 @@
           )
         ),
-    'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
-    'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
+    'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
+    'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
 
     'F_ACTION' =>

branches/branch-1_7/admin/ws_checker.php

@@ -158 +158 @@
     'update_result',
     array(
-      'UPD_ELEMENT'=> $lang['ws_adding_legend'].$lang['ws_success_upd'],
+      'UPD_ELEMENT'=> l10n('ws_adding_legend').l10n('ws_success_upd'),
       )
   );
@@ -180 +180 @@
       'update_result',
       array(
-        'UPD_ELEMENT'=> $lang['ws_update_legend'].$lang['ws_success_upd'],
+        'UPD_ELEMENT'=> l10n('ws_update_legend').l10n('ws_success_upd'),
         )
     );
@@ -187 +187 @@
       'update_result',
       array(
-        'UPD_ELEMENT'=> $lang['ws_update_legend'].$lang['ws_failed_upd'],
+        'UPD_ELEMENT'=> l10n('ws_update_legend').l10n('ws_failed_upd'),
         )
     );
@@ -206 +206 @@
       'update_result',
       array(
-        'UPD_ELEMENT'=> $lang['ws_delete_legend'].$lang['ws_success_upd'],
+        'UPD_ELEMENT'=> l10n('ws_delete_legend').l10n('ws_success_upd'),
         )
     );
@@ -213 +213 @@
       'update_result',
       array(
-        'UPD_ELEMENT'=> $lang['Not selected / Not confirmed']
-        .$lang['ws_failed_upd'],
+        'UPD_ELEMENT'=> l10n('Not selected / Not confirmed')
+        .l10n('ws_failed_upd'),
         )
     );

branches/branch-1_7/include/category_cats.inc.php

@@ -202 +202 @@
           'SRC'   => $thumbnail_src_of[$category['representative_picture_id']],
           'ALT'   => $category['name'],
-          'TITLE' => $lang['hint_category'],
+          'TITLE' => l10n('hint_category'),
           'ICON'  => $icon_ts,
 

branches/branch-1_7/include/common.inc.php

@@ -169 +169 @@
 if ($user['is_the_guest'])
 {
-  $user['username'] = $lang['guest'];
+  $user['username'] = l10n('guest');
 }
 
@@ -198 +198 @@
 if ($conf['gallery_locked'])
 {
-  $header_msgs[] = $lang['gallery_locked_message'];
+  $header_msgs[] = l10n('gallery_locked_message');
 
   if ( script_basename() != 'identification' and !is_admin() )
   {
-    echo $lang['gallery_locked_message']
+    echo l10n('gallery_locked_message')
       .'<a href="'.get_absolute_root_url(false).'identification.php">.</a>';
     exit();
@@ -233 +233 @@
 if (is_adviser())
 {
-  $header_msgs[] = $lang['adviser_mode_enabled'];
+  $header_msgs[] = l10n('adviser_mode_enabled');
 }
 

branches/branch-1_7/include/functions_html.inc.php

@@ -55 +55 @@
     {
       $icons = array(false => 'recent', true => 'recent_by_child' );
-      $title = $lang['recent_image'].' '.$user['recent_period']
-          .' '.$lang['days'];
+      $title = l10n('recent_image').' '.$user['recent_period']
+          .' '.l10n('days');
       foreach ($icons as $key => $icon)
       {
@@ -107 +107 @@
       $navbar.=
         '<a href="'.$url.'" rel="start">'
-        .$lang['first_page']
+        .l10n('first_page')
         .'</a>';
     }
     else
     {
-      $navbar.= $lang['first_page'];
+      $navbar.= l10n('first_page');
     }
     $navbar.= ' | ';
@@ -124 +124 @@
         .$url.($previous > 0 ? $start_str.$previous : '')
         .'" rel="prev">'
-        .$lang['previous_page']
+        .l10n('previous_page')
         .'</a>';
     }
     else
     {
-      $navbar.= $lang['previous_page'];
+      $navbar.= l10n('previous_page');
     }
     $navbar.= ' |';
@@ -195 +195 @@
       $navbar.=
         '<a href="'.$url.$start_str.$next.'" rel="next">'
-        .$lang['next_page']
+        .l10n('next_page')
         .'</a>';
     }
     else
     {
-      $navbar.= $lang['next_page'];
+      $navbar.= l10n('next_page');
     }
 
@@ -211 +211 @@
       $navbar.=
         '<a href="'.$url.$start_str.$temp_start.'" rel="last">'
-        .$lang['last_page']
+        .l10n('last_page')
         .'</a>';
     }
     else
     {
-      $navbar.= $lang['last_page'];
+      $navbar.= l10n('last_page');
     }
   }
@@ -567 +567 @@
   if ( isset($user['is_the_guest']) and !$user['is_the_guest'] )
   {
-    echo '<div style="text-align:center;">'.$lang['access_forbiden'].'<br />';
-    echo '<a href="'.get_root_url().'identification.php">'.$lang['identification'].'</a>&nbsp;';
-    echo '<a href="'.make_index_url().'">'.$lang['home'].'</a></div>';
+    echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br />';
+    echo '<a href="'.get_root_url().'identification.php">'.l10n('identification').'</a>&nbsp;';
+    echo '<a href="'.make_index_url().'">'.l10n('home').'</a></div>';
     exit();
   }

branches/branch-1_7/include/menubar.inc.php

@@ -172 +172 @@
     array(
       'URL' => make_index_url(array('section' => 'favorites')),
-      'TITLE' => $lang['favorite_cat_hint'],
-      'NAME' => $lang['favorite_cat']
+      'TITLE' => l10n('favorite_cat_hint'),
+      'NAME' => l10n('favorite_cat')
       ));
 }
@@ -181 +181 @@
   array(
     'URL' => make_index_url(array('section' => 'most_visited')),
-    'TITLE' => $lang['most_visited_cat_hint'],
-    'NAME' => $lang['most_visited_cat']
+    'TITLE' => l10n('most_visited_cat_hint'),
+    'NAME' => l10n('most_visited_cat')
     ));
 // best rated
@@ -191 +191 @@
     array(
       'URL' => make_index_url(array('section' => 'best_rated')),
-      'TITLE' => $lang['best_rated_cat_hint'],
-      'NAME' => $lang['best_rated_cat']
+      'TITLE' => l10n('best_rated_cat_hint'),
+      'NAME' => l10n('best_rated_cat')
       )
     );
@@ -201 +201 @@
   array(
     'URL' => get_root_url().'random.php',
-    'TITLE' => $lang['random_cat_hint'],
-    'NAME' => $lang['random_cat'],
+    'TITLE' => l10n('random_cat_hint'),
+    'NAME' => l10n('random_cat'),
     'REL'=> 'rel="nofollow"'
     ));
@@ -211 +211 @@
   array(
     'URL' => make_index_url(array('section' => 'recent_pics')),
-    'TITLE' => $lang['recent_pics_cat_hint'],
-    'NAME' => $lang['recent_pics_cat'],
+    'TITLE' => l10n('recent_pics_cat_hint'),
+    'NAME' => l10n('recent_pics_cat'),
     ));
 // recent cats
@@ -219 +219 @@
   array(
     'URL' => make_index_url(array('section' => 'recent_cats')),
-    'TITLE' => $lang['recent_cats_cat_hint'],
-    'NAME' => $lang['recent_cats_cat'],
+    'TITLE' => l10n('recent_cats_cat_hint'),
+    'NAME' => l10n('recent_cats_cat'),
     ));
 
@@ -236 +236 @@
         )
       ),
-    'TITLE' => $lang['calendar_hint'],
-    'NAME' => $lang['calendar'],
+    'TITLE' => l10n('calendar_hint'),
+    'NAME' => l10n('calendar'),
     'REL'=> 'rel="nofollow"'
     )
@@ -294 +294 @@
   'summary',
   array(
-    'TITLE'=>$lang['hint_search'],
-    'NAME'=>$lang['search'],
+    'TITLE'=>l10n('hint_search'),
+    'NAME'=>l10n('search'),
     'U_SUMMARY'=> get_root_url().'search.php',
     'REL'=> 'rel="search"'
@@ -306 +306 @@
   'summary',
   array(
-    'TITLE'=>$lang['hint_comments'],
-    'NAME'=>$lang['comments'],
+    'TITLE'=>l10n('hint_comments'),
+    'NAME'=>l10n('comments'),
     'U_SUMMARY'=> get_root_url().'comments.php',
     )
@@ -316 +316 @@
   'summary',
   array(
-    'TITLE'     => $lang['about_page_title'],
-    'NAME'      => $lang['About'],
+    'TITLE'     => l10n('about_page_title'),
+    'NAME'      => l10n('About'),
     'U_SUMMARY' => get_root_url().'about.php',
     )

branches/branch-1_7/include/page_tail.php

@@ -34 +34 @@
     'PHPWG_URL' => PHPWG_URL,
 
-    'L_TITLE_MAIL' => urlencode($lang['title_send_mail']),
+    'L_TITLE_MAIL' => urlencode(l10n('title_send_mail')),
     ));
 

branches/branch-1_7/include/picture_rate.inc.php

@@ -43 +43 @@
   if ($row['count'] == 0)
   {
-    $value = $lang['no_rate'];
+    $value = l10n('no_rate');
   }
   else

branches/branch-1_7/include/section_init.inc.php

@@ -218 +218 @@
   else
   {
-    $page['title'] = $lang['no_category'];
+    $page['title'] = l10n('no_category');
   }
 
@@ -338 +338 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                  .$lang['search_result'].'</a>',
+                  .l10n('search_result').'</a>',
         )
       );
@@ -368 +368 @@
       $page,
       array(
-        'title' => $lang['favorites'],
+        'title' => l10n('favorites'),
         'items' => array_from_query($query, 'image_id'),
         )
@@ -393 +393 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                  .$lang['recent_pics_cat'].'</a>',
+                  .l10n('recent_pics_cat').'</a>',
         'items' => array_from_query($query, 'id'),
         )
@@ -406 +406 @@
       $page,
       array(
-        'title' => $lang['recent_cats_cat'],
+        'title' => l10n('recent_cats_cat'),
         )
       );
@@ -431 +431 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                  .$conf['top_number'].' '.$lang['most_visited_cat'].'</a>',
+                  .$conf['top_number'].' '.l10n('most_visited_cat').'</a>',
         'items' => array_from_query($query, 'id'),
         )
@@ -457 +457 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                  .$conf['top_number'].' '.$lang['best_rated_cat'].'</a>',
+                  .$conf['top_number'].' '.l10n('best_rated_cat').'</a>',
         'items' => array_from_query($query, 'id'),
         )
@@ -480 +480 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                    .$lang['random_cat'].'</a>',
+                    .l10n('random_cat').'</a>',
         'items' => array_from_query($query, 'id'),
         )

branches/branch-1_7/install.php

@@ -243 +243 @@
     if ( @mysql_select_db($_POST['dbname'] ) )
     {
-      array_push( $infos, $lang['step1_confirmation'] );
+      array_push( $infos, l10n('step1_confirmation') );
     }
     else
     {
-      array_push( $errors, $lang['step1_err_db'] );
+      array_push( $errors, l10n('step1_err_db') );
     }
   }
   else
   {
-    array_push( $errors, $lang['step1_err_server'] );
+    array_push( $errors, l10n('step1_err_server') );
   }
   
   $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
   if ( empty($webmaster))
-    array_push( $errors, $lang['step2_err_login1'] );
+    array_push( $errors, l10n('step2_err_login1') );
   else if ( preg_match( '/[\'"]/', $webmaster ) )
-    array_push( $errors, $lang['step2_err_login3'] );
+    array_push( $errors, l10n('step2_err_login3') );
   if ( $admin_pass1 != $admin_pass2 || empty($admin_pass1) )
-    array_push( $errors, $lang['step2_err_pass'] );
+    array_push( $errors, l10n('step2_err_pass') );
   if ( empty($admin_mail))
-    array_push( $errors, $lang['reg_err_mail_address'] );
+    array_push( $errors, l10n('reg_err_mail_address') );
   else 
   {
@@ -372 +372 @@
     'RELEASE'=>PHPWG_VERSION,
   
-    'L_BASE_TITLE'=>$lang['Initial_config'],
-    'L_LANG_TITLE'=>$lang['Default_lang'],
-    'L_DB_TITLE'=>$lang['step1_title'],
-    'L_DB_HOST'=>$lang['step1_host'],
-    'L_DB_HOST_INFO'=>$lang['step1_host_info'],
-    'L_DB_USER'=>$lang['step1_user'],
-    'L_DB_USER_INFO'=>$lang['step1_user_info'],
-    'L_DB_PASS'=>$lang['step1_pass'],
-    'L_DB_PASS_INFO'=>$lang['step1_pass_info'],
-    'L_DB_NAME'=>$lang['step1_database'],
-    'L_DB_NAME_INFO'=>$lang['step1_database_info'],
-    'L_DB_PREFIX'=>$lang['step1_prefix'],
-    'L_DB_PREFIX_INFO'=>$lang['step1_prefix_info'],
-    'L_ADMIN_TITLE'=>$lang['step2_title'],
-    'L_ADMIN'=>$lang['install_webmaster'],
-    'L_ADMIN_INFO'=>$lang['install_webmaster_info'],
-    'L_ADMIN_PASSWORD'=>$lang['step2_pwd'],
-    'L_ADMIN_PASSWORD_INFO'=>$lang['step2_pwd_info'],
-    'L_ADMIN_CONFIRM_PASSWORD'=>$lang['step2_pwd_conf'],
-    'L_ADMIN_CONFIRM_PASSWORD_INFO'=>$lang['step2_pwd_conf_info'],
-    'L_ADMIN_EMAIL'=>$lang['conf_mail_webmaster'],
-    'L_ADMIN_EMAIL_INFO'=>$lang['conf_mail_webmaster_info'],
-    'L_SUBMIT'=>$lang['Start_Install'],
-    'L_INSTALL_HELP'=>sprintf($lang['install_help'], 'http://forum.'.PHPWG_DOMAIN.'/'),
-    'L_ERR_COPY'=>$lang['step1_err_copy'],
-    'L_END_TITLE'=>$lang['install_end_title'],
-    'L_END_MESSAGE'=>$lang['install_end_message'],
+    'L_BASE_TITLE'=>l10n('Initial_config'),
+    'L_LANG_TITLE'=>l10n('Default_lang'),
+    'L_DB_TITLE'=>l10n('step1_title'),
+    'L_DB_HOST'=>l10n('step1_host'),
+    'L_DB_HOST_INFO'=>l10n('step1_host_info'),
+    'L_DB_USER'=>l10n('step1_user'),
+    'L_DB_USER_INFO'=>l10n('step1_user_info'),
+    'L_DB_PASS'=>l10n('step1_pass'),
+    'L_DB_PASS_INFO'=>l10n('step1_pass_info'),
+    'L_DB_NAME'=>l10n('step1_database'),
+    'L_DB_NAME_INFO'=>l10n('step1_database_info'),
+    'L_DB_PREFIX'=>l10n('step1_prefix'),
+    'L_DB_PREFIX_INFO'=>l10n('step1_prefix_info'),
+    'L_ADMIN_TITLE'=>l10n('step2_title'),
+    'L_ADMIN'=>l10n('install_webmaster'),
+    'L_ADMIN_INFO'=>l10n('install_webmaster_info'),
+    'L_ADMIN_PASSWORD'=>l10n('step2_pwd'),
+    'L_ADMIN_PASSWORD_INFO'=>l10n('step2_pwd_info'),
+    'L_ADMIN_CONFIRM_PASSWORD'=>l10n('step2_pwd_conf'),
+    'L_ADMIN_CONFIRM_PASSWORD_INFO'=>l10n('step2_pwd_conf_info'),
+    'L_ADMIN_EMAIL'=>l10n('conf_mail_webmaster'),
+    'L_ADMIN_EMAIL_INFO'=>l10n('conf_mail_webmaster_info'),
+    'L_SUBMIT'=>l10n('Start_Install'),
+    'L_INSTALL_HELP'=>sprintf(l10n('install_help'), 'http://forum.'.PHPWG_DOMAIN.'/'),
+    'L_ERR_COPY'=>l10n('step1_err_copy'),
+    'L_END_TITLE'=>l10n('install_end_title'),
+    'L_END_MESSAGE'=>l10n('install_end_message'),
     
     'F_ACTION'=>'install.php',