From 7bb12f4f481639547b7aabd38eb044eb1f942c66 Mon Sep 17 00:00:00 2001 From: rub Date: Wed, 30 Jan 2008 22:16:01 +0000 Subject: Replace old use of $lang by l10n function. Merge BSF 2200:2201 into branch-1_7 git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2202 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/category_cats.inc.php | 2 +- include/common.inc.php | 8 ++++---- include/functions_html.inc.php | 26 +++++++++++++------------- include/menubar.inc.php | 40 ++++++++++++++++++++-------------------- include/page_tail.php | 2 +- include/picture_rate.inc.php | 2 +- include/section_init.inc.php | 16 ++++++++-------- 7 files changed, 48 insertions(+), 48 deletions(-) (limited to 'include') diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php index a389a1595..83acade3b 100644 --- a/include/category_cats.inc.php +++ b/include/category_cats.inc.php @@ -201,7 +201,7 @@ if (count($categories) > 0) array( 'SRC' => $thumbnail_src_of[$category['representative_picture_id']], 'ALT' => $category['name'], - 'TITLE' => $lang['hint_category'], + 'TITLE' => l10n('hint_category'), 'ICON' => $icon_ts, 'URL' => make_index_url( diff --git a/include/common.inc.php b/include/common.inc.php index 00e68e646..f4fafa1c3 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -168,7 +168,7 @@ trigger_action('loading_lang'); // include/user.inc.php) if ($user['is_the_guest']) { - $user['username'] = $lang['guest']; + $user['username'] = l10n('guest'); } // template instance @@ -197,11 +197,11 @@ if (isset($user['internal_status']['guest_must_be_guest']) 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') .'.'; exit(); } @@ -232,7 +232,7 @@ SELECT id if (is_adviser()) { - $header_msgs[] = $lang['adviser_mode_enabled']; + $header_msgs[] = l10n('adviser_mode_enabled'); } if (count($header_msgs) > 0) diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 4fdbcf04a..0d5ae0d29 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -54,8 +54,8 @@ function get_icon($date, $is_child_date = false) if ( !isset($page['get_icon_cache']['_icons_'] ) ) { $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) { $icon_url = get_themeconf('icon_dir').'/'.$icon.'.png'; @@ -106,12 +106,12 @@ function create_navigation_bar( { $navbar.= '' - .$lang['first_page'] + .l10n('first_page') .''; } else { - $navbar.= $lang['first_page']; + $navbar.= l10n('first_page'); } $navbar.= ' | '; // link on previous page ? @@ -123,12 +123,12 @@ function create_navigation_bar( ''; } else { - $navbar.= $lang['previous_page']; + $navbar.= l10n('previous_page'); } $navbar.= ' |'; @@ -194,12 +194,12 @@ function create_navigation_bar( $navbar.= ''; } else { - $navbar.= $lang['next_page']; + $navbar.= l10n('next_page'); } $navbar.= ' | '; @@ -210,12 +210,12 @@ function create_navigation_bar( $navbar.= '' - .$lang['last_page'] + .l10n('last_page') .''; } else { - $navbar.= $lang['last_page']; + $navbar.= l10n('last_page'); } } return $navbar; @@ -566,9 +566,9 @@ function access_denied() if ( isset($user['is_the_guest']) and !$user['is_the_guest'] ) { - echo '
'.$lang['access_forbiden'].'
'; - echo ''.$lang['identification'].' '; - echo ''.$lang['home'].'
'; + echo '
'.l10n('access_forbiden').'
'; + echo ''.l10n('identification').' '; + echo ''.l10n('home').'
'; exit(); } else diff --git a/include/menubar.inc.php b/include/menubar.inc.php index aa3f490ca..604b66a49 100644 --- a/include/menubar.inc.php +++ b/include/menubar.inc.php @@ -171,8 +171,8 @@ if ( !$user['is_the_guest'] ) 'special_cat', 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') )); } // most visited @@ -180,8 +180,8 @@ $template->assign_block_vars( 'special_cat', 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 if ($conf['rate']) @@ -190,8 +190,8 @@ if ($conf['rate']) 'special_cat', 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') ) ); } @@ -200,8 +200,8 @@ $template->assign_block_vars( 'special_cat', 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"' )); @@ -210,16 +210,16 @@ $template->assign_block_vars( 'special_cat', 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 $template->assign_block_vars( 'special_cat', 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'), )); // calendar @@ -235,8 +235,8 @@ $template->assign_block_vars( 'chronology_view' => 'calendar' ) ), - 'TITLE' => $lang['calendar_hint'], - 'NAME' => $lang['calendar'], + 'TITLE' => l10n('calendar_hint'), + 'NAME' => l10n('calendar'), 'REL'=> 'rel="nofollow"' ) ); @@ -293,8 +293,8 @@ $template->assign_block_vars( $template->assign_block_vars( '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"' ) @@ -305,8 +305,8 @@ $template->assign_block_vars( 'summary.quick_search', array() ); $template->assign_block_vars( 'summary', array( - 'TITLE'=>$lang['hint_comments'], - 'NAME'=>$lang['comments'], + 'TITLE'=>l10n('hint_comments'), + 'NAME'=>l10n('comments'), 'U_SUMMARY'=> get_root_url().'comments.php', ) ); @@ -315,8 +315,8 @@ $template->assign_block_vars( $template->assign_block_vars( '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', ) ); diff --git a/include/page_tail.php b/include/page_tail.php index 2a03cbd86..6317c9489 100644 --- a/include/page_tail.php +++ b/include/page_tail.php @@ -33,7 +33,7 @@ $template->assign_vars( 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 'PHPWG_URL' => PHPWG_URL, - 'L_TITLE_MAIL' => urlencode($lang['title_send_mail']), + 'L_TITLE_MAIL' => urlencode(l10n('title_send_mail')), )); //--------------------------------------------------------------------- contact diff --git a/include/picture_rate.inc.php b/include/picture_rate.inc.php index 172d02ceb..331cb41b0 100644 --- a/include/picture_rate.inc.php +++ b/include/picture_rate.inc.php @@ -42,7 +42,7 @@ SELECT COUNT(rate) AS count $row = mysql_fetch_array(pwg_query($query)); if ($row['count'] == 0) { - $value = $lang['no_rate']; + $value = l10n('no_rate'); } else { diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 86c1c35c0..cabfae546 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -217,7 +217,7 @@ if ('categories' == $page['section']) } else { - $page['title'] = $lang['no_category']; + $page['title'] = l10n('no_category'); } if @@ -337,7 +337,7 @@ SELECT DISTINCT(id) $page, array( 'title' => '' - .$lang['search_result'].'', + .l10n('search_result').'', ) ); } @@ -367,7 +367,7 @@ SELECT image_id $page = array_merge( $page, array( - 'title' => $lang['favorites'], + 'title' => l10n('favorites'), 'items' => array_from_query($query, 'image_id'), ) ); @@ -392,7 +392,7 @@ SELECT DISTINCT(id) $page, array( 'title' => '' - .$lang['recent_pics_cat'].'', + .l10n('recent_pics_cat').'', 'items' => array_from_query($query, 'id'), ) ); @@ -405,7 +405,7 @@ SELECT DISTINCT(id) $page = array_merge( $page, array( - 'title' => $lang['recent_cats_cat'], + 'title' => l10n('recent_cats_cat'), ) ); } @@ -430,7 +430,7 @@ SELECT DISTINCT(id) $page, array( 'title' => '' - .$conf['top_number'].' '.$lang['most_visited_cat'].'', + .$conf['top_number'].' '.l10n('most_visited_cat').'', 'items' => array_from_query($query, 'id'), ) ); @@ -456,7 +456,7 @@ SELECT DISTINCT(id) $page, array( 'title' => '' - .$conf['top_number'].' '.$lang['best_rated_cat'].'', + .$conf['top_number'].' '.l10n('best_rated_cat').'', 'items' => array_from_query($query, 'id'), ) ); @@ -479,7 +479,7 @@ SELECT DISTINCT(id) $page, array( 'title' => '' - .$lang['random_cat'].'', + .l10n('random_cat').'', 'items' => array_from_query($query, 'id'), ) ); -- cgit v1.2.3