adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-12 03:33:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace old use of $lang by l10n function.

Browse Source 
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
This commit is contained in:
rub
2008-01-30 22:16:01 +00:00
parent 49b663ecec
commit 7bb12f4f48
23 changed files with 177 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/category_cats.inc.php
+1 -1
View File
@@ -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(
include/common.inc.php
+4 -4
View File
@@ -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')
.'<a href="'.get_absolute_root_url(false).'identification.php">.</a>';
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)
include/functions_html.inc.php
+13 -13
View File
@@ -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'].'&nbsp;'.$user['recent_period']
.'&nbsp;'.$lang['days'];
$title = l10n('recent_image').'&nbsp;'.$user['recent_period']
.'&nbsp;'.l10n('days');
foreach ($icons as $key => $icon)
{
$icon_url = get_themeconf('icon_dir').'/'.$icon.'.png';
@@ -106,12 +106,12 @@ function create_navigation_bar(
{
$navbar.=
'<a href="'.$url.'" rel="start">'
.$lang['first_page']
.l10n('first_page')
.'</a>';
}
else
{
$navbar.= $lang['first_page'];
$navbar.= l10n('first_page');
}
$navbar.= ' | ';
// link on previous page ?
@@ -123,12 +123,12 @@ function create_navigation_bar(
'<a href="'
.$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.= ' |';
@@ -194,12 +194,12 @@ function create_navigation_bar(
$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');
}
$navbar.= ' | ';
@@ -210,12 +210,12 @@ function create_navigation_bar(
$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');
}
}
return $navbar;
@@ -566,9 +566,9 @@ function access_denied()
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();
}
else
include/menubar.inc.php
+20 -20
View File
@@ -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',
)
);
include/page_tail.php
+1 -1
View File
@@ -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
include/picture_rate.inc.php
+1 -1
View File
@@ -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
{
include/section_init.inc.php
+8 -8
View File
@@ -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' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$lang['search_result'].'</a>',
.l10n('search_result').'</a>',
)
);
}
@@ -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' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$lang['recent_pics_cat'].'</a>',
.l10n('recent_pics_cat').'</a>',
'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' => '<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'),
)
);
@@ -456,7 +456,7 @@ SELECT DISTINCT(id)
$page,
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'),
)
);
@@ -479,7 +479,7 @@ SELECT DISTINCT(id)
$page,
array(
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$lang['random_cat'].'</a>',
.l10n('random_cat').'</a>',
'items' => array_from_query($query, 'id'),
)
);