From 4745f491302ee5f6b0bb690a1a16bcecb92666d1 Mon Sep 17 00:00:00 2001 From: patdenice Date: Tue, 20 May 2008 00:58:32 +0000 Subject: Merge from trunk revision 2353. 000819: "First" link was mapped with home navigation button Add trigger_event for menubar.php file in index.php Minor language correction. git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2354 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_html.inc.php | 2 +- index.php | 3 ++- language/fr_FR.iso-8859-1/admin.lang.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 0d5ae0d29..d8bdb833c 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -105,7 +105,7 @@ function create_navigation_bar( if ($cur_page != 1) { $navbar.= - '' + '' .l10n('first_page') .''; } diff --git a/index.php b/index.php index ab21a7e5a..5f2465e20 100644 --- a/index.php +++ b/index.php @@ -167,7 +167,8 @@ else ); } // include menubar -include(PHPWG_ROOT_PATH.'include/menubar.inc.php'); +include(trigger_event('menubar_file', + PHPWG_ROOT_PATH.'include/menubar.inc.php')); $template->assign_vars( array( diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index 30350c717..68da40bce 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -189,7 +189,7 @@ $lang['Tag selection'] = 'S $lang['Take selected elements out of caddie'] = 'Sortir les éléments sélectionnés du panier'; $lang['The %d following tag were deleted'] = 'Le tag suivant a été supprimé'; $lang['The %d following tags were deleted'] = 'Les %d tags suivants ont été supprimés'; -$lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Impossible de connaître la dernière version cat la fonction allow_url_fopen est désactivée.'; +$lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Impossible de connaître la dernière version car la fonction allow_url_fopen est désactivée.'; $lang['Uninstall'] = 'Désinstaller'; $lang['Use default sort order']='Utiliser l\'ordre de tri des images par défaut (défini dans le fichier de configuration)'; $lang['User comments validation'] = 'Validation des commentaires d\'utilisateurs'; -- cgit v1.2.3