Fix Mathias requests about French words.

Rename completely general tab into main tab.

git-svn-id: http://piwigo.org/svn/trunk@1894 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 13 insertions, 14 deletions

diff --git a/admin.php b/admin.php
index 5505cb1c9..4373de70b 100644
--- a/admin.php
+++ b/admin.php
@@ -86,8 +86,7 @@ $template->assign_vars(
     'U_MAINTENANCE'=> $link_start.'maintenance',
     'U_NOTIFICATION_BY_MAIL'=> $link_start.'notification_by_mail',
     'U_ADVANCED_FEATURE'=> $link_start.'advanced_feature',
-    'U_CONFIG_GENERAL'=> $conf_link.'general',
-    'U_CONFIG_COMMENTS'=> $conf_link.'comments',
+    'U_CONFIG_GENERAL'=> $link_start.'configuration',
     'U_CONFIG_DISPLAY'=> $conf_link.'default',
     'U_CATEGORIES'=> $link_start.'cat_list',
     'U_MOVE'=> $link_start.'cat_move',
diff --git a/admin/configuration.php b/admin/configuration.php
index fabc6b189..0c8b21aa5 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -41,14 +41,14 @@ check_status(ACCESS_ADMINISTRATOR);
 //-------------------------------------------------------- sections definitions
 if (!isset($_GET['section']))
 {
-  $page['section'] = 'general';
+  $page['section'] = 'main';
 }
 else
 {
   $page['section'] = $_GET['section'];
 }
 
-$general_checkboxes = array(
+$main_checkboxes = array(
     'email_admin_on_new_user',
     'allow_user_registration',
    );
@@ -72,13 +72,13 @@ if (isset($_POST['submit']) and !is_adviser())
   $int_pattern = '/^\d+$/';
   switch ($page['section'])
   {
-    case 'general' :
+    case 'main' :
     {
       if ( !url_is_remote($_POST['gallery_url']) )
       {
         array_push($page['errors'], $lang['conf_gallery_url_error']);
       }
-      foreach( $general_checkboxes as $checkbox)
+      foreach( $main_checkboxes as $checkbox)
       {
         $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
       }
@@ -176,10 +176,10 @@ $template->set_filename('config', 'admin/configuration.tpl');
 // TabSheet initialization
 $page['tabsheet'] = array
 (
-  'general' => array
+  'main' => array
    (
-    'caption' => l10n('conf_general_title'),
-    'url' => $conf_link.'general'
+    'caption' => l10n('conf_main_title'),
+    'url' => $conf_link.'main'
    ),
   'history' => array
    (
@@ -193,7 +193,7 @@ $page['tabsheet'] = array
    ),
   'default' => array
    (
-    'caption' => l10n('conf_default'),
+    'caption' => l10n('conf_display'),
     'url' => $conf_link.'default'
    )
 );
@@ -222,13 +222,13 @@ $html_check='checked="checked"';
 
 switch ($page['section'])
 {
-  case 'general' :
+  case 'main' :
   {
     $lock_yes = ($conf['gallery_locked']==true)?'checked="checked"':'';
     $lock_no = ($conf['gallery_locked']==false)?'checked="checked"':'';
 
     $template->assign_block_vars(
-      'general',
+      'main',
       array(
         'GALLERY_LOCKED_YES'=>$lock_yes,
         'GALLERY_LOCKED_NO'=>$lock_no,
@@ -240,10 +240,10 @@ switch ($page['section'])
         'CONF_GALLERY_URL' => $conf['gallery_url'],
         ));
 
-    foreach( $general_checkboxes as $checkbox)
+    foreach( $main_checkboxes as $checkbox)
     {
       $template->merge_block_vars(
-          'general',
+          'main',
           array(
             strtoupper($checkbox) => ($conf[$checkbox]==true)?$html_check:''
             )