Changeset 2354

Timestamp:

May 20, 2008, 2:58:32 AM (16 years ago)

Author:

patdenice

Message:

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.

Location:

branches/branch-1_7

Files:

• include/functions_html.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)

branches/branch-1_7/include/functions_html.inc.php

@@ -106 +106 @@
     {
       $navbar.=
-        '<a href="'.$url.'" rel="start">'
+        '<a href="'.$url.'" rel="first">'
         .l10n('first_page')
         .'</a>';

branches/branch-1_7/index.php

@@ -168 +168 @@
 }
 // 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(

branches/branch-1_7/language/fr_FR.iso-8859-1/admin.lang.php

@@ -190 +190 @@
 $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)';