aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddtddt <ddtddt@piwigo.org>2012-05-28 14:22:19 +0000
committerddtddt <ddtddt@piwigo.org>2012-05-28 14:22:19 +0000
commitfcd83e78399af866fc8501702b1af055b7630898 (patch)
tree4b6204c3c6c0445cc0a66f58cf120f9079ca694e
parent931483970ad884c472fc92b1bcf5a80ccdb80c21 (diff)
[trunk] - l10n page no found message 1
git-svn-id: http://piwigo.org/svn/trunk@15381 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_html.inc.php11
-rw-r--r--language/en_UK/common.lang.php5
-rw-r--r--language/fr_FR/common.lang.php4
3 files changed, 16 insertions, 4 deletions
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 84a4a8f05..ae9eb1bb0 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -342,11 +342,12 @@ function access_denied()
function page_forbidden($msg, $alternate_url=null)
{
set_status_header(403);
+ $forbidden=l10n('Forbidden');
if ($alternate_url==null)
$alternate_url = make_index_url();
redirect_html( $alternate_url,
'<div style="text-align:left; margin-left:5em;margin-bottom:5em;">
-<h1 style="text-align:left; font-size:36px;">Forbidden</h1><br>'
+<h1 style="text-align:left; font-size:36px;">'.$forbidden.'</h1><br>'
.$msg.'</div>',
5 );
}
@@ -359,11 +360,12 @@ function page_forbidden($msg, $alternate_url=null)
function bad_request($msg, $alternate_url=null)
{
set_status_header(400);
+ $bad=l10n('Bad request');
if ($alternate_url==null)
$alternate_url = make_index_url();
redirect_html( $alternate_url,
'<div style="text-align:left; margin-left:5em;margin-bottom:5em;">
-<h1 style="text-align:left; font-size:36px;">Bad request</h1><br>'
+<h1 style="text-align:left; font-size:36px;">'.$bad.'</h1><br>'
.$msg.'</div>',
5 );
}
@@ -376,11 +378,12 @@ function bad_request($msg, $alternate_url=null)
function page_not_found($msg, $alternate_url=null)
{
set_status_header(404);
+ $found=l10n('Page not found');
if ($alternate_url==null)
$alternate_url = make_index_url();
redirect_html( $alternate_url,
'<div style="text-align:left; margin-left:5em;margin-bottom:5em;">
-<h1 style="text-align:left; font-size:36px;">Page not found</h1><br>'
+<h1 style="text-align:left; font-size:36px;">'.$found.'</h1><br>'
.$msg.'</div>',
5 );
}
@@ -394,7 +397,7 @@ function fatal_error($msg, $title=null, $show_trace=true)
{
if (empty($title))
{
- $title = 'Piwigo encountered a non recoverable error';
+ $title = l10n('Piwigo encountered a non recoverable error');
}
$btrace_msg = '';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 4b684df09..dd0d1d27f 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -404,4 +404,9 @@ $lang['Numeric identifier, 1 &rarr; 9'] = 'Numeric identifier, 1 &rarr; 9';
$lang['Numeric identifier, 9 &rarr; 1'] = 'Numeric identifier, 9 &rarr; 1';
$lang['Manual sort order'] = 'Manual sort order';
$lang['%d rate'] = '%d rate';
+$lang['Page not found'] = 'Page not found';
+$lang['Bad request'] = 'Bad request';
+$lang['Forbidden'] = 'Forbidden';
+$lang['Piwigo encountered a non recoverable error'] = 'Piwigo encountered a non recoverable error';
+$lang['Requested album does not exist'] = 'Requested album does not exist';
?> \ No newline at end of file
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index f3f2753a5..93aec3b39 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -404,4 +404,8 @@ $lang['Rating score, low &rarr; high'] = 'Note, basse &rarr; haute';
$lang['Visits, high &rarr; low'] = 'Nombre de visites, élevé &rarr; faible';
$lang['Visits, low &rarr; high'] = 'Nombre de visites, faible &rarr; élevé';
$lang['%d rate'] = '%d note';
+$lang['Page not found'] = 'Page non trouvée';
+$lang['Bad request'] = 'Mauvaise requête';
+$lang['Forbidden'] = 'Interdit';
+$lang['Requested album does not exist'] = 'L\'album demandé n\'existe pas';
?>