Changeset 2202 for branches


Ignore:
Timestamp:
Jan 30, 2008, 11:16:01 PM (17 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:
23 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1_7/admin/cat_list.php

    r1900 r2202  
    7272$base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_list';
    7373$navigation = '<a class="" href="'.$base_url.'">';
    74 $navigation.= $lang['home'];
     74$navigation.= l10n('home');
    7575$navigation.= '</a>';
    7676
     
    8282{
    8383  delete_categories(array($_GET['delete']));
    84   array_push($page['infos'], $lang['cat_virtual_deleted']);
     84  array_push($page['infos'], l10n('cat_virtual_deleted'));
    8585  ordering();
    8686  update_global_rank();
     
    167167  'F_ACTION'=>$form_action,
    168168
    169   'L_ADD_VIRTUAL'=>$lang['cat_add'],
    170   'L_SUBMIT'=>$lang['submit'],
    171   'L_STORAGE'=>$lang['storage'],
    172   'L_NB_IMG'=>$lang['pictures'],
    173   'L_MOVE_UP'=>$lang['up'],
    174   'L_EDIT'=>$lang['edit'],
    175   'L_DELETE'=>$lang['delete'],
     169  'L_ADD_VIRTUAL'=>l10n('cat_add'),
     170  'L_SUBMIT'=>l10n('submit'),
     171  'L_STORAGE'=>l10n('storage'),
     172  'L_NB_IMG'=>l10n('pictures'),
     173  'L_MOVE_UP'=>l10n('up'),
     174  'L_EDIT'=>l10n('edit'),
     175  'L_DELETE'=>l10n('delete'),
    176176 ));
    177177
  • branches/branch-1_7/admin/cat_modify.php

    r2139 r2202  
    114114  pwg_query($query);
    115115
    116   array_push($page['infos'], $lang['editcat_confirm']);
     116  array_push($page['infos'], l10n('editcat_confirm'));
    117117}
    118118else if (isset($_POST['set_random_representant']))
     
    263263                              'checked="checked"' : '',
    264264
    265     'L_EDIT_NAME'        => $lang['name'],
    266     'L_STORAGE'          => $lang['storage'],
    267     'L_REMOTE_SITE'      => $lang['remote_site'],
    268     'L_EDIT_COMMENT'     => $lang['description'],
    269     'L_EDIT_STATUS'      => $lang['conf_access'],
    270     'L_STATUS_PUBLIC'    => $lang['public'],
    271     'L_STATUS_PRIVATE'   => $lang['private'],
    272     'L_EDIT_LOCK'        => $lang['lock'],
    273     'L_EDIT_UPLOADABLE'  => $lang['editcat_uploadable'],
    274     'L_EDIT_COMMENTABLE' => $lang['comments'],
    275     'L_YES'              => $lang['yes'],
    276     'L_NO'               => $lang['no'],
    277     'L_SUBMIT'           => $lang['submit'],
    278     'L_SET_RANDOM_REPRESENTANT'=>$lang['cat_representant'],
     265    'L_EDIT_NAME'        => l10n('name'),
     266    'L_STORAGE'          => l10n('storage'),
     267    'L_REMOTE_SITE'      => l10n('remote_site'),
     268    'L_EDIT_COMMENT'     => l10n('description'),
     269    'L_EDIT_STATUS'      => l10n('conf_access'),
     270    'L_STATUS_PUBLIC'    => l10n('public'),
     271    'L_STATUS_PRIVATE'   => l10n('private'),
     272    'L_EDIT_LOCK'        => l10n('lock'),
     273    'L_EDIT_UPLOADABLE'  => l10n('editcat_uploadable'),
     274    'L_EDIT_COMMENTABLE' => l10n('comments'),
     275    'L_YES'              => l10n('yes'),
     276    'L_NO'               => l10n('no'),
     277    'L_SUBMIT'           => l10n('submit'),
     278    'L_SET_RANDOM_REPRESENTANT'=>l10n('cat_representant'),
    279279
    280280    'U_JUMPTO' => make_index_url(
  • branches/branch-1_7/admin/cat_options.php

    r1962 r2202  
    155155$template->assign_vars(
    156156  array(
    157     'L_SUBMIT'=>$lang['submit'],
    158     'L_RESET'=>$lang['reset'],
     157    'L_SUBMIT'=>l10n('submit'),
     158    'L_RESET'=>l10n('reset'),
    159159
    160160    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_options',
     
    239239    $template->assign_vars(
    240240      array(
    241         'L_SECTION' => $lang['cat_upload_title'],
    242         'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
    243         'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
     241        'L_SECTION' => l10n('cat_upload_title'),
     242        'L_CAT_OPTIONS_TRUE' => l10n('authorized'),
     243        'L_CAT_OPTIONS_FALSE' => l10n('forbidden'),
    244244        )
    245245      );
     
    260260    $template->assign_vars(
    261261      array(
    262         'L_SECTION' => $lang['cat_comments_title'],
    263         'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
    264         'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
     262        'L_SECTION' => l10n('cat_comments_title'),
     263        'L_CAT_OPTIONS_TRUE' => l10n('authorized'),
     264        'L_CAT_OPTIONS_FALSE' => l10n('forbidden'),
    265265        )
    266266      );
     
    281281    $template->assign_vars(
    282282      array(
    283         'L_SECTION' => $lang['cat_lock_title'],
    284         'L_CAT_OPTIONS_TRUE' => $lang['unlocked'],
    285         'L_CAT_OPTIONS_FALSE' => $lang['locked'],
     283        'L_SECTION' => l10n('cat_lock_title'),
     284        'L_CAT_OPTIONS_TRUE' => l10n('unlocked'),
     285        'L_CAT_OPTIONS_FALSE' => l10n('locked'),
    286286        )
    287287      );
     
    302302    $template->assign_vars(
    303303      array(
    304         'L_SECTION' => $lang['cat_status_title'],
    305         'L_CAT_OPTIONS_TRUE' => $lang['cat_public'],
    306         'L_CAT_OPTIONS_FALSE' => $lang['cat_private'],
     304        'L_SECTION' => l10n('cat_status_title'),
     305        'L_CAT_OPTIONS_TRUE' => l10n('cat_public'),
     306        'L_CAT_OPTIONS_FALSE' => l10n('cat_private'),
    307307        )
    308308      );
  • branches/branch-1_7/admin/configuration.php

    r2020 r2202  
    8181      if ( !url_is_remote($_POST['gallery_url']) )
    8282      {
    83         array_push($page['errors'], $lang['conf_gallery_url_error']);
     83        array_push($page['errors'], l10n('conf_gallery_url_error'));
    8484      }
    8585      foreach( $main_checkboxes as $checkbox)
     
    105105           or $_POST['nb_comment_page'] > 50)
    106106      {
    107         array_push($page['errors'], $lang['conf_nb_comment_page_error']);
     107        array_push($page['errors'], l10n('conf_nb_comment_page_error'));
    108108      }
    109109      foreach( $comments_checkboxes as $checkbox)
     
    147147      }
    148148    }
    149     array_push($page['infos'], $lang['conf_confirmation']);
     149    array_push($page['infos'], l10n('conf_confirmation'));
    150150  }
    151151
     
    192192$template->assign_vars(
    193193  array(
    194     'L_YES'=>$lang['yes'],
    195     'L_NO'=>$lang['no'],
    196     'L_SUBMIT'=>$lang['submit'],
    197     'L_RESET'=>$lang['reset'],
     194    'L_YES'=>l10n('yes'),
     195    'L_NO'=>l10n('no'),
     196    'L_SUBMIT'=>l10n('submit'),
     197    'L_RESET'=>l10n('reset'),
    198198
    199199    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=configuration',
     
    281281        // Reload user
    282282        $edit_user = build_user($conf['default_user_id'], false);
    283         array_push($page['infos'], $lang['conf_confirmation']);
     283        array_push($page['infos'], l10n('conf_confirmation'));
    284284      }
    285285    }
  • branches/branch-1_7/admin/element_set.php

    r1900 r2202  
    125125else if ('caddie' == $_GET['cat'])
    126126{
    127   $page['title'] = $lang['caddie'];
     127  $page['title'] = l10n('caddie');
    128128 
    129129  $query = '
  • branches/branch-1_7/admin/element_set_global.php

    r1959 r2202  
    206206    'CATEGORIES_NAV'=>$page['title'],
    207207
    208     'L_SUBMIT'=>$lang['submit'],
     208    'L_SUBMIT'=>l10n('submit'),
    209209
    210210    'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),
  • branches/branch-1_7/admin/element_set_unit.php

    r1900 r2202  
    141141    'CATEGORIES_NAV'=>$page['title'],
    142142
    143     'L_SUBMIT'=>$lang['submit'],
     143    'L_SUBMIT'=>l10n('submit'),
    144144
    145145    'U_ELEMENTS_PAGE'
  • branches/branch-1_7/admin/group_list.php

    r1962 r2202  
    8888  if (empty($_POST['groupname']))
    8989  {
    90     array_push($page['errors'], $lang['group_add_error1']);
     90    array_push($page['errors'], l10n('group_add_error1'));
    9191  }
    9292  if (count($page['errors']) == 0)
     
    101101    if ($count != 0)
    102102    {
    103       array_push($page['errors'], $lang['group_add_error2']);
     103      array_push($page['errors'], l10n('group_add_error2'));
    104104    }
    105105  }
  • branches/branch-1_7/admin/group_perm.php

    r1900 r2202  
    142142          )
    143143        ),
    144     'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
    145     'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
    146     'L_CAT_OPTIONS_INFO'=>$lang['permuser_info'],
     144    'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
     145    'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
     146    'L_CAT_OPTIONS_INFO'=>l10n('permuser_info'),
    147147   
    148148    'F_ACTION' =>
  • branches/branch-1_7/admin/history.php

    r2179 r2202  
    142142  else
    143143  {
    144     array_push($page['errors'], $lang['search_one_clause_at_least']);
     144    array_push($page['errors'], l10n('search_one_clause_at_least'));
    145145  }
    146146}
  • branches/branch-1_7/admin/picture_modify.php

    r1900 r2202  
    6666    )
    6767  {
    68     array_push($page['errors'], $lang['err_date']);
     68    array_push($page['errors'], l10n('err_date'));
    6969  }
    7070}
  • branches/branch-1_7/admin/thumbnail.php

    r1900 r2202  
    120120    if (!is_writable($tndir))
    121121    {
    122       array_push($page['errors'], '['.$tndir.'] : '.$lang['no_write_access']);
     122      array_push($page['errors'], '['.$tndir.'] : '.l10n('no_write_access'));
    123123      return false;
    124124    }
     
    141141  else
    142142  {
    143     echo $lang['tn_no_support']." ";
     143    echo l10n('tn_no_support')." ";
    144144    if ( isset( $extenstion ) )
    145145    {
    146       echo $lang['tn_format'].' '.$extension;
     146      echo l10n('tn_format').' '.$extension;
    147147    }
    148148    else
    149149    {
    150       echo $lang['tn_thisformat'];
     150      echo l10n('tn_thisformat');
    151151    }
    152152    exit();
     
    162162
    163163$template->assign_vars(array(
    164   'L_THUMBNAIL_TITLE'=>$lang['tn_dirs_title'],
    165   'L_UNLINK'=>$lang['tn_no_missing'],
    166   'L_MISSING_THUMBNAILS'=>$lang['tn_dirs_alone'],
    167   'L_RESULTS'=>$lang['tn_results_title'],
    168   'L_PATH'=>$lang['path'],
    169   'L_FILESIZE'=>$lang['filesize'],
    170   'L_GENERATED'=>$lang['tn_results_gen_time'],
    171   'L_THUMBNAIL'=>$lang['thumbnail'],
    172   'L_PARAMS'=>$lang['tn_params_title'],
    173   'L_GD'=>$lang['tn_params_GD'],
    174   'L_CREATE'=>$lang['tn_params_create'],
    175   'L_SUBMIT'=>$lang['submit'],
    176   'L_REMAINING'=>$lang['tn_alone_title'],
    177   'L_TN_STATS'=>$lang['tn_stats'],
    178   'L_TN_NB_STATS'=>$lang['tn_stats_nb'],
    179   'L_TN_TOTAL'=>$lang['tn_stats_total'],
    180   'L_TN_MAX'=>$lang['tn_stats_max'],
    181   'L_TN_MIN'=>$lang['tn_stats_min'],
    182   'L_TN_AVERAGE'=>$lang['tn_stats_mean'],
    183   'L_ALL'=>$lang['tn_all'],
     164  'L_THUMBNAIL_TITLE'=>l10n('tn_dirs_title'),
     165  'L_UNLINK'=>l10n('tn_no_missing'),
     166  'L_MISSING_THUMBNAILS'=>l10n('tn_dirs_alone'),
     167  'L_RESULTS'=>l10n('tn_results_title'),
     168  'L_PATH'=>l10n('path'),
     169  'L_FILESIZE'=>l10n('filesize'),
     170  'L_GENERATED'=>l10n('tn_results_gen_time'),
     171  'L_THUMBNAIL'=>l10n('thumbnail'),
     172  'L_PARAMS'=>l10n('tn_params_title'),
     173  'L_GD'=>l10n('tn_params_GD'),
     174  'L_CREATE'=>l10n('tn_params_create'),
     175  'L_SUBMIT'=>l10n('submit'),
     176  'L_REMAINING'=>l10n('tn_alone_title'),
     177  'L_TN_STATS'=>l10n('tn_stats'),
     178  'L_TN_NB_STATS'=>l10n('tn_stats_nb'),
     179  'L_TN_TOTAL'=>l10n('tn_stats_total'),
     180  'L_TN_MAX'=>l10n('tn_stats_max'),
     181  'L_TN_MIN'=>l10n('tn_stats_min'),
     182  'L_TN_AVERAGE'=>l10n('tn_stats_mean'),
     183  'L_ALL'=>l10n('tn_all'),
    184184
    185185  'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=thumbnail',
     
    255255  if (!ereg('^[0-9]{2,3}$', $_POST['width']) or $_POST['width'] < 10)
    256256  {
    257     array_push($page['errors'], $lang['tn_err_width'].' 10');
     257    array_push($page['errors'], l10n('tn_err_width').' 10');
    258258  }
    259259  if (!ereg('^[0-9]{2,3}$', $_POST['height']) or $_POST['height'] < 10)
    260260  {
    261     array_push($page['errors'], $lang['tn_err_height'].' 10');
     261    array_push($page['errors'], l10n('tn_err_height').' 10');
    262262  }
    263263 
  • branches/branch-1_7/admin/user_list.php

    r2177 r2202  
    178178
    179179$page['order_by_items'] = array(
    180   'id' => $lang['registration_date'],
    181   'username' => $lang['Username']
     180  'id' => l10n('registration_date'),
     181  'username' => l10n('Username')
    182182  );
    183183
    184184$page['direction_items'] = array(
    185   'asc' => $lang['ascending'],
    186   'desc' => $lang['descending']
     185  'asc' => l10n('ascending'),
     186  'desc' => l10n('descending')
    187187  );
    188188
     
    835835      'PROPERTIES' =>
    836836        (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
    837         ? $lang['is_high_enabled'] : $lang['is_high_disabled']
     837        ? l10n('is_high_enabled') : l10n('is_high_disabled')
    838838      )
    839839    );
  • branches/branch-1_7/admin/user_perm.php

    r1900 r2202  
    135135          )
    136136        ),
    137     'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
    138     'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
     137    'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
     138    'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
    139139
    140140    'F_ACTION' =>
  • branches/branch-1_7/admin/ws_checker.php

    r1900 r2202  
    158158    'update_result',
    159159    array(
    160       'UPD_ELEMENT'=> $lang['ws_adding_legend'].$lang['ws_success_upd'],
     160      'UPD_ELEMENT'=> l10n('ws_adding_legend').l10n('ws_success_upd'),
    161161      )
    162162  );
     
    180180      'update_result',
    181181      array(
    182         'UPD_ELEMENT'=> $lang['ws_update_legend'].$lang['ws_success_upd'],
     182        'UPD_ELEMENT'=> l10n('ws_update_legend').l10n('ws_success_upd'),
    183183        )
    184184    );
     
    187187      'update_result',
    188188      array(
    189         'UPD_ELEMENT'=> $lang['ws_update_legend'].$lang['ws_failed_upd'],
     189        'UPD_ELEMENT'=> l10n('ws_update_legend').l10n('ws_failed_upd'),
    190190        )
    191191    );
     
    206206      'update_result',
    207207      array(
    208         'UPD_ELEMENT'=> $lang['ws_delete_legend'].$lang['ws_success_upd'],
     208        'UPD_ELEMENT'=> l10n('ws_delete_legend').l10n('ws_success_upd'),
    209209        )
    210210    );
     
    213213      'update_result',
    214214      array(
    215         'UPD_ELEMENT'=> $lang['Not selected / Not confirmed']
    216         .$lang['ws_failed_upd'],
     215        'UPD_ELEMENT'=> l10n('Not selected / Not confirmed')
     216        .l10n('ws_failed_upd'),
    217217        )
    218218    );
  • branches/branch-1_7/include/category_cats.inc.php

    r2174 r2202  
    202202          'SRC'   => $thumbnail_src_of[$category['representative_picture_id']],
    203203          'ALT'   => $category['name'],
    204           'TITLE' => $lang['hint_category'],
     204          'TITLE' => l10n('hint_category'),
    205205          'ICON'  => $icon_ts,
    206206
  • branches/branch-1_7/include/common.inc.php

    r2118 r2202  
    169169if ($user['is_the_guest'])
    170170{
    171   $user['username'] = $lang['guest'];
     171  $user['username'] = l10n('guest');
    172172}
    173173
     
    198198if ($conf['gallery_locked'])
    199199{
    200   $header_msgs[] = $lang['gallery_locked_message'];
     200  $header_msgs[] = l10n('gallery_locked_message');
    201201
    202202  if ( script_basename() != 'identification' and !is_admin() )
    203203  {
    204     echo $lang['gallery_locked_message']
     204    echo l10n('gallery_locked_message')
    205205      .'<a href="'.get_absolute_root_url(false).'identification.php">.</a>';
    206206    exit();
     
    233233if (is_adviser())
    234234{
    235   $header_msgs[] = $lang['adviser_mode_enabled'];
     235  $header_msgs[] = l10n('adviser_mode_enabled');
    236236}
    237237
  • branches/branch-1_7/include/functions_html.inc.php

    r2181 r2202  
    5555    {
    5656      $icons = array(false => 'recent', true => 'recent_by_child' );
    57       $title = $lang['recent_image'].'&nbsp;'.$user['recent_period']
    58           .'&nbsp;'.$lang['days'];
     57      $title = l10n('recent_image').'&nbsp;'.$user['recent_period']
     58          .'&nbsp;'.l10n('days');
    5959      foreach ($icons as $key => $icon)
    6060      {
     
    107107      $navbar.=
    108108        '<a href="'.$url.'" rel="start">'
    109         .$lang['first_page']
     109        .l10n('first_page')
    110110        .'</a>';
    111111    }
    112112    else
    113113    {
    114       $navbar.= $lang['first_page'];
     114      $navbar.= l10n('first_page');
    115115    }
    116116    $navbar.= ' | ';
     
    124124        .$url.($previous > 0 ? $start_str.$previous : '')
    125125        .'" rel="prev">'
    126         .$lang['previous_page']
     126        .l10n('previous_page')
    127127        .'</a>';
    128128    }
    129129    else
    130130    {
    131       $navbar.= $lang['previous_page'];
     131      $navbar.= l10n('previous_page');
    132132    }
    133133    $navbar.= ' |';
     
    195195      $navbar.=
    196196        '<a href="'.$url.$start_str.$next.'" rel="next">'
    197         .$lang['next_page']
     197        .l10n('next_page')
    198198        .'</a>';
    199199    }
    200200    else
    201201    {
    202       $navbar.= $lang['next_page'];
     202      $navbar.= l10n('next_page');
    203203    }
    204204
     
    211211      $navbar.=
    212212        '<a href="'.$url.$start_str.$temp_start.'" rel="last">'
    213         .$lang['last_page']
     213        .l10n('last_page')
    214214        .'</a>';
    215215    }
    216216    else
    217217    {
    218       $navbar.= $lang['last_page'];
     218      $navbar.= l10n('last_page');
    219219    }
    220220  }
     
    567567  if ( isset($user['is_the_guest']) and !$user['is_the_guest'] )
    568568  {
    569     echo '<div style="text-align:center;">'.$lang['access_forbiden'].'<br />';
    570     echo '<a href="'.get_root_url().'identification.php">'.$lang['identification'].'</a>&nbsp;';
    571     echo '<a href="'.make_index_url().'">'.$lang['home'].'</a></div>';
     569    echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br />';
     570    echo '<a href="'.get_root_url().'identification.php">'.l10n('identification').'</a>&nbsp;';
     571    echo '<a href="'.make_index_url().'">'.l10n('home').'</a></div>';
    572572    exit();
    573573  }
  • branches/branch-1_7/include/menubar.inc.php

    r1932 r2202  
    172172    array(
    173173      'URL' => make_index_url(array('section' => 'favorites')),
    174       'TITLE' => $lang['favorite_cat_hint'],
    175       'NAME' => $lang['favorite_cat']
     174      'TITLE' => l10n('favorite_cat_hint'),
     175      'NAME' => l10n('favorite_cat')
    176176      ));
    177177}
     
    181181  array(
    182182    'URL' => make_index_url(array('section' => 'most_visited')),
    183     'TITLE' => $lang['most_visited_cat_hint'],
    184     'NAME' => $lang['most_visited_cat']
     183    'TITLE' => l10n('most_visited_cat_hint'),
     184    'NAME' => l10n('most_visited_cat')
    185185    ));
    186186// best rated
     
    191191    array(
    192192      'URL' => make_index_url(array('section' => 'best_rated')),
    193       'TITLE' => $lang['best_rated_cat_hint'],
    194       'NAME' => $lang['best_rated_cat']
     193      'TITLE' => l10n('best_rated_cat_hint'),
     194      'NAME' => l10n('best_rated_cat')
    195195      )
    196196    );
     
    201201  array(
    202202    'URL' => get_root_url().'random.php',
    203     'TITLE' => $lang['random_cat_hint'],
    204     'NAME' => $lang['random_cat'],
     203    'TITLE' => l10n('random_cat_hint'),
     204    'NAME' => l10n('random_cat'),
    205205    'REL'=> 'rel="nofollow"'
    206206    ));
     
    211211  array(
    212212    'URL' => make_index_url(array('section' => 'recent_pics')),
    213     'TITLE' => $lang['recent_pics_cat_hint'],
    214     'NAME' => $lang['recent_pics_cat'],
     213    'TITLE' => l10n('recent_pics_cat_hint'),
     214    'NAME' => l10n('recent_pics_cat'),
    215215    ));
    216216// recent cats
     
    219219  array(
    220220    'URL' => make_index_url(array('section' => 'recent_cats')),
    221     'TITLE' => $lang['recent_cats_cat_hint'],
    222     'NAME' => $lang['recent_cats_cat'],
     221    'TITLE' => l10n('recent_cats_cat_hint'),
     222    'NAME' => l10n('recent_cats_cat'),
    223223    ));
    224224
     
    236236        )
    237237      ),
    238     'TITLE' => $lang['calendar_hint'],
    239     'NAME' => $lang['calendar'],
     238    'TITLE' => l10n('calendar_hint'),
     239    'NAME' => l10n('calendar'),
    240240    'REL'=> 'rel="nofollow"'
    241241    )
     
    294294  'summary',
    295295  array(
    296     'TITLE'=>$lang['hint_search'],
    297     'NAME'=>$lang['search'],
     296    'TITLE'=>l10n('hint_search'),
     297    'NAME'=>l10n('search'),
    298298    'U_SUMMARY'=> get_root_url().'search.php',
    299299    'REL'=> 'rel="search"'
     
    306306  'summary',
    307307  array(
    308     'TITLE'=>$lang['hint_comments'],
    309     'NAME'=>$lang['comments'],
     308    'TITLE'=>l10n('hint_comments'),
     309    'NAME'=>l10n('comments'),
    310310    'U_SUMMARY'=> get_root_url().'comments.php',
    311311    )
     
    316316  'summary',
    317317  array(
    318     'TITLE'     => $lang['about_page_title'],
    319     'NAME'      => $lang['About'],
     318    'TITLE'     => l10n('about_page_title'),
     319    'NAME'      => l10n('About'),
    320320    'U_SUMMARY' => get_root_url().'about.php',
    321321    )
  • branches/branch-1_7/include/page_tail.php

    r1900 r2202  
    3434    'PHPWG_URL' => PHPWG_URL,
    3535
    36     'L_TITLE_MAIL' => urlencode($lang['title_send_mail']),
     36    'L_TITLE_MAIL' => urlencode(l10n('title_send_mail')),
    3737    ));
    3838
  • branches/branch-1_7/include/picture_rate.inc.php

    r1900 r2202  
    4343  if ($row['count'] == 0)
    4444  {
    45     $value = $lang['no_rate'];
     45    $value = l10n('no_rate');
    4646  }
    4747  else
  • branches/branch-1_7/include/section_init.inc.php

    r2174 r2202  
    218218  else
    219219  {
    220     $page['title'] = $lang['no_category'];
     220    $page['title'] = l10n('no_category');
    221221  }
    222222
     
    338338      array(
    339339        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    340                   .$lang['search_result'].'</a>',
     340                  .l10n('search_result').'</a>',
    341341        )
    342342      );
     
    368368      $page,
    369369      array(
    370         'title' => $lang['favorites'],
     370        'title' => l10n('favorites'),
    371371        'items' => array_from_query($query, 'image_id'),
    372372        )
     
    393393      array(
    394394        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    395                   .$lang['recent_pics_cat'].'</a>',
     395                  .l10n('recent_pics_cat').'</a>',
    396396        'items' => array_from_query($query, 'id'),
    397397        )
     
    406406      $page,
    407407      array(
    408         'title' => $lang['recent_cats_cat'],
     408        'title' => l10n('recent_cats_cat'),
    409409        )
    410410      );
     
    431431      array(
    432432        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    433                   .$conf['top_number'].' '.$lang['most_visited_cat'].'</a>',
     433                  .$conf['top_number'].' '.l10n('most_visited_cat').'</a>',
    434434        'items' => array_from_query($query, 'id'),
    435435        )
     
    457457      array(
    458458        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    459                   .$conf['top_number'].' '.$lang['best_rated_cat'].'</a>',
     459                  .$conf['top_number'].' '.l10n('best_rated_cat').'</a>',
    460460        'items' => array_from_query($query, 'id'),
    461461        )
     
    480480      array(
    481481        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    482                     .$lang['random_cat'].'</a>',
     482                    .l10n('random_cat').'</a>',
    483483        'items' => array_from_query($query, 'id'),
    484484        )
  • branches/branch-1_7/install.php

    r2188 r2202  
    243243    if ( @mysql_select_db($_POST['dbname'] ) )
    244244    {
    245       array_push( $infos, $lang['step1_confirmation'] );
     245      array_push( $infos, l10n('step1_confirmation') );
    246246    }
    247247    else
    248248    {
    249       array_push( $errors, $lang['step1_err_db'] );
     249      array_push( $errors, l10n('step1_err_db') );
    250250    }
    251251  }
    252252  else
    253253  {
    254     array_push( $errors, $lang['step1_err_server'] );
     254    array_push( $errors, l10n('step1_err_server') );
    255255  }
    256256 
    257257  $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
    258258  if ( empty($webmaster))
    259     array_push( $errors, $lang['step2_err_login1'] );
     259    array_push( $errors, l10n('step2_err_login1') );
    260260  else if ( preg_match( '/[\'"]/', $webmaster ) )
    261     array_push( $errors, $lang['step2_err_login3'] );
     261    array_push( $errors, l10n('step2_err_login3') );
    262262  if ( $admin_pass1 != $admin_pass2 || empty($admin_pass1) )
    263     array_push( $errors, $lang['step2_err_pass'] );
     263    array_push( $errors, l10n('step2_err_pass') );
    264264  if ( empty($admin_mail))
    265     array_push( $errors, $lang['reg_err_mail_address'] );
     265    array_push( $errors, l10n('reg_err_mail_address') );
    266266  else
    267267  {
     
    372372    'RELEASE'=>PHPWG_VERSION,
    373373 
    374     'L_BASE_TITLE'=>$lang['Initial_config'],
    375     'L_LANG_TITLE'=>$lang['Default_lang'],
    376     'L_DB_TITLE'=>$lang['step1_title'],
    377     'L_DB_HOST'=>$lang['step1_host'],
    378     'L_DB_HOST_INFO'=>$lang['step1_host_info'],
    379     'L_DB_USER'=>$lang['step1_user'],
    380     'L_DB_USER_INFO'=>$lang['step1_user_info'],
    381     'L_DB_PASS'=>$lang['step1_pass'],
    382     'L_DB_PASS_INFO'=>$lang['step1_pass_info'],
    383     'L_DB_NAME'=>$lang['step1_database'],
    384     'L_DB_NAME_INFO'=>$lang['step1_database_info'],
    385     'L_DB_PREFIX'=>$lang['step1_prefix'],
    386     'L_DB_PREFIX_INFO'=>$lang['step1_prefix_info'],
    387     'L_ADMIN_TITLE'=>$lang['step2_title'],
    388     'L_ADMIN'=>$lang['install_webmaster'],
    389     'L_ADMIN_INFO'=>$lang['install_webmaster_info'],
    390     'L_ADMIN_PASSWORD'=>$lang['step2_pwd'],
    391     'L_ADMIN_PASSWORD_INFO'=>$lang['step2_pwd_info'],
    392     'L_ADMIN_CONFIRM_PASSWORD'=>$lang['step2_pwd_conf'],
    393     'L_ADMIN_CONFIRM_PASSWORD_INFO'=>$lang['step2_pwd_conf_info'],
    394     'L_ADMIN_EMAIL'=>$lang['conf_mail_webmaster'],
    395     'L_ADMIN_EMAIL_INFO'=>$lang['conf_mail_webmaster_info'],
    396     'L_SUBMIT'=>$lang['Start_Install'],
    397     'L_INSTALL_HELP'=>sprintf($lang['install_help'], 'http://forum.'.PHPWG_DOMAIN.'/'),
    398     'L_ERR_COPY'=>$lang['step1_err_copy'],
    399     'L_END_TITLE'=>$lang['install_end_title'],
    400     'L_END_MESSAGE'=>$lang['install_end_message'],
     374    'L_BASE_TITLE'=>l10n('Initial_config'),
     375    'L_LANG_TITLE'=>l10n('Default_lang'),
     376    'L_DB_TITLE'=>l10n('step1_title'),
     377    'L_DB_HOST'=>l10n('step1_host'),
     378    'L_DB_HOST_INFO'=>l10n('step1_host_info'),
     379    'L_DB_USER'=>l10n('step1_user'),
     380    'L_DB_USER_INFO'=>l10n('step1_user_info'),
     381    'L_DB_PASS'=>l10n('step1_pass'),
     382    'L_DB_PASS_INFO'=>l10n('step1_pass_info'),
     383    'L_DB_NAME'=>l10n('step1_database'),
     384    'L_DB_NAME_INFO'=>l10n('step1_database_info'),
     385    'L_DB_PREFIX'=>l10n('step1_prefix'),
     386    'L_DB_PREFIX_INFO'=>l10n('step1_prefix_info'),
     387    'L_ADMIN_TITLE'=>l10n('step2_title'),
     388    'L_ADMIN'=>l10n('install_webmaster'),
     389    'L_ADMIN_INFO'=>l10n('install_webmaster_info'),
     390    'L_ADMIN_PASSWORD'=>l10n('step2_pwd'),
     391    'L_ADMIN_PASSWORD_INFO'=>l10n('step2_pwd_info'),
     392    'L_ADMIN_CONFIRM_PASSWORD'=>l10n('step2_pwd_conf'),
     393    'L_ADMIN_CONFIRM_PASSWORD_INFO'=>l10n('step2_pwd_conf_info'),
     394    'L_ADMIN_EMAIL'=>l10n('conf_mail_webmaster'),
     395    'L_ADMIN_EMAIL_INFO'=>l10n('conf_mail_webmaster_info'),
     396    'L_SUBMIT'=>l10n('Start_Install'),
     397    'L_INSTALL_HELP'=>sprintf(l10n('install_help'), 'http://forum.'.PHPWG_DOMAIN.'/'),
     398    'L_ERR_COPY'=>l10n('step1_err_copy'),
     399    'L_END_TITLE'=>l10n('install_end_title'),
     400    'L_END_MESSAGE'=>l10n('install_end_message'),
    401401   
    402402    'F_ACTION'=>'install.php',
Note: See TracChangeset for help on using the changeset viewer.