From f68903ec234fe7d76cddbbaa99fb0096d329582c Mon Sep 17 00:00:00 2001 From: vdigital Date: Mon, 8 Jan 2007 20:52:58 +0000 Subject: [PATCH] Minor corrections in admin advices (French is still on going). git-svn-id: http://piwigo.org/svn/trunk@1702 68402e56-0260-453c-a942-63ccdbb3a9ee --- plugins/admin_advices/admin_advices.tpl | 19 ++- .../en_UK.iso-8859-1/lang.adv.php | 10 +- .../fr_FR.iso-8859-1/lang.adv.php | 112 ++++++++++++------ plugins/admin_advices/main.inc.php | 22 ++++ 4 files changed, 115 insertions(+), 48 deletions(-) diff --git a/plugins/admin_advices/admin_advices.tpl b/plugins/admin_advices/admin_advices.tpl index 0125be5f7..31413eb0a 100644 --- a/plugins/admin_advices/admin_advices.tpl +++ b/plugins/admin_advices/admin_advices.tpl @@ -1,11 +1,18 @@ -
-

{lang:About}: {ADVICE_ABOUT}

-
-
{ADVICE_TEXT}
+
+

{lang:About}: {ADVICE_ABOUT}

+

{ADVICE_TEXT}

+ + +
-
{More.ADVICE}
+ {More.ADVICE}
- + 		+ + {thumbnail.IMAGE_ALT} + +
diff --git a/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php b/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php index d29cb411d..990986322 100644 --- a/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php +++ b/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php @@ -81,12 +81,12 @@ foreach ($cases as $id_adv) break; Case 4 : - $adv[] = 'Show ITPC Data from your picture:'; + $adv[] = 'Show IPTC Data from your picture:'; $adv[] = ' 1 - Copy one of your jpg pictures (a public one)' . ' in ./tools/
' . ' 2 - Rename it as sample.jpg.
' . ' 3 - Run ./tools/metadata.php
' . - ' 4 - Analyse results to determine which ITPC fields could be' . + ' 4 - Analyse results to determine which IPTC fields could be' . ' useful for your visitors.'; $adv[] = 'Beginners would prefer to keep $conf[\'show_iptc\'] = false;'; $adv[] = 'Advanced users would take care of $lang values and impacts' . @@ -356,12 +356,12 @@ foreach ($cases as $id_adv) $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' . '
2 - Rename it as sample.jpg.' . '
3 - Run ./tools/metadata.php' . - '
4 - Analyse results to determine which ITPC fields ' . + '
4 - Analyse results to determine which IPTC fields ' . 'could be used to override database fields.'; $adv[] = 'Beginners would prefer to keep $conf[\'use_iptc\'] = false;'; $adv[] = 'Advanced users make documentation efforts prior ' . 'to upload their pictures.
' . - 'ITPC fields have to be described in ' . + 'IPTC fields have to be described in ' . '$conf[\'use_iptc_mapping\']'; $adv[] = 'In any case, show_iptc_mapping and ' . 'use_iptc_mapping must be totally different.'; @@ -374,7 +374,7 @@ foreach ($cases as $id_adv) $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' . '
2 - Rename it as sample.jpg.' . '
3 - Run ./tools/metadata.php' . - '
4 - Analyse results to determine which ITPC fields ' . + '
4 - Analyse results to determine which IPTC fields ' . 'could be used to override database fields.'; $adv[] = 'Beginners would prefer to keep $conf[\'use_iptc\'] = false;'; $adv[] = 'Advanced users make documentation efforts prior ' . diff --git a/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php b/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php index e59469601..a34f7c353 100644 --- a/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php +++ b/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php @@ -53,77 +53,86 @@ foreach ($cases as $id_adv) $adv = array(); switch ($id_adv) { Case 1 : - $adv[] = 'Current value: public. '; + $adv[] = 'Valeur actuelle : public. '; $adv[] = 'Try $conf[\'newcat_default_status\'] = \'private\';'; $adv[] = 'You will have more time to describe and check your pictures.'; $adv[] = 'Time to decide between private and public status.'; $adv[] = 'If you choose private, time to distribute authorization.'; $adv[] = 'Your new category will be well prepared.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ($conf['newcat_default_status'] !== 'public'); $confk = 'newcat_default_status'; break; Case 2 : - $adv[] = 'Current value: ' . (string) $conf['slideshow_period'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['slideshow_period'] . '.'; $adv[] = 'This value could be too small for low band connections.'; $adv[] = 'Think about higher value like 4.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( $conf['slideshow_period'] < 4 ); $confk = 'slideshow_period'; break; Case 3 : - $adv[] = 'Current value: ' . implode(', ', $conf['file_ext']) . '. '; + $adv[] = 'Valeur actuelle : ' . implode(', ', $conf['file_ext']) . '. '; $adv[] = 'Should never contains extensions which can be executed'; $adv[] = 'on the server side like *.php, *.PHP, *.asp, ...'; $adv[] = 'Think about higher value like 4.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( in_array('php',$conf['file_ext']) ); $confk = 'file_ext'; break; Case 4 : - $adv[] = 'Show ITPC Data from your picture:'; + $adv[] = 'Show IPTC Data from your picture:'; $adv[] = ' 1 - Copy one of your jpg pictures (a public one)' . ' in ./tools/
' . ' 2 - Rename it as sample.jpg.
' . ' 3 - Run ./tools/metadata.php
' . - ' 4 - Analyse results to determine which ITPC fields could be' . + ' 4 - Analyse results to determine which IPTC fields could be' . ' useful for your visitors.'; $adv[] = 'Beginners would prefer to keep $conf[\'show_iptc\'] = false;'; $adv[] = 'Advanced users would take care of $lang values and impacts' . ' on templates.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = true; $confk = 'show_iptc_mapping'; break; Case 5 : - $adv[] = 'Current value: ' . (string) $conf['top_number'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['top_number'] . '.'; $adv[] = 'This value is maybe too high for low connections, ' . 'think about 25-50 depending on your thumbnail sizes.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( $conf['top_number'] > 50 ); $confk = 'top_number'; break; Case 6 : - $adv[] = 'Current value: ' . (string) $conf['top_number'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['top_number'] . '.'; $adv[] = 'One? It could be too low for random pictures, ' . 'think about 5-10 depending on your thumbnail sizes.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( $conf['top_number'] < 2 ) ? true : false; $confk = 'top_number'; break; Case 7 : - $adv[] = 'Current value: ' . (string) $conf['anti-flood_time'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['anti-flood_time'] . '.'; $adv[] = 'For normal flow processing, your value is probably too high. ' . 'Reasonable value is 60 (default).' ; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( $conf['anti-flood_time'] > 100 ) ? true : false; $confk = 'anti-flood_time'; break; Case 8 : - $adv[] = 'Current value: ' . (string) $conf['calendar_datefield'] . '.'; + $adv[] = 'Valeur actuelle : ' + . (string) $conf['calendar_datefield'] . '.'; $adv[] = 'Authorized values are ' . "'date_creation' or 'date_available'" . ', otherwise you can get unpredictable results.' ; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( !in_array($conf['calendar_datefield'], array('date_creation','date_available')) ); $confk = 'calendar_datefield'; @@ -133,7 +142,8 @@ foreach ($cases as $id_adv) // If (iptc or exif) are used and date_creation is updated // Then it's Ok, you can use date_creation by default for calendar // else ... Advice - $adv[] = 'Current value: ' . (string) $conf['calendar_datefield'] . '.'; + $adv[] = 'Valeur actuelle : ' + . (string) $conf['calendar_datefield'] . '.'; $adv[] = "'date_creation'" . ' is NOT filled by ' . 'any activated use metadata mapping fields.'; $adv[] = 'So activate metadata usage or change to ' . @@ -148,6 +158,7 @@ foreach ($cases as $id_adv) '$conf[\'use_exif_mapping\'] = array(\'date_creation\' ' . '=> \'DateTimeOriginal\', ...
' . '3 - Finally, a new task is up to you: Metadata synchronization.' ; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond2 = ( $conf['use_exif'] and isset($conf['use_exif_mapping']['date_creation']) ); $cond3 = ( $conf['use_iptc'] and @@ -158,54 +169,61 @@ foreach ($cases as $id_adv) break; Case 10 : - $adv[] = 'Current value: false.'; + $adv[] = 'Valeur actuelle : false.'; $adv[] = 'Not useful, private status is better, so code ' . '$conf[\'newcat_default_visible\'] = true;' ; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = !$conf['newcat_default_visible']; $confk = 'newcat_default_visible'; break; Case 11 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'Any new subscriber has access to High Resolution pictures. ' . 'Is it what you want? No, so try ' . '$conf[\'newuser_default_enabled_high\'] = false;' ; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['newuser_default_enabled_high']; $confk = 'newuser_default_enabled_high'; break; Case 12 : - $adv[] = 'Current value: ' . (string) $conf['level_separator'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['level_separator'] . '.'; $adv[] = 'Try something else like $conf[\'level_separator\'] = \'+ \';'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( $conf['level_separator'] == ' / ' ); $confk = 'level_separator'; break; Case 13 : - $adv[] = 'Current value: ' . (string) $conf['paginate_pages_around'] . '.'; + $adv[] = 'Valeur actuelle : ' + . (string) $conf['paginate_pages_around'] . '.'; $adv[] = 'Usual range is between 2 and 5. To be light, choose ' . '$conf[\'paginate_pages_around\'] = 2;
' . 'To offer large jump, choose $conf[\'paginate_pages_around\'] = 7;'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = (($conf['paginate_pages_around'] < 2) or ($conf['paginate_pages_around'] > 12)); $confk = 'paginate_pages_around'; break; Case 14 : - $adv[] = 'Current value: ' . (string) $conf['tn_width'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['tn_width'] . '.'; $adv[] = 'Should be a close value to your thumbnail width.' . $adv[] = 'Usual range is between 96 and 150, ' . 'about $conf[\'tn_width\'] = 128;'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = (($conf['tn_width'] < 66) or ($conf['tn_width'] > 180)); $confk = 'tn_width'; break; Case 15 : - $adv[] = 'Current value: ' . (string) $conf['tn_height'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['tn_height'] . '.'; $adv[] = 'Should be a close value to your thumbnail height.' . $adv[] = 'Usual range is between 96 and 150, ' . 'about $conf[\'tn_height\'] = 128;'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = (($conf['tn_height'] < 66) or ($conf['tn_height'] > 180)); $confk = 'tn_height'; @@ -216,52 +234,58 @@ foreach ($cases as $id_adv) $adv[] = 'Choose $conf[\'tn_height\'] = ' . (string) $conf['tn_width'] . ';
' . 'or $conf[\'tn_width\'] = ' . (string) $conf['tn_height'] . ';'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( $conf['tn_height'] !== $conf['tn_width'] ); $confk = 'tn_height'; break; Case 17 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'For security reason, please set ' . '$conf[\'show_version\'] = false;'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['show_version']; $confk = 'show_version'; break; Case 18 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'For a lighter gallery just have a look to ' . '$conf[\'show_thumbnail_caption\'] = false;'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['show_thumbnail_caption']; $confk = 'show_thumbnail_caption'; break; Case 19 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'For a lighter gallery just have a look to ' . '$conf[\'show_picture_name_on_title\'] = false;'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['show_picture_name_on_title']; $confk = 'show_picture_name_on_title'; break; Case 20 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'If you do NOT have any category descriptions just have ' . 'a look to $conf[\'subcatify\'] = false;'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['subcatify']; $confk = 'subcatify'; break; Case 21 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'Leave $conf[\'allow_random_representative\'] = true;
' . 'but analyze if you can avoid for performance reasons.' ; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['allow_random_representative']; $confk = 'allow_random_representative'; break; Case 22 : - $adv[] = 'Current value: ' . (string) $conf['prefix_thumbnail'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['prefix_thumbnail'] . '.'; $adv[] = 'Be careful your $conf[\'prefix_thumbnail\'] is NOT standard.'; $adv[] = 'Do NOT change it except if your thumbnails are NOT visible.'; $adv[] = 'Distant site may use a different prefix but ' . @@ -274,33 +298,37 @@ foreach ($cases as $id_adv) 'local.inc.php.
'. 'See our wiki configuration page for more information about ' . './include/config_local.inc.php.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( $conf['prefix_thumbnail'] !== 'TN-' ); $confk = 'prefix_thumbnail'; break; Case 23 : - $adv[] = 'Current value: ' . (string) $conf['users_page'] . '.'; + $adv[] = 'Valeur actuelle : ' . (string) $conf['users_page'] . '.'; $adv[] = 'Unless you have a low band connection, you can draw up ' . '$conf[\'users_page\'] to a higher value ' . 'if you have more than 20 members.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( $conf['users_page'] < 21 ); $confk = 'users_page'; break; Case 24 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'Should be false, only few webmasters have to set ' . '$conf[\'mail_options\'] = true;
' . 'A specific advice you can get from an advanced ' . 'user on our forum in some mailing issues.' ; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['mail_options']; $confk = 'mail_options'; break; Case 25 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'Should be false, only PWG dev Team have to set ' . '$conf[\'check_upgrade_feed\'] = true; for test purpose.' ; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['check_upgrade_feed']; $confk = 'check_upgrade_feed'; break; @@ -309,6 +337,7 @@ foreach ($cases as $id_adv) $adv[] = '$conf[\'rate_items\'] has ' . count($conf['rate_items']) . 'items.'; $adv[] = 'Your $conf[\'rate_items\'] would have 4 or 5 items not less.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( count($conf['rate_items']) < 4 ); $confk = 'rate_items'; break; @@ -320,24 +349,26 @@ foreach ($cases as $id_adv) $adv[] = 'Check your best rated pictures prior to remove some values.' . '
Reduce excessive rating and change your ' . '$conf[\'rate_items\'].'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = ( count($conf['rate_items']) > 6 ); $confk = 'rate_items'; break; Case 28 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'Could be true, think about $conf[\'show_iptc\'] = false;' . '
Some Professional photographers choose false ' . 'their reasons are not really professional.' ; $adv[] = 'Do NOT confuse between show_iptc and ' . 'use_iptc (have a look on metadata page ' . 'on our wiki.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['show_iptc']; $confk = 'show_iptc'; break; Case 29 : - $adv[] = 'Current value: true.'; + $adv[] = 'Valeur actuelle : true.'; $adv[] = 'Documentalists and professionnal photographers would ' . 'set it true, but beginners should leave it ' . 'as $conf[\'use_iptc\'] = false;'; @@ -347,34 +378,36 @@ foreach ($cases as $id_adv) $adv[] = 'Do NOT confuse between show_iptc and ' . 'use_iptc (have a look on metadata page ' . 'on our wiki.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = $conf['use_iptc']; $confk = 'use_iptc'; break; Case 30 : - $adv[] = 'How to deal with IPTC:'; + $adv[] = 'Comment gérer les IPTC:'; $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' . '
2 - Rename it as sample.jpg.' . '
3 - Run ./tools/metadata.php' . - '
4 - Analyse results to determine which ITPC fields ' . + '
4 - Analyse results to determine which IPTC fields ' . 'could be used to override database fields.'; $adv[] = 'Beginners would prefer to keep $conf[\'use_iptc\'] = false;'; $adv[] = 'Advanced users make documentation efforts prior ' . 'to upload their pictures.
' . - 'ITPC fields have to be described in ' . + 'IPTC fields have to be described in ' . '$conf[\'use_iptc_mapping\']'; $adv[] = 'In any case, show_iptc_mapping and ' . 'use_iptc_mapping must be totally different.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = true; $confk = 'use_iptc'; break; Case 31 : - $adv[] = 'How to deal with IPTC:'; + $adv[] = 'Comment gérer les IPTC:'; $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' . '
2 - Rename it as sample.jpg.' . '
3 - Run ./tools/metadata.php' . - '
4 - Analyse results to determine which ITPC fields ' . + '
4 - Analyse results to determine which IPTC fields ' . 'could be used to override database fields.'; $adv[] = 'Beginners would prefer to keep $conf[\'use_iptc\'] = false;'; $adv[] = 'Advanced users make documentation efforts prior ' . @@ -384,13 +417,14 @@ foreach ($cases as $id_adv) ' even those ones are NOT empty.'; $adv[] = 'In any case, show_iptc_mapping and ' . 'use_iptc_mapping must be totally different.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = true; $confk = 'use_iptc_mapping'; break; Case 32 : - $adv[] = 'Current value: ' . ( ( $conf['show_exif'] ) ? 'true':'false' ) - . '.'; + $adv[] = 'Valeur actuelle : ' + . ( ( $conf['show_exif'] ) ? 'true':'false' ) . '.'; $adv[] = 'Should be true, some information from your camera ' . 'can be displayed.'; $adv[] = 'Think about EXIF information could be different depending ' . @@ -402,12 +436,13 @@ foreach ($cases as $id_adv) $adv[] = 'Do NOT confuse between show_exif and ' . 'use_exif (have a look on metadata page ' . 'on our wiki.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = true; $confk = 'show_exif'; break; Case 33 : - $adv[] = 'How to deal with EXIF:'; + $adv[] = 'Comment gérer les EXIF:'; $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' . '
2 - Rename it as sample.jpg.' . '
3 - Run ./tools/metadata.php' . @@ -418,12 +453,13 @@ foreach ($cases as $id_adv) 'impacts on templates.'; $adv[] = 'In any case, show_exif_mapping and ' . 'use_exif_mapping must be totally different.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = true; $confk = 'show_exif_mapping'; break; Case 34 : - $adv[] = 'Current value: ' . ( ( $conf['use_exif'] ) ? 'true':'false' ) + $adv[] = 'Valeur actuelle : ' . ( ( $conf['use_exif'] ) ? 'true':'false' ) . '.'; $adv[] = 'Documentalists and professionnal photographers would ' . 'set it true, but beginners should leave the default value.'; @@ -433,12 +469,13 @@ foreach ($cases as $id_adv) $adv[] = 'Do NOT confuse between show_exif and ' . 'use_exif (have a look on metadata page ' . 'on our wiki.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = true; $confk = 'use_exif'; break; Case 35 : - $adv[] = 'How to deal with EXIF:'; + $adv[] = 'Comment gérer les EXIF:'; $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' . '
2 - Rename it as sample.jpg.' . '
3 - Run ./tools/metadata.php' . @@ -452,6 +489,7 @@ foreach ($cases as $id_adv) ' even those ones are NOT empty.'; $adv[] = 'In any case, show_iptc_mapping and ' . 'use_iptc_mapping must be totally different.'; + $adv[] = '*** FIXME *** Conseil à traduire'; $cond = true; $confk = 'use_exif_mapping'; break; diff --git a/plugins/admin_advices/main.inc.php b/plugins/admin_advices/main.inc.php index 5af0b8f9a..a17f5a658 100644 --- a/plugins/admin_advices/main.inc.php +++ b/plugins/admin_advices/main.inc.php @@ -1,5 +1,6 @@ PHPWG_ROOT_PATH.'/plugins/admin_advices/admin_advices.tpl') ); + +// Random Thumbnail + $query = ' +SELECT * + FROM '.IMAGES_TABLE.' + ORDER BY RAND(NOW()) + LIMIT 0, 1 +;'; + $result = pwg_query($query); + $row = mysql_fetch_assoc($result); + if ( is_array($row) ) + { + $template->assign_block_vars( + 'thumbnail', + array( + 'IMAGE' => get_thumbnail_url($row), + 'IMAGE_ALT' => $row['file'], + 'IMAGE_TITLE' => $row['name'], + ) + ); + } $advice_text = array_shift($adv); $template->assign_vars( array(