From 051145723de0cb7678d78ebbf74cf5fced4cdd7f Mon Sep 17 00:00:00 2001 From: rub Date: Sun, 11 Mar 2007 23:02:13 +0000 Subject: 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 --- admin.php | 3 +-- admin/configuration.php | 24 ++++++++++++------------ language/en_UK.iso-8859-1/admin.lang.php | 7 +++---- language/fr_FR.iso-8859-1/admin.lang.php | 9 ++++----- language/fr_FR.iso-8859-1/common.lang.php | 2 +- template/yoga/admin.tpl | 4 ++-- template/yoga/admin/configuration.tpl | 28 ++++++++++++++-------------- template/yoga/admin/default-layout.css | 4 ++-- template/yoga/admin/permalinks.tpl | 2 +- 9 files changed, 40 insertions(+), 43 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:'' ) diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index 2fbfbe748..985d63cf0 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -224,11 +224,10 @@ $lang['category'] = 'category'; $lang['conf_access'] = 'Access type'; $lang['conf_comments_title'] = 'Comments'; $lang['conf_confirmation'] = 'Information data registered in database'; -$lang['conf_default'] = 'Default display'; -$lang['conf_default_title'] = 'Default display'; +$lang['conf_display'] = 'Default display'; $lang['conf_history_title'] = 'History'; $lang['conf_gallery_url_error'] = 'The gallery URL is not valid.'; -$lang['conf_general_title'] = 'Main'; +$lang['conf_main_title'] = 'Main'; $lang['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.'; $lang['config'] = 'Configuration'; $lang['confirm'] = 'confirm'; @@ -249,7 +248,7 @@ $lang['file'] = 'file'; $lang['filesize'] = 'filesize'; $lang['first element added on %s'] = 'first element added on %s'; $lang['forbidden'] = 'Forbidden'; -$lang['general'] = 'General'; +$lang['conf_general'] = 'General'; $lang['global mode'] = 'global mode'; $lang['group "%s" added'] = 'group "%s" added'; $lang['group "%s" deleted'] = 'group "%s" deleted'; diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index ba8ed4094..7d1d01c56 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -224,11 +224,10 @@ $lang['category'] = 'cat $lang['conf_access'] = 'Type d\'accès'; $lang['conf_comments_title'] = 'Commentaires'; $lang['conf_confirmation'] = 'Informations enregistrées dans la base de données'; -$lang['conf_default'] = 'Affichage par défaut'; -$lang['conf_default_title'] = 'Affichage par défaut'; +$lang['conf_display'] = 'Affichage par défaut'; $lang['conf_history_title'] = 'Historique'; $lang['conf_gallery_url_error'] = 'L\'adresse de la galerie n\'est pas valide.'; -$lang['conf_general_title'] = 'Principale'; +$lang['conf_main_title'] = 'Principale'; $lang['conf_nb_comment_page_error'] = 'Le nombre de commentaires d\'utilisateurs par page doit être compris entre 5 et 50.'; $lang['config'] = 'Configuration'; $lang['confirm'] = 'confirmer'; @@ -249,7 +248,7 @@ $lang['file'] = 'fichier'; $lang['filesize'] = 'poids'; $lang['first element added on %s'] = 'premier élément ajouté le %s'; $lang['forbidden'] = 'interdit'; -$lang['general'] = 'Général'; +$lang['conf_general'] = 'Générale'; $lang['global mode'] = 'mode global'; $lang['group "%s" added'] = 'groupe "%s" ajouté'; $lang['group "%s" deleted'] = 'groupe "%s" supprimé'; @@ -544,7 +543,7 @@ $lang['Comment to identify your partner clearly'] = 'Commentaire vous permettant $lang['Add this access definition']= 'Ajouter cette définition d\'accès'; $lang['Web Services availability duration in days'] = 'Durée d\'ouverture des Services Web en jours'; $lang['Web Services under control'] = 'Les Services Web de PhpWebGallery sont totalement operationnels et toutes les requêtes sont contrôlées.'; -$lang['special_admin_menu'] = 'Spécials'; +$lang['special_admin_menu'] = 'Spéciales'; $lang['pictures_menu'] = 'Images'; $lang['note_check_exif'] = '%s doit être mis à "false" dans votre fichier config_local.inc.php parce que l\'exif n\'est pas supporté.'; $lang['note_check_more_info'] = 'Allez sur %s ou %s pour plus d\'informations.'; diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index 1abe96485..b0c6ff5ba 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -579,7 +579,7 @@ $lang['slideshow'] = 'diaporama'; $lang['slideshow_stop'] = 'arrêter le diaporama'; $lang['special_categories'] = 'Spéciales'; $lang['sql_queries_in'] = 'requêtes SQL en'; -$lang['start_filter_hint'] = 'afficher que les éléments récents'; +$lang['start_filter_hint'] = 'n\'afficher que les éléments récents'; $lang['stop_filter_hint'] = 'retourner à l\'affichage de tous les éléments'; $lang['submit'] = 'Valider'; $lang['the beginning'] = 'le début'; diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl index be5ce7ff0..88975544c 100644 --- a/template/yoga/admin.tpl +++ b/template/yoga/admin.tpl @@ -14,8 +14,8 @@
{lang:config}
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl index 5d2372587..52cb270e2 100644 --- a/template/yoga/admin/configuration.tpl +++ b/template/yoga/admin/configuration.tpl @@ -9,64 +9,64 @@
- -
+ +
  • - +
  • - +
  • - +
  • {lang:Lock gallery} - - + +
  • {lang:Rating} - - + +
  • {lang:Rating by guests} - - + +
- +
diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css index edad24d3f..d6510b133 100644 --- a/template/yoga/admin/default-layout.css +++ b/template/yoga/admin/default-layout.css @@ -97,10 +97,10 @@ FORM#categoryPermissions LI { white-space: nowrap; } -FIELDSET#generalConf SPAN.property { +FIELDSET#mainConf SPAN.property { width: 25%; } -FIELDSET#generalConf TEXTAREA.description { +FIELDSET#mainConf TEXTAREA.description { width: 70%; } diff --git a/template/yoga/admin/permalinks.tpl b/template/yoga/admin/permalinks.tpl index dbbe4827f..3388cc40b 100644 --- a/template/yoga/admin/permalinks.tpl +++ b/template/yoga/admin/permalinks.tpl @@ -7,7 +7,7 @@
{lang:Add/delete a permalink} -