From 2e890e9597da29346a1fbe0db45f48e4a2be86e7 Mon Sep 17 00:00:00 2001 From: nikrou Date: Tue, 2 Mar 2010 14:54:22 +0000 Subject: Feature 1451 : localization with gettext Use php-gettext (developpement version rev43, because of php5.3) as fallback Use native language (english) instead of key for translation Keep directory en_UK for english customization Need some refactoring for plurals Todo : managing plugins in the same way git-svn-id: http://piwigo.org/svn/trunk@5021 68402e56-0260-453c-a942-63ccdbb3a9ee --- about.php | 2 +- admin/advanced_feature.php | 4 +- admin/cat_list.php | 4 +- admin/cat_modify.php | 6 +- admin/cat_options.php | 32 +- admin/configuration.php | 18 +- admin/element_set.php | 6 +- admin/extend_for_templates.php | 2 +- admin/group_list.php | 12 +- admin/group_perm.php | 6 +- admin/history.php | 2 +- admin/include/c13y_internal.class.php | 12 +- admin/include/check_integrity.class.php | 6 +- admin/include/functions.php | 8 +- .../include/functions_notification_by_mail.inc.php | 18 +- admin/include/functions_permalinks.php | 6 +- admin/include/functions_plugins.inc.php | 6 +- admin/include/functions_upgrade.php | 4 +- admin/include/functions_waiting.inc.php | 2 +- admin/notification_by_mail.php | 24 +- admin/picture_modify.php | 2 +- admin/plugins_new.php | 18 +- admin/plugins_update.php | 14 +- admin/site_manager.php | 18 +- admin/site_update.php | 34 +- admin/tags.php | 6 +- admin/template/goto/admin.tpl | 46 +- admin/template/goto/advanced_feature.tpl | 2 +- admin/template/goto/cat_list.tpl | 16 +- admin/template/goto/cat_modify.tpl | 28 +- admin/template/goto/cat_options.tpl | 2 +- admin/template/goto/check_integrity.tpl | 26 +- admin/template/goto/comments.tpl | 2 +- admin/template/goto/configuration.tpl | 18 +- admin/template/goto/extend_for_templates.tpl | 6 +- admin/template/goto/footer.tpl | 6 +- admin/template/goto/group_list.tpl | 8 +- admin/template/goto/history.tpl | 16 +- admin/template/goto/install.tpl | 56 +- admin/template/goto/intro.tpl | 2 +- admin/template/goto/maintenance.tpl | 18 +- admin/template/goto/navigation_bar.tpl | 16 +- admin/template/goto/notification_by_mail.tpl | 46 +- admin/template/goto/permalinks.tpl | 2 +- admin/template/goto/picture_modify.tpl | 6 +- admin/template/goto/plugins_list.tpl | 4 +- admin/template/goto/plugins_new.tpl | 2 +- admin/template/goto/plugins_update.tpl | 12 +- admin/template/goto/profile_content.tpl | 24 +- admin/template/goto/rating.tpl | 4 +- admin/template/goto/site_manager.tpl | 20 +- admin/template/goto/site_update.tpl | 46 +- admin/template/goto/tags.tpl | 2 +- admin/template/goto/thumbnail.tpl | 34 +- admin/template/goto/upgrade.tpl | 6 +- admin/template/goto/upload.tpl | 10 +- admin/template/goto/user_list.tpl | 34 +- admin/thumbnail.php | 12 +- admin/user_list.php | 24 +- admin/user_perm.php | 6 +- identification.php | 6 +- include/calendar_base.class.php | 4 +- include/common.inc.php | 8 +- include/functions.inc.php | 72 +- include/functions_category.inc.php | 8 +- include/functions_comment.inc.php | 6 +- include/functions_html.inc.php | 12 +- include/functions_mail.inc.php | 2 +- include/functions_notification.inc.php | 2 +- include/functions_user.inc.php | 14 +- include/menubar.inc.php | 36 +- include/php-gettext/gettext.inc.php | 418 +++ include/php-gettext/gettext.php | 408 +++ include/php-gettext/streams.php | 167 ++ include/picture_comment.inc.php | 6 +- include/section_init.inc.php | 16 +- include/ws_functions.inc.php | 2 +- install.php | 20 +- install/php5_apache_configuration.php | 4 +- install/upgrade_1.3.1.php | 6 +- language/de_DE/LC_MESSAGES/messages.mo | Bin 0 -> 67728 bytes language/de_DE/LC_MESSAGES/messages.po | 2652 ++++++++++++++++++++ language/en_UK/LC_MESSAGES/messages.mo | Bin 0 -> 422 bytes language/en_UK/LC_MESSAGES/messages.po | 2647 +++++++++++++++++++ language/es_ES/LC_MESSAGES/messages.mo | Bin 0 -> 68723 bytes language/es_ES/LC_MESSAGES/messages.po | 2649 +++++++++++++++++++ language/fr_FR/LC_MESSAGES/messages.mo | Bin 0 -> 68655 bytes language/fr_FR/LC_MESSAGES/messages.po | 2643 +++++++++++++++++++ language/it_IT/LC_MESSAGES/messages.mo | Bin 0 -> 67607 bytes language/it_IT/LC_MESSAGES/messages.po | 2652 ++++++++++++++++++++ language/nl_NL/LC_MESSAGES/messages.mo | Bin 0 -> 64406 bytes language/nl_NL/LC_MESSAGES/messages.po | 2649 +++++++++++++++++++ language/pl_PL/LC_MESSAGES/messages.mo | Bin 0 -> 64989 bytes language/pl_PL/LC_MESSAGES/messages.po | 2649 +++++++++++++++++++ language/templates/messages.pot | 2644 +++++++++++++++++++ nbm.php | 4 +- password.php | 4 +- picture.php | 4 +- profile.php | 12 +- register.php | 2 +- search.php | 4 +- search_rules.php | 2 +- .../distributed/samples/my-picture.tpl | 20 +- .../distributed/samples/titling_categories.tpl | 2 +- template/yoga/about.tpl | 2 +- template/yoga/comment_list.tpl | 2 +- template/yoga/comments.tpl | 2 +- template/yoga/footer.tpl | 6 +- template/yoga/header.tpl | 12 +- template/yoga/identification.tpl | 8 +- template/yoga/index.tpl | 16 +- template/yoga/mainpage_categories.tpl | 2 +- template/yoga/menubar_categories.tpl | 6 +- template/yoga/menubar_identification.tpl | 18 +- template/yoga/menubar_menu.tpl | 2 +- template/yoga/menubar_specials.tpl | 2 +- template/yoga/menubar_tags.tpl | 2 +- template/yoga/navigation_bar.tpl | 16 +- template/yoga/nbm.tpl | 4 +- template/yoga/notification.tpl | 6 +- template/yoga/password.tpl | 2 +- template/yoga/picture.tpl | 30 +- template/yoga/picture_content.tpl | 2 +- template/yoga/picture_nav_buttons.tpl | 22 +- template/yoga/profile.tpl | 2 +- template/yoga/profile_content.tpl | 26 +- template/yoga/redirect.tpl | 2 +- template/yoga/register.tpl | 2 +- template/yoga/search.tpl | 24 +- template/yoga/search_rules.tpl | 2 +- template/yoga/slideshow.tpl | 2 +- template/yoga/tags.tpl | 6 +- template/yoga/upload.tpl | 18 +- upgrade.php | 12 +- upload.php | 40 +- 135 files changed, 22901 insertions(+), 687 deletions(-) create mode 100644 include/php-gettext/gettext.inc.php create mode 100644 include/php-gettext/gettext.php create mode 100644 include/php-gettext/streams.php create mode 100644 language/de_DE/LC_MESSAGES/messages.mo create mode 100644 language/de_DE/LC_MESSAGES/messages.po create mode 100644 language/en_UK/LC_MESSAGES/messages.mo create mode 100644 language/en_UK/LC_MESSAGES/messages.po create mode 100644 language/es_ES/LC_MESSAGES/messages.mo create mode 100644 language/es_ES/LC_MESSAGES/messages.po create mode 100644 language/fr_FR/LC_MESSAGES/messages.mo create mode 100644 language/fr_FR/LC_MESSAGES/messages.po create mode 100644 language/it_IT/LC_MESSAGES/messages.mo create mode 100644 language/it_IT/LC_MESSAGES/messages.po create mode 100644 language/nl_NL/LC_MESSAGES/messages.mo create mode 100644 language/nl_NL/LC_MESSAGES/messages.po create mode 100644 language/pl_PL/LC_MESSAGES/messages.mo create mode 100644 language/pl_PL/LC_MESSAGES/messages.po create mode 100644 language/templates/messages.pot diff --git a/about.php b/about.php index 2039e9686..0e0983e6d 100644 --- a/about.php +++ b/about.php @@ -34,7 +34,7 @@ check_status(ACCESS_GUEST); // // Start output of page // -$title= l10n('about_page_title'); +$title= l10n('About Piwigo'); $page['body_id'] = 'theAboutPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php index 29c26bb98..da2001516 100644 --- a/admin/advanced_feature.php +++ b/admin/advanced_feature.php @@ -66,14 +66,14 @@ $advanced_features = array(); array_push($advanced_features, array ( - 'CAPTION' => l10n('Elements_not_linked'), + 'CAPTION' => l10n('Not linked elements'), 'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked' )); array_push($advanced_features, array ( - 'CAPTION' => l10n('Duplicates'), + 'CAPTION' => l10n('Files with same name in more than one physical category'), 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' )); diff --git a/admin/cat_list.php b/admin/cat_list.php index 5b7733df2..45eee0732 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -68,7 +68,7 @@ $categories = array(); $base_url = get_root_url().'admin.php?page=cat_list'; $navigation = ''; -$navigation.= l10n('home'); +$navigation.= l10n('Home'); $navigation.= ''; // +-----------------------------------------------------------------------+ @@ -78,7 +78,7 @@ $navigation.= ''; if (isset($_GET['delete']) and is_numeric($_GET['delete']) and !is_adviser()) { delete_categories(array($_GET['delete'])); - array_push($page['infos'], l10n('cat_virtual_deleted')); + array_push($page['infos'], l10n('Virtual category deleted')); update_global_rank(); } // request to add a virtual category diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 17b23ce6c..0da90e456 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -110,7 +110,7 @@ UPDATE '.CATEGORIES_TABLE.' SET image_order='.(isset($image_order) ? 'NULL':"'$i move_categories( array($_GET['cat_id']), $_POST['parent'] ); } - array_push($page['infos'], l10n('editcat_confirm')); + array_push($page['infos'], l10n('Category informations updated successfully.')); } elseif (isset($_POST['set_random_representant'])) { @@ -316,7 +316,7 @@ $sort_fields = array( 'date_creation' => l10n('Creation date'), 'date_available' => l10n('Post date'), 'average_rate' => l10n('Average rate'), - 'hit' => l10n('most_visited_cat'), + 'hit' => l10n('Most visited'), 'file' => l10n('File name'), 'id' => 'Id', 'rank' => l10n('Rank'), @@ -516,7 +516,7 @@ SELECT array_push( $page['infos'], sprintf( - l10n('An information email was sent to group "%s"'), + l10n('An information email was sent to group \"%s\"'), $group_name ) ); diff --git a/admin/cat_options.php b/admin/cat_options.php index 31c67f8ce..67d626625 100644 --- a/admin/cat_options.php +++ b/admin/cat_options.php @@ -160,10 +160,10 @@ $template->assign( $tabsheet = new tabsheet(); // TabSheet initialization $opt_link = $link_start.'cat_options&section='; -$tabsheet->add('status', l10n('cat_security'), $opt_link.'status'); -$tabsheet->add('visible', l10n('lock'), $opt_link.'visible'); -$tabsheet->add('upload', l10n('upload'), $opt_link.'upload'); -$tabsheet->add('comments', l10n('comments'), $opt_link.'comments'); +$tabsheet->add('status', l10n('Public / Private'), $opt_link.'status'); +$tabsheet->add('visible', l10n('Lock'), $opt_link.'visible'); +$tabsheet->add('Upload', l10n('Upload'), $opt_link.'Upload'); +$tabsheet->add('Comments', l10n('Comments'), $opt_link.'Comments'); if ($conf['allow_random_representative']) { $tabsheet->add('representative', l10n('Representative'), $opt_link.'representative'); @@ -208,9 +208,9 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('cat_upload_title'), - 'L_CAT_OPTIONS_TRUE' => l10n('authorized'), - 'L_CAT_OPTIONS_FALSE' => l10n('forbidden'), + 'L_SECTION' => l10n('Select uploadable categories'), + 'L_CAT_OPTIONS_TRUE' => l10n('Authorized'), + 'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'), ) ); break; @@ -229,9 +229,9 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('cat_comments_title'), - 'L_CAT_OPTIONS_TRUE' => l10n('authorized'), - 'L_CAT_OPTIONS_FALSE' => l10n('forbidden'), + 'L_SECTION' => l10n('Authorize users to add comments on selected categories'), + 'L_CAT_OPTIONS_TRUE' => l10n('Authorized'), + 'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'), ) ); break; @@ -250,9 +250,9 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('cat_lock_title'), - 'L_CAT_OPTIONS_TRUE' => l10n('unlocked'), - 'L_CAT_OPTIONS_FALSE' => l10n('locked'), + 'L_SECTION' => l10n('Lock categories'), + 'L_CAT_OPTIONS_TRUE' => l10n('Unlocked'), + 'L_CAT_OPTIONS_FALSE' => l10n('Locked'), ) ); break; @@ -271,9 +271,9 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('cat_status_title'), - 'L_CAT_OPTIONS_TRUE' => l10n('cat_public'), - 'L_CAT_OPTIONS_FALSE' => l10n('cat_private'), + 'L_SECTION' => l10n('Manage authorizations for selected categories'), + 'L_CAT_OPTIONS_TRUE' => l10n('Public category'), + 'L_CAT_OPTIONS_FALSE' => l10n('Private category'), ) ); break; diff --git a/admin/configuration.php b/admin/configuration.php index 9b4a7f0c2..41b196e35 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -86,7 +86,7 @@ if (isset($_POST['submit']) and !is_adviser()) { if ( !url_is_remote($_POST['gallery_url']) ) { - array_push($page['errors'], l10n('conf_gallery_url_error')); + array_push($page['errors'], l10n('The gallery URL is not valid.')); } foreach( $main_checkboxes as $checkbox) { @@ -110,7 +110,7 @@ if (isset($_POST['submit']) and !is_adviser()) or $_POST['nb_comment_page'] < 5 or $_POST['nb_comment_page'] > 50) { - array_push($page['errors'], l10n('conf_nb_comment_page_error')); + array_push($page['errors'], l10n('The number of comments a page must be between 5 and 50 included.')); } foreach( $comments_checkboxes as $checkbox) { @@ -160,7 +160,7 @@ WHERE param = \''.$row['param'].'\' pwg_query($query); } } - array_push($page['infos'], l10n('conf_confirmation')); + array_push($page['infos'], l10n('Information data registered in database')); } //------------------------------------------------------ $conf reinitialization @@ -173,11 +173,11 @@ $template->set_filename('config', 'configuration.tpl'); // TabSheet $tabsheet = new tabsheet(); // TabSheet initialization -$tabsheet->add('main', l10n('conf_main_title'), $conf_link.'main'); -$tabsheet->add('history', l10n('conf_history_title'), $conf_link.'history'); -$tabsheet->add('comments', l10n('conf_comments_title'), $conf_link.'comments'); -$tabsheet->add('upload', l10n('conf_upload_title'), $conf_link.'upload'); -$tabsheet->add('default', l10n('conf_display'), $conf_link.'default'); +$tabsheet->add('main', l10n('Main'), $conf_link.'main'); +$tabsheet->add('history', l10n('History'), $conf_link.'history'); +$tabsheet->add('comments', l10n('Comments'), $conf_link.'comments'); +$tabsheet->add('upload', l10n('Upload'), $conf_link.'upload'); +$tabsheet->add('default', l10n('Default display'), $conf_link.'default'); // TabSheet selection $tabsheet->select($page['section']); // Assign tabsheet to template @@ -285,7 +285,7 @@ switch ($page['section']) { // Reload user $edit_user = build_user($conf['default_user_id'], false); - array_push($page['infos'], l10n('conf_confirmation')); + array_push($page['infos'], l10n('Information data registered in database')); } } $page['errors'] = array_merge($page['errors'], $errors); diff --git a/admin/element_set.php b/admin/element_set.php index ce9ce63da..49b1b2377 100644 --- a/admin/element_set.php +++ b/admin/element_set.php @@ -132,7 +132,7 @@ SELECT element_id } else if ('not_linked' == $_GET['cat']) { - $page['title'] = l10n('Elements_not_linked'); + $page['title'] = l10n('Not linked elements'); $template->assign(array('U_ACTIVE_MENU' => 5 )); // we are searching elements not linked to any virtual category @@ -163,7 +163,7 @@ SELECT DISTINCT(image_id) } else if ('duplicates' == $_GET['cat']) { - $page['title'] = l10n('Duplicates'); + $page['title'] = l10n('Files with same name in more than one physical category'); $template->assign(array('U_ACTIVE_MENU' => 5 )); // we are searching related elements twice or more to physical categories @@ -189,7 +189,7 @@ ORDER BY file, id } elseif ('recent'== $_GET['cat']) { - $page['title'] = l10n('recent_pics_cat'); + $page['title'] = l10n('Recent pictures'); $query = 'SELECT MAX(date_available) AS date FROM '.IMAGES_TABLE; if ($row = pwg_db_fetch_assoc( pwg_query($query) ) ) diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php index 876bfe194..92c70e6a9 100644 --- a/admin/extend_for_templates.php +++ b/admin/extend_for_templates.php @@ -146,7 +146,7 @@ WHERE param = 'extents_for_templates';"; if (pwg_query($query)) { array_push($page['infos'], - l10n('Templates recorded.')); + l10n('Templates configuration has been recorded.')); } } diff --git a/admin/group_list.php b/admin/group_list.php index eff20031d..3ecfa6b0d 100644 --- a/admin/group_list.php +++ b/admin/group_list.php @@ -72,7 +72,7 @@ DELETE array_push( $page['infos'], - sprintf(l10n('group "%s" deleted'), $groupname) + sprintf(l10n('group \"%s\" deleted'), $groupname) ); } @@ -84,7 +84,7 @@ if (isset($_POST['submit_add']) and !is_adviser()) { if (empty($_POST['groupname'])) { - array_push($page['errors'], l10n('group_add_error1')); + array_push($page['errors'], l10n('The name of a group must not contain \" or \' or be empty.')); } if (count($page['errors']) == 0) { @@ -97,7 +97,7 @@ SELECT COUNT(*) list($count) = pwg_db_fetch_row(pwg_query($query)); if ($count != 0) { - array_push($page['errors'], l10n('group_add_error2')); + array_push($page['errors'], l10n('This name is already used by another group.')); } } if (count($page['errors']) == 0) @@ -113,7 +113,7 @@ INSERT INTO '.GROUPS_TABLE.' array_push( $page['infos'], - sprintf(l10n('group "%s" added'), $_POST['groupname']) + sprintf(l10n('group \"%s\" added'), $_POST['groupname']) ); } } @@ -141,7 +141,7 @@ UPDATE '.GROUPS_TABLE.' array_push( $page['infos'], - sprintf(l10n('group "%s" updated'), $groupname) + sprintf(l10n('group \"%s\" updated'), $groupname) ); } @@ -188,7 +188,7 @@ SELECT COUNT(*) 'groups', array( 'NAME' => $row['name'], - 'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('is_default_group').']' : ''), + 'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('default').']' : ''), 'MEMBERS' => l10n_dec('%d member', '%d members', $counter), 'U_MEMBERS' => $members_url.$row['id'], 'U_DELETE' => $del_url.$row['id'], diff --git a/admin/group_perm.php b/admin/group_perm.php index f664854e7..cae05ab97 100644 --- a/admin/group_perm.php +++ b/admin/group_perm.php @@ -132,12 +132,12 @@ $template->assign( array( 'TITLE' => sprintf( - l10n('Manage permissions for group "%s"'), + l10n('Manage permissions for group \"%s\"'), get_groupname($page['group'] ) ), - 'L_CAT_OPTIONS_TRUE'=>l10n('authorized'), - 'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'), + 'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'), + 'L_CAT_OPTIONS_FALSE'=>l10n('Forbidden'), 'F_ACTION' => get_root_url(). diff --git a/admin/history.php b/admin/history.php index b0022b902..b8f30299a 100644 --- a/admin/history.php +++ b/admin/history.php @@ -144,7 +144,7 @@ INSERT INTO '.SEARCH_TABLE.' } else { - array_push($page['errors'], l10n('search_one_clause_at_least')); + array_push($page['errors'], l10n('Empty query. No criteria has been entered.')); } } diff --git a/admin/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php index 7b20e24db..02a2ff26a 100644 --- a/admin/include/c13y_internal.class.php +++ b/admin/include/c13y_internal.class.php @@ -55,10 +55,10 @@ class c13y_internal if (version_compare($elem['current'], $elem['required'], '<')) { $c13y->add_anomaly( - sprintf(l10n('c13y_version_anomaly'), $elem['type'], $elem['current'], $elem['required']), + sprintf(l10n('The version of %s [%s] installed is not compatible with the version required [%s]'), $elem['type'], $elem['current'], $elem['required']), null, null, - l10n('c13y_version_correction') + l10n('You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all') .'
'. $c13y->get_htlm_links_more_info()); } @@ -80,10 +80,10 @@ class c13y_internal if (($conf[$value]) and (!function_exists('read_exif_data'))) { $c13y->add_anomaly( - sprintf(l10n('c13y_exif_anomaly'), '$conf[\''.$value.'\']'), + sprintf(l10n('%s value is not correct file because exif are not supported'), '$conf[\''.$value.'\']'), null, null, - sprintf(l10n('c13y_exif_correction'), '$conf[\''.$value.'\']') + sprintf(l10n('%s must be to set to false in your config_local.inc.php file'), '$conf[\''.$value.'\']') .'
'. $c13y->get_htlm_links_more_info()); } @@ -208,7 +208,7 @@ class c13y_internal create_user_infos($id); - $page['infos'][] = sprintf(l10n('c13y_user_created'), $name, $password); + $page['infos'][] = sprintf(l10n('User \"%s\" created with \"%s\" like password'), $name, $password); $result = true; } @@ -239,7 +239,7 @@ class c13y_internal array('primary' => array('user_id'),'update' => array('status')), $updates); - $page['infos'][] = sprintf(l10n('c13y_user_status_updated'), get_username($id)); + $page['infos'][] = sprintf(l10n('Status of user \"%s\" updated'), get_username($id)); $result = true; } diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php index 243f8729b..f19d19ab7 100644 --- a/admin/include/check_integrity.class.php +++ b/admin/include/check_integrity.class.php @@ -334,9 +334,9 @@ class check_integrity return sprintf ( - l10n('c13y_more_info'), - sprintf($link_fmt, $pwg_links['FORUM'], l10n('c13y_more_info_forum')), - sprintf($link_fmt, $pwg_links['WIKI'], l10n('c13y_more_info_wiki')) + l10n('Go to %s or %s for more informations'), + sprintf($link_fmt, $pwg_links['FORUM'], l10n('the forum')), + sprintf($link_fmt, $pwg_links['WIKI'], l10n('the wiki')) ); } diff --git a/admin/include/functions.php b/admin/include/functions.php index 5cfbf94f0..1df95314b 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1182,7 +1182,7 @@ function create_virtual_category($category_name, $parent_id=null) // is the given category name only containing blank spaces ? if (preg_match('/^\s*$/', $category_name)) { - return array('error' => l10n('cat_error_name')); + return array('error' => l10n('The name of a category should not be empty')); } $parent_id = !empty($parent_id) ? $parent_id : 'NULL'; @@ -1268,7 +1268,7 @@ UPDATE pwg_query($query); return array( - 'info' => l10n('cat_virtual_added'), + 'info' => l10n('Virtual category added'), 'id' => $inserted_id, ); } @@ -1666,7 +1666,7 @@ SELECT id return array( 'info' => sprintf( - l10n('Tag "%s" was added'), + l10n('Tag \"%s\" was added'), stripslashes($tag_name) ), 'id' => $inserted_id, @@ -1676,7 +1676,7 @@ SELECT id { return array( 'error' => sprintf( - l10n('Tag "%s" already exists'), + l10n('Tag \"%s\" already exists'), stripslashes($tag_name) ) ); diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php index e50321de4..e05e027f1 100644 --- a/admin/include/functions_notification_by_mail.inc.php +++ b/admin/include/functions_notification_by_mail.inc.php @@ -204,8 +204,8 @@ function begin_users_env_nbm($is_to_send_mail = false) $env_nbm['error_on_mail_count'] = 0; $env_nbm['sent_mail_count'] = 0; // Save sendmail message info and error in the original language - $env_nbm['msg_info'] = l10n('nbm_msg_mail_sent_to'); - $env_nbm['msg_error'] = l10n('nbm_msg_error_sending_email_to'); + $env_nbm['msg_info'] = l10n('Mail sent to %s [%s].'); + $env_nbm['msg_error'] = l10n('Error when sending email to %s [%s].'); } } @@ -322,7 +322,7 @@ function display_counter_info() else { if ($env_nbm['sent_mail_count'] == 0) - array_push($page['infos'], l10n('nbm_no_mail_to_send')); + array_push($page['infos'], l10n('No mail to send.')); else array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count'])); } @@ -369,13 +369,13 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su if ($is_subscribe) { - $msg_info = l10n('nbm_user_change_enabled_true'); - $msg_error = l10n('nbm_user_not_change_enabled_true'); + $msg_info = l10n('User %s [%s] was added to the subscription list.'); + $msg_error = l10n('User %s [%s] was not added to the subscription list.'); } else { - $msg_info = l10n('nbm_user_change_enabled_false'); - $msg_error = l10n('nbm_user_not_change_enabled_false'); + $msg_info = l10n('User %s [%s] was removed from the subscription list.'); + $msg_error = l10n('User %s [%s] was not removed from the subscription list.'); } if (count($check_key_list) != 0) @@ -385,7 +385,7 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su $data_users = get_user_notifications('subscribe', $check_key_list, !$is_subscribe); // Prepare message after change language - $msg_break_timeout = l10n('nbm_break_timeout_send_mail'); + $msg_break_timeout = l10n('Time to send mail is limited. Others mails are skipped.'); // Begin nbm users environment begin_users_env_nbm(true); @@ -408,7 +408,7 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su // set env nbm user set_user_on_env_nbm($nbm_user, true); - $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subscribe'): l10n('nbm_object_unsubscribe')); + $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Unsubscribe from notification by mail'): l10n('Unsubscribe from notification by mail')); // Assign current var for nbm mail assign_vars_nbm_mail_content($nbm_user); diff --git a/admin/include/functions_permalinks.php b/admin/include/functions_permalinks.php index 94c13be31..84bde5460 100644 --- a/admin/include/functions_permalinks.php +++ b/admin/include/functions_permalinks.php @@ -87,7 +87,7 @@ SELECT permalink { $page['errors'][] = sprintf( - l10n('Permalink_%s_histo_used_by_%s'), + l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'), $permalink, $old_cat_id ); return false; @@ -140,7 +140,7 @@ function set_cat_permalink( $cat_id, $permalink, $save ) if ( $sanitized_permalink != $permalink or preg_match( '#^(\d)+(-.*)?$#', $permalink) ) { - $page['errors'][] = l10n('Permalink_name_rule'); + $page['errors'][] = l10n('The permalink name must be composed of a-z, A-Z, 0-9, \"-\", \"_\" or \"/\". It must not be numeric or start with number followed by \"-\"'); return false; } @@ -169,7 +169,7 @@ function set_cat_permalink( $cat_id, $permalink, $save ) { $page['errors'][] = sprintf( - l10n('Permalink_%s_histo_used_by_%s'), + l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'), $permalink, $old_cat_id ); return false; diff --git a/admin/include/functions_plugins.inc.php b/admin/include/functions_plugins.inc.php index 72c0b013c..2d4957d5e 100644 --- a/admin/include/functions_plugins.inc.php +++ b/admin/include/functions_plugins.inc.php @@ -55,9 +55,9 @@ function set_plugins_tabsheet($selected) $link = get_root_url().'admin.php?page='; $tabsheet = new tabsheet(); - $tabsheet->add('plugins_list', l10n('plugins_tab_list'), $link.'plugins_list'); - $tabsheet->add('plugins_update', l10n('plugins_tab_update'), $link.'plugins_update'); - $tabsheet->add('plugins_new', l10n('plugins_tab_new'), $link.'plugins_new'); + $tabsheet->add('plugins_list', l10n('Plugin list'), $link.'plugins_list'); + $tabsheet->add('plugins_update', l10n('Check for updates'), $link.'plugins_update'); + $tabsheet->add('plugins_new', l10n('Other plugins'), $link.'plugins_new'); $tabsheet->select($selected); $tabsheet->assign(); } diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index 6c653fe98..10eedf20b 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -127,7 +127,7 @@ WHERE id IN ("' . implode('","', $plugins) . '") pwg_query($query); array_push($page['infos'], - l10n('deactivated plugins').'

'.implode(', ', $plugins).'

'); + l10n('As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:').'

'.implode(', ', $plugins).'

'); } } @@ -174,7 +174,7 @@ WHERE '.$conf['user_fields']['username'].'="'.$username.'" if ($row['password'] != $conf['pass_convert']($password)) { - array_push($page['errors'], l10n('invalid_pwd')); + array_push($page['errors'], l10n('Invalid password!')); } elseif ($row['status'] != 'admin' and $row['status'] != 'webmaster') { diff --git a/admin/include/functions_waiting.inc.php b/admin/include/functions_waiting.inc.php index 6f8bea052..16642474c 100644 --- a/admin/include/functions_waiting.inc.php +++ b/admin/include/functions_waiting.inc.php @@ -30,7 +30,7 @@ function waiting_tabsheet() // TabSheet $tabsheet = new tabsheet(); // TabSheet initialization - $tabsheet->add('comments', l10n('comments'), $link_start.'comments'); + $tabsheet->add('Comments', l10n('Comments'), $link_start.'Comments'); $tabsheet->add('upload', l10n('Pictures'), $link_start.'upload'); // TabSheet selection $tabsheet->select($page['page']); diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index a165d54ea..8b3190a40 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -174,7 +174,7 @@ order by ( $page['infos'], sprintf( - l10n('nbm_user_x_added'), + l10n('User %s [%s] added.'), stripslashes($nbm_user['username']), get_email_address_as_display_text($nbm_user['mail_address']) ) @@ -200,7 +200,9 @@ order by $query = 'delete from '.USER_MAIL_NOTIFICATION_TABLE.' where check_key in ('.implode(",", $quoted_check_key_list).');'; $result = pwg_query($query); - redirect($base_url.get_query_string_diff(array(), false), l10n('nbm_redirect_msg')); + redirect($base_url.get_query_string_diff(array(), false), l10n('Processing treatment. + +Please wait...')); } } } @@ -267,11 +269,11 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l // Prepare message after change language if ($is_action_send) { - $msg_break_timeout = l10n('nbm_break_timeout_send_mail'); + $msg_break_timeout = l10n('Time to send mail is limited. Others mails are skipped.'); } else { - $msg_break_timeout = l10n('nbm_break_timeout_list_user'); + $msg_break_timeout = l10n('Prepared time for list of users to send mail is limited. Others users are not listed.'); } // Begin nbm users environment @@ -313,7 +315,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l if ($exist_data) { - $subject = '['.$conf['gallery_title'].']: '.l10n('nbm_object_news'); + $subject = '['.$conf['gallery_title'].']: '.l10n('New elements added'); // Assign current var for nbm mail assign_vars_nbm_mail_content($nbm_user); @@ -449,7 +451,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l { if ($is_action_send) { - array_push($page['errors'], l10n('nbm_no_user_to send_notifications_by_mail')); + array_push($page['errors'], l10n('No user to send notifications by mail.')); } } } @@ -593,13 +595,13 @@ if (is_autorize_status(ACCESS_WEBMASTER)) // TabSheet $tabsheet = new tabsheet(); // TabSheet initialization - $tabsheet->add('param', l10n('nbm_param_mode'), + $tabsheet->add('param', l10n('Parameter'), add_url_params($base_url.get_query_string_diff(array('mode', 'select')), array('mode' => 'param'))); - $tabsheet->add('subscribe', l10n('nbm_subscribe_mode'), + $tabsheet->add('subscribe', l10n('Subscribe'), add_url_params($base_url.get_query_string_diff(array('mode', 'select')), array('mode' => 'subscribe'))); - $tabsheet->add('send', l10n('nbm_send_mode'), + $tabsheet->add('send', l10n('Send'), add_url_params($base_url.get_query_string_diff(array('mode', 'select')), array('mode' => 'send'))); // TabSheet selection @@ -650,8 +652,8 @@ switch ($page['mode']) $template->assign( array( - 'L_CAT_OPTIONS_TRUE' => l10n('nbm_subscribe_col'), - 'L_CAT_OPTIONS_FALSE' => l10n('nbm_unsubscribe_col') + 'L_CAT_OPTIONS_TRUE' => l10n('Subscribed'), + 'L_CAT_OPTIONS_FALSE' => l10n('Unsubscribed') ) ); diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 912a94c1c..c7914f3a0 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -62,7 +62,7 @@ if (isset($_POST['date_creation_action']) $_POST['date_creation_year']) ) { - array_push($page['errors'], l10n('err_date')); + array_push($page['errors'], l10n('wrong date')); } } diff --git a/admin/plugins_new.php b/admin/plugins_new.php index 56b09d097..8ee9d26ed 100644 --- a/admin/plugins_new.php +++ b/admin/plugins_new.php @@ -50,26 +50,26 @@ if (isset($_GET['installstatus'])) { case 'ok': array_push($page['infos'], - l10n('plugins_install_ok'), - l10n('plugins_install_need_activate')); + l10n('Plugin has been successfully copied'), + l10n('You might go to plugin list to install and activate it.')); break; case 'temp_path_error': - array_push($page['errors'], l10n('plugins_temp_path_error')); + array_push($page['errors'], l10n('Can\'t create temporary file.')); break; case 'dl_archive_error': - array_push($page['errors'], l10n('plugins_dl_archive_error')); + array_push($page['errors'], l10n('Can\'t download archive.')); break; case 'archive_error': - array_push($page['errors'], l10n('plugins_archive_error')); + array_push($page['errors'], l10n('Can\'t read or extract archive.')); break; default: array_push($page['errors'], - sprintf(l10n('plugins_extract_error'), $_GET['installstatus']), - l10n('plugins_check_chmod')); + sprintf(l10n('An error occured during extraction (%s).'), $_GET['installstatus']), + l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).')); } } @@ -81,7 +81,7 @@ $link = get_root_url().'admin.php?page='.$page['page'].'&order='; $template->assign('order_options', array( $link.'date' => l10n('Post date'), - $link.'revision' => l10n('plugins_revisions'), + $link.'revision' => l10n('Last revisions'), $link.'name' => l10n('Name'), $link.'author' => l10n('Author'), $link.'downloads' => l10n('Number of downloads'))); @@ -126,7 +126,7 @@ if ($plugins->get_server_plugins(true)) } else { - array_push($page['errors'], l10n('plugins_server_error')); + array_push($page['errors'], l10n('Can\'t connect to server.')); } $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); diff --git a/admin/plugins_update.php b/admin/plugins_update.php index e6d6705fe..3d550d154 100644 --- a/admin/plugins_update.php +++ b/admin/plugins_update.php @@ -68,26 +68,26 @@ if (isset($_GET['upgradestatus']) and isset($_GET['plugin'])) case 'ok': array_push($page['infos'], sprintf( - l10n('plugins_upgrade_ok'), + l10n('%s has been successfully upgraded.'), $plugins->fs_plugins[$_GET['plugin']]['name'])); break; case 'temp_path_error': - array_push($page['errors'], l10n('plugins_temp_path_error')); + array_push($page['errors'], l10n('Can\'t create temporary file.')); break; case 'dl_archive_error': - array_push($page['errors'], l10n('plugins_dl_archive_error')); + array_push($page['errors'], l10n('Can\'t download archive.')); break; case 'archive_error': - array_push($page['errors'], l10n('plugins_archive_error')); + array_push($page['errors'], l10n('Can\'t read or extract archive.')); break; default: array_push($page['errors'], - sprintf(l10n('plugins_extract_error'), $_GET['upgradestatus']), - l10n('plugins_check_chmod')); + sprintf(l10n('An error occured during extraction (%s).'), $_GET['upgradestatus']), + l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).')); } } @@ -157,7 +157,7 @@ if ($plugins->get_server_plugins()) } else { - array_push($page['errors'], l10n('plugins_server_error')); + array_push($page['errors'], l10n('Can\'t connect to server.')); } $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); diff --git a/admin/site_manager.php b/admin/site_manager.php index 2cc77bfbb..145ef2b17 100644 --- a/admin/site_manager.php +++ b/admin/site_manager.php @@ -65,7 +65,7 @@ function remote_output($url) } else { - array_push($page['errors'], l10n('site_err_remote_file_not_found')); + array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found')); } } @@ -102,7 +102,7 @@ SELECT COUNT(id) AS count if ($row['count'] > 0) { array_push($page['errors'], - l10n('site_already_exists').' ['.$url.']'); + l10n('This site already exists').' ['.$url.']'); } if (count($page['errors']) == 0) { @@ -120,12 +120,12 @@ SELECT COUNT(id) AS count if (!preg_match('/^PWG-INFO-2:/', $first_line)) { array_push($page['errors'], - l10n('site_err').' : '.$first_line); + l10n('an error happened').' : '.$first_line); } } else { - array_push($page['errors'], l10n('site_err_remote_file_not_found') ); + array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found') ); } } } @@ -149,7 +149,7 @@ INSERT INTO '.SITES_TABLE.' ;'; pwg_query($query); array_push($page['infos'], - $url.' '.l10n('site_created')); + $url.' '.l10n('created')); } } @@ -172,19 +172,19 @@ SELECT galleries_url { case 'generate' : { - $title = $galleries_url.' : '.l10n('remote_site_generate'); + $title = $galleries_url.' : '.l10n('generate listing'); remote_output($galleries_url.'create_listing_file.php?action=generate'); break; } case 'test' : { - $title = $galleries_url.' : '.l10n('remote_site_test'); + $title = $galleries_url.' : '.l10n('test'); remote_output($galleries_url.'create_listing_file.php?action=test&version='.PHPWG_VERSION); break; } case 'clean' : { - $title = $galleries_url.' : '.l10n('remote_site_clean'); + $title = $galleries_url.' : '.l10n('clean'); remote_output($galleries_url.'create_listing_file.php?action=clean'); break; } @@ -192,7 +192,7 @@ SELECT galleries_url { delete_site($page['site']); array_push($page['infos'], - $galleries_url.' '.l10n('site_deleted')); + $galleries_url.' '.l10n('deleted')); break; } } diff --git a/admin/site_update.php b/admin/site_update.php index b4980595d..2a53e9c82 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -55,24 +55,24 @@ define('CURRENT_DATE', $dbnow); $error_labels = array( 'PWG-UPDATE-1' => array( - l10n('update_wrong_dirname_short'), - l10n('update_wrong_dirname_info') + l10n('wrong filename'), + l10n('The name of directories and files must be composed of letters, numbers, \"-\", \"_\" or \".\"') ), 'PWG-UPDATE-2' => array( - l10n('update_missing_tn_short'), - l10n('update_missing_tn_info').implode(',', $conf['picture_ext']) + l10n('missing thumbnail'), + l10n('a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory \"thumbnail\" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :').implode(',', $conf['picture_ext']) ), 'PWG-ERROR-NO-FS' => array( - l10n('update_missing_file_or_dir'), - l10n('update_missing_file_or_dir_info') + l10n('File/directory read error'), + l10n('The file or directory cannot be accessed (either it does not exist or the access is denied)') ), 'PWG-ERROR-VERSION' => array( - l10n('update_err_pwg_version_differs'), - l10n('update_err_pwg_version_differs_info') + l10n('Piwigo version differs on the remote site'), + l10n('Version of create_listing_file.php on the remote site and Piwigo must be the same') ), 'PWG-ERROR-NOLISTING' => array( - l10n('update_err_remote_listing_not_found'), - l10n('update_err_remote_listing_not_found_info') + l10n('listing.xml file was not found'), + l10n('listing.xml file was not found on the remote site. This file is generated by choosing the \"generate listing\" command in the Site manager') ) ); $errors = array(); @@ -278,7 +278,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank $infos, array( 'path' => $fulldir, - 'info' => l10n('update_research_added') + 'info' => l10n('added') ) ); @@ -327,7 +327,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank array_push($to_delete, $db_fulldirs[$fulldir]); unset($db_fulldirs[$fulldir]); array_push($infos, array('path' => $fulldir, - 'info' => l10n('update_research_deleted'))); + 'info' => l10n('deleted'))); } if (count($to_delete) > 0) { @@ -473,7 +473,7 @@ SELECT file,storage_category_id $infos, array( 'path' => $insert['path'], - 'info' => l10n('update_research_added') + 'info' => l10n('added') ) ); @@ -514,7 +514,7 @@ SELECT file,storage_category_id { array_push($to_delete_elements, array_search($path, $db_elements)); array_push($infos, array('path' => $path, - 'info' => l10n('update_research_deleted'))); + 'info' => l10n('deleted'))); } if (count($to_delete_elements) > 0) { @@ -828,7 +828,7 @@ $template->set_filenames(array('update'=>'site_update.tpl')); $result_title = ''; if (isset($simulate) and $simulate) { - $result_title.= l10n('update_simulation_title').' '; + $result_title.= l10n('[Simulation]').' '; } // used_metadata string is displayed to inform admin which metadata will be @@ -843,8 +843,8 @@ $template->assign( array( 'SITE_URL'=>$site_url, 'U_SITE_MANAGER'=> get_root_url().'admin.php?page=site_manager', - 'L_RESULT_UPDATE'=>$result_title.l10n('update_part_research'), - 'L_RESULT_METADATA'=>$result_title.l10n('update_result_metadata'), + 'L_RESULT_UPDATE'=>$result_title.l10n('Search for new images in the directories'), + 'L_RESULT_METADATA'=>$result_title.l10n('Metadata synchronization results'), 'METADATA_LIST' => $used_metadata, 'U_HELP' => get_root_url().'popuphelp.php?page=synchronize', )); diff --git a/admin/tags.php b/admin/tags.php index 949ccc22c..57781b71a 100644 --- a/admin/tags.php +++ b/admin/tags.php @@ -67,7 +67,7 @@ SELECT id, name array_push( $page['errors'], sprintf( - l10n('Tag "%s" already exists'), + l10n('Tag \"%s\" already exists'), $tag_name ) ); @@ -164,7 +164,7 @@ SELECT id array_push( $page['infos'], sprintf( - l10n('Tag "%s" was added'), + l10n('Tag \"%s\" was added'), stripslashes($tag_name) ) ); @@ -174,7 +174,7 @@ SELECT id array_push( $page['errors'], sprintf( - l10n('Tag "%s" already exists'), + l10n('Tag \"%s\" already exists'), stripslashes($tag_name) ) ); diff --git a/admin/template/goto/admin.tpl b/admin/template/goto/admin.tpl index 6fd39dc0c..2376f10b5 100644 --- a/admin/template/goto/admin.tpl +++ b/admin/template/goto/admin.tpl @@ -16,28 +16,28 @@ jQuery().ready(function(){ldelim}
{'Links'|@translate} 
-
{'config'|@translate} 
+
{'Configuration'|@translate} 
@@ -46,10 +46,10 @@ jQuery().ready(function(){ldelim}
@@ -58,32 +58,32 @@ jQuery().ready(function(){ldelim}
{'Pictures'|@translate} 
-
{'identification'|@translate} 
+
{'Identification'|@translate} 
-
{'special_admin_menu'|@translate} 
+
{'Specials'|@translate} 
  • {'History'|@translate}
  • {'Maintenance'|@translate}
    • -
  • {'Advanced_features'|@translate}
    • +
  • {'Advanced features'|@translate}
  • {'Plugins'|@translate} {if !empty($plugin_menu_items)}
      diff --git a/admin/template/goto/advanced_feature.tpl b/admin/template/goto/advanced_feature.tpl index b355036ea..76209387c 100644 --- a/admin/template/goto/advanced_feature.tpl +++ b/admin/template/goto/advanced_feature.tpl @@ -1,5 +1,5 @@
      -

      {'Advanced_features'|@translate}

      +

      {'Advanced features'|@translate}

        diff --git a/admin/template/goto/cat_list.tpl b/admin/template/goto/cat_list.tpl index b5f0250e0..020e5cff1 100644 --- a/admin/template/goto/cat_list.tpl +++ b/admin/template/goto/cat_list.tpl @@ -21,13 +21,13 @@ }); -

        {'title_categories'|@translate}

        +

        {'Categories management'|@translate}

        {$CATEGORIES_NAV}

        - {'cat_add'|@translate} : + {'Add a virtual category'|@translate} : {if count($categories)>9 } @@ -51,16 +51,16 @@ {if cat_admin_access($category.ID)}

      • {'jump to category'|@translate}
        • {/if} -
      • {'edit'|@translate}
        • +
      • {'edit'|@translate}
        • {if isset($category.U_MANAGE_ELEMENTS) } -
      • {'elements'|@translate}
        • +
      • {'elements'|@translate}
        • {/if} -
      • {'sub-categories'|@translate}
        • +
      • {'sub-categories'|@translate}
        • {if isset($category.U_MANAGE_PERMISSIONS) } -
      • {'permissions'|@translate}
        • +
      • {'Permissions'|@translate}
        • {/if} {if isset($category.U_DELETE) } -
      • {'delete'|@translate}
        • +
      • {'delete'|@translate}{'delete'|@translate}
        • {/if}
      @@ -68,7 +68,7 @@ {$category.NAME} {if $category.IS_VIRTUAL} - {'virtual_category'|@translate} + {'Virtual category'|@translate} {/if}

      diff --git a/admin/template/goto/cat_modify.tpl b/admin/template/goto/cat_modify.tpl index 29e7780a9..1878da75c 100644 --- a/admin/template/goto/cat_modify.tpl +++ b/admin/template/goto/cat_modify.tpl @@ -3,7 +3,7 @@ {include file='include/resize.inc.tpl'}
      -

      {'title_edit_cat'|@translate}

      +

      {'Edit a category'|@translate}

      {$CATEGORIES_NAV}

      @@ -13,15 +13,15 @@
    • {'jump to category'|@translate}
      • {/if} {if isset($U_MANAGE_ELEMENTS) } -
    • {'elements'|@translate}
      • -
    • {'ranks'|@translate}
      • +
    • {'elements'|@translate}
      • +
    • {'ranks'|@translate}
      • {/if} -
    • {'sub-categories'|@translate}
      • +
    • {'sub-categories'|@translate}
      • {if isset($U_MANAGE_PERMISSIONS) } -
    • {'permissions'|@translate}
      • +
    • {'Permissions'|@translate}
      • {/if} {if isset($U_DELETE) } -
    • {'delete'|@translate}
      • +
    • {'delete'|@translate}{'delete'|@translate}
      • {/if}
    @@ -33,7 +33,7 @@ {if isset($CAT_FULL_DIR) } - {'storage'|@translate} + {'Directory'|@translate} {$CAT_FULL_DIR} {/if} @@ -68,26 +68,26 @@ {'Options'|@translate} - - - {if isset($SHOW_UPLOADABLE) } - @@ -99,7 +99,7 @@
    {'Sort order'|@translate} - +
    @@ -135,7 +135,7 @@
    - + diff --git a/admin/template/goto/cat_options.tpl b/admin/template/goto/cat_options.tpl index c27254f7f..9c25c1ef0 100644 --- a/admin/template/goto/cat_options.tpl +++ b/admin/template/goto/cat_options.tpl @@ -1,5 +1,5 @@
    -

    {'cat_options_title'|@translate} {$TABSHEET_TITLE}

    +

    {'Properties'|@translate} {$TABSHEET_TITLE}

    diff --git a/admin/template/goto/check_integrity.tpl b/admin/template/goto/check_integrity.tpl index 26b4a3b25..7cf566123 100644 --- a/admin/template/goto/check_integrity.tpl +++ b/admin/template/goto/check_integrity.tpl @@ -1,5 +1,5 @@
    -
    {'c13y_title'|@translate}
    +
    {'Check integrity'|@translate}
      @@ -7,8 +7,8 @@
    {'conf_access'|@translate} + {'Access type'|@translate} {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
    {'lock'|@translate} + {'Lock'|@translate} {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
    {'comments'|@translate} + {'Comments'|@translate} {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
    {'editcat_uploadable'|@translate} + {'Authorize upload'|@translate} {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE} {if $representant.ALLOW_SET_RANDOM } -

    +

    {/if} {if isset($representant.ALLOW_DELETE) } @@ -213,7 +213,7 @@
    {'mail_content'|@translate}{'Mail content'|@translate}
    - - + + {if isset($c13y_list)} {foreach from=$c13y_list item=c13y name=c13y_loop} @@ -22,21 +22,21 @@ {/foreach} diff --git a/admin/template/goto/plugins_update.tpl b/admin/template/goto/plugins_update.tpl index efc5acaa3..470b53558 100644 --- a/admin/template/goto/plugins_update.tpl +++ b/admin/template/goto/plugins_update.tpl @@ -16,13 +16,13 @@ jQuery().ready(function(){ldelim} {if isset($plugins_not_uptodate)}
    -{'plugins_need_update'|@translate} +{'Plugins which need upgrade'|@translate}
    {'c13y_Anomaly'|@translate}{'c13y_Correction'|@translate}{'Anomaly'|@translate}{'Correction'|@translate}
    {$plugin.DATE} {$plugin.AUTHOR} {'plugins_auto_install'|@translate} - / {'plugins_download'|@translate} + / {'Download file'|@translate}
    - - + + @@ -32,7 +32,7 @@ jQuery().ready(function(){ldelim} + / {'Download file'|@translate} {/foreach}
    {'Name'|@translate}{'plugins_actual_version'|@translate}{'plugins_new_version'|@translate}{'Current
    version'|@translate}    		{'Available
    version'|@translate}    		 {'Actions'|@translate}
    {$plugin.VERSION} {$plugin.NEW_VERSION} {'plugins_auto_update'|@translate} - / {'plugins_download'|@translate}
    @@ -41,7 +41,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_uptodate)}
    -{'plugins_dontneed_update'|@translate} +{'Plugins up to date'|@translate} @@ -61,7 +61,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_cant_check)}
    -{'plugins_cant_check'|@translate} +{'Plugin versions can\'t be checked'|@translate}
    diff --git a/admin/template/goto/profile_content.tpl b/admin/template/goto/profile_content.tpl index b81f97d47..fd8841a4e 100644 --- a/admin/template/goto/profile_content.tpl +++ b/admin/template/goto/profile_content.tpl @@ -25,7 +25,7 @@ {/if}
  • - +
    • @@ -40,60 +40,60 @@
    - {'preferences'|@translate} + {'Preferences'|@translate}
    • - +
    • - +
    • - + {html_options id=template name=template options=$template_options selected=$template_selection}
    • - + {html_options id=language name=language options=$language_options selected=$language_selection}
    • - +
    • - {'auto_expand'|@translate} + {'Expand all categories'|@translate} {html_radios name='expand' options=$radio_options selected=$EXPAND}
    • - {'show_nb_comments'|@translate} + {'Show number of comments'|@translate} {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
    • - {'show_nb_hits'|@translate} + {'Show number of hits'|@translate} {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
    • - +
    • - +
      • diff --git a/admin/template/goto/rating.tpl b/admin/template/goto/rating.tpl index cd050f3a7..d7d3a85c9 100644 --- a/admin/template/goto/rating.tpl +++ b/admin/template/goto/rating.tpl @@ -1,4 +1,4 @@ -

      {'Rating'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]

      +

      {'elements'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]

      @@ -58,7 +58,7 @@
    - + {/foreach} {*rates*} {/foreach} {*images*} diff --git a/admin/template/goto/site_manager.tpl b/admin/template/goto/site_manager.tpl index ebabcf7f7..1cbdfbf87 100644 --- a/admin/template/goto/site_manager.tpl +++ b/admin/template/goto/site_manager.tpl @@ -13,11 +13,11 @@ {/if} {if isset($local_listing)} -{'remote_site_local_found'|@translate} {$local_listing.URL} +{'A local listing.xml file has been found for '|@translate} {$local_listing.URL} {if isset($local_listing.CREATE)}

    - {'remote_site_local_create'|@translate}: + {'Create this site'|@translate}: @@ -25,7 +25,7 @@ {/if} {if isset($local_listing.U_SYNCHRONIZE)} - {'site_synchronize'|@translate} + {'synchronize'|@translate}

    {/if} {/if} @@ -33,23 +33,23 @@ {if not empty($sites)}

    {$rate.RATE} {$rate.USER} {$rate.DATE}[{'delete'|@translate}][{'Delete'|@translate}]
    - + {foreach from=$sites item=site name=site}
    {'site_local'|@translate} / {'site_remote'|@translate}{'Remote'|@translate} / {'Remote'|@translate} {'Actions'|@translate}
    {$site.NAME}
    ({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})     		- [{'site_synchronize'|@translate}] + [{'synchronize'|@translate}] {if isset($site.U_DELETE)} [{'site_delete'|@translate}] + title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}>{'delete'|@translate}] {/if} {if isset($site.remote)}
    - [{'remote_site_test'|@translate}] - [{'remote_site_generate'|@translate}] - [{'remote_site_clean'|@translate}] + [{'test'|@translate}] + [{'generate listing'|@translate}] + [{'clean'|@translate}] {/if} {if not empty($site.plugin_links)}
    @@ -64,7 +64,7 @@

    - +

    diff --git a/admin/template/goto/site_update.tpl b/admin/template/goto/site_update.tpl index d67dd3f43..90a2562cf 100644 --- a/admin/template/goto/site_update.tpl +++ b/admin/template/goto/site_update.tpl @@ -2,33 +2,33 @@ {include file='include/resize.inc.tpl'}

    -

    {'title_update'|@translate}: {$SITE_URL}

    +

    {'Database synchronization with files'|@translate}: {$SITE_URL}

    {if isset($update_result)}

    {$L_RESULT_UPDATE}

      -
    • {$update_result.NB_NEW_CATEGORIES} {'update_nb_new_categories'|@translate}
      • -
    • {$update_result.NB_NEW_ELEMENTS} {'update_nb_new_elements'|@translate}
      • -
    • {$update_result.NB_DEL_CATEGORIES} {'update_nb_del_categories'|@translate}
      • -
    • {$update_result.NB_DEL_ELEMENTS} {'update_nb_del_elements'|@translate}
      • -
    • {$update_result.NB_UPD_ELEMENTS} {'update_nb_upd_elements'|@translate}
      • -
    • {$update_result.NB_ERRORS} {'update_nb_errors'|@translate}
      • +
    • {$update_result.NB_NEW_CATEGORIES} {'categories added in the database'|@translate}
      • +
    • {$update_result.NB_NEW_ELEMENTS} {'elements added in the database'|@translate}
      • +
    • {$update_result.NB_DEL_CATEGORIES} {'categories deleted in the database'|@translate}
      • +
    • {$update_result.NB_DEL_ELEMENTS} {'elements deleted in the database'|@translate}
      • +
    • {$update_result.NB_UPD_ELEMENTS} {'elements updated in the database'|@translate}
      • +
    • {$update_result.NB_ERRORS} {'errors during synchronization'|@translate}
    {/if} {if isset($metadata_result)}

    {$L_RESULT_METADATA}

      -
    • {$metadata_result.NB_ELEMENTS_DONE} {'update_nb_elements_metadata_sync'|@translate}
      • -
    • {$metadata_result.NB_ELEMENTS_CANDIDATES} {'update_nb_elements_metadata_available'|@translate}
      • -
    • {'update_used_metadata'|@translate} : {$METADATA_LIST}
      • +
    • {$metadata_result.NB_ELEMENTS_DONE} {'elements informations synchronized with files metadata'|@translate}
      • +
    • {$metadata_result.NB_ELEMENTS_CANDIDATES} {'images candidates for metadata synchronization'|@translate}
      • +
    • {'Used metadata'|@translate} : {$METADATA_LIST}
    {/if} {if not empty($sync_errors)} -

    {'update_error_list_title'|@translate}

    +

    {'Error list'|@translate}

      {foreach from=$sync_errors item=error} @@ -36,7 +36,7 @@ {/foreach}
    -

    {'update_errors_caption'|@translate}

    +

    {'Errors caption'|@translate}

      {foreach from=$sync_error_captions item=caption}
    • {$caption.TYPE}: {$caption.LABEL}
      • @@ -45,7 +45,7 @@ {/if} {if not empty($sync_infos)} -

      {'update_infos_title'|@translate}

      +

      {'Detailed informations'|@translate}

        {foreach from=$sync_infos item=info} @@ -56,18 +56,18 @@ {/if} {if isset($introduction)} -

        {'update_default_title'|@translate}

        +

        {'Choose an option'|@translate}

        - {'update_sync_files'|@translate} + {'synchronize files structure with database'|@translate}
          • -
          • +
          • -
        • +
          • -
            • +
          @@ -76,11 +76,11 @@
        - {'update_sync_metadata'|@translate} + {'synchronize files metadata with database elements informations'|@translate}
        • - +
        • @@ -90,11 +90,11 @@
          -
          +
          - {'update_cats_subset'|@translate} + {'reduce to single existing categories'|@translate}
            • -
            • +
          diff --git a/admin/template/goto/tags.tpl b/admin/template/goto/tags.tpl index 3db8417a6..27ee02693 100644 --- a/admin/template/goto/tags.tpl +++ b/admin/template/goto/tags.tpl @@ -46,7 +46,7 @@

          - +

        diff --git a/admin/template/goto/thumbnail.tpl b/admin/template/goto/thumbnail.tpl index c2f490a16..653f07cc3 100644 --- a/admin/template/goto/thumbnail.tpl +++ b/admin/template/goto/thumbnail.tpl @@ -1,15 +1,15 @@
        -

        {'title_thumbnails'|@translate}

        +

        {'Thumbnail creation'|@translate}

        {if isset($results) } -
        {'tn_results_title'|@translate}
        +
        {'Results of miniaturization'|@translate}
        - - - + + + {foreach from=$results.elements item=elt} @@ -25,26 +25,26 @@
        {'Path'|@translate}{'thumbnail'|@translate}{'tn_results_gen_time'|@translate}{'filesize'|@translate}{'Thumbnail'|@translate}{'generated in'|@translate}{'Filesize'|@translate} {'Dimensions'|@translate}
        - + - + - + - + - + - +
        {'tn_stats'|@translate}{'General statistics'|@translate}
        {'tn_stats_nb'|@translate}{'number of miniaturized pictures'|@translate} {$results.TN_NB}
        {'tn_stats_total'|@translate}{'total time'|@translate} {$results.TN_TOTAL}
        {'tn_stats_max'|@translate}{'max time'|@translate} {$results.TN_MAX}
        {'tn_stats_min'|@translate}{'min time'|@translate} {$results.TN_MIN}
        {'tn_stats_mean'|@translate}{'average time'|@translate} {$results.TN_AVERAGE}
        @@ -55,11 +55,11 @@
        - {'tn_params_title'|@translate} + {'Miniaturization parameters'|@translate}
        • - {'tn_params_GD'|@translate} + {'GD version'|@translate} @@ -87,7 +87,7 @@ - +
        @@ -97,12 +97,12 @@ {/if} {*isset params*} {if !empty($remainings) } -
        {$TOTAL_NB_REMAINING} {'tn_alone_title'|@translate}
        +
        {$TOTAL_NB_REMAINING} {'pictures without thumbnail (jpeg and png only)'|@translate}
        - + {foreach from=$remainings item=elt name=remain_loop} @@ -115,5 +115,5 @@ {/foreach}
          {'Path'|@translate}{'filesize'|@translate}{'Filesize'|@translate} {'Dimensions'|@translate}
        {else} -
        [ {'tn_no_missing'|@translate} ]
        +
        [ {'No missing thumbnail'|@translate} ]
        {/if} diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl index 612698593..a5424c9e6 100644 --- a/admin/template/goto/upgrade.tpl +++ b/admin/template/goto/upgrade.tpl @@ -48,7 +48,7 @@ textarea { margin-left: 20px; } - +
        {'language'|@translate}{'Language'|@translate}

        +

        {/if} diff --git a/admin/template/goto/upload.tpl b/admin/template/goto/upload.tpl index 849faee0a..cc56d9a02 100644 --- a/admin/template/goto/upload.tpl +++ b/admin/template/goto/upload.tpl @@ -1,16 +1,16 @@
        -

        {'waiting'|@translate} {$TABSHEET_TITLE}

        +

        {'Waiting'|@translate} {$TABSHEET_TITLE}

        -

        {'title_upload'|@translate}

        +

        {'Pictures waiting for validation'|@translate}

        - + - - + + diff --git a/admin/template/goto/user_list.tpl b/admin/template/goto/user_list.tpl index 4418e3970..2a7d4c690 100644 --- a/admin/template/goto/user_list.tpl +++ b/admin/template/goto/user_list.tpl @@ -1,5 +1,5 @@
        -

        {'title_liste_users'|@translate}

        +

        {'User list'|@translate}

        @@ -62,10 +62,10 @@ - + - + {if not empty($plugin_user_list_column_titles)} {foreach from=$plugin_user_list_column_titles item=title} @@ -87,7 +87,7 @@ {/foreach} - +
        {'category'|@translate}{'Category'|@translate} {'Date'|@translate}{'file'|@translate}{'thumbnail'|@translate}{'File'|@translate}{'Thumbnail'|@translate} {'Author'|@translate}  
          {'Username'|@translate}{'user_status'|@translate}{'User status'|@translate} {'Email address'|@translate} {'Groups'|@translate}{'properties'|@translate}{'Properties'|@translate}{$title}{$data} - {'permissions'|@translate} + {'Permissions'|@translate} {'Profile'|@translate} {foreach from=$user.plugin_actions item=data} {$data} @@ -123,7 +123,7 @@ {if isset($adviser)}
        {'adviser'|@translate}{'Adviser'|@translate} / {'set to'|@translate} @@ -162,12 +162,12 @@ {* Properties *}
        - {'properties'|@translate} + {'Properties'|@translate} - +
        {'enabled_high'|@translate}{'High definition enabled'|@translate} / {'set to'|@translate} @@ -196,7 +196,7 @@ - + - + - + - + - + - + - + - + - + - +
        {'nb_image_per_row'|@translate}{'Number of images per row'|@translate} @@ -206,7 +206,7 @@
        {'nb_row_per_page'|@translate}{'Number of rows per page'|@translate} @@ -216,7 +216,7 @@
        {'theme'|@translate}{'Interface theme'|@translate} @@ -227,7 +227,7 @@
        {'language'|@translate}{'Language'|@translate} @@ -238,7 +238,7 @@
        {'recent_period'|@translate}{'Recent period'|@translate} @@ -248,7 +248,7 @@
        {'auto_expand'|@translate}{'Expand all categories'|@translate} / {'set to'|@translate} @@ -258,7 +258,7 @@
        {'show_nb_comments'|@translate}{'Show number of comments'|@translate} / {'set to'|@translate} @@ -268,7 +268,7 @@
        {'show_nb_hits'|@translate}{'Show number of hits'|@translate} / {'set to'|@translate} @@ -278,7 +278,7 @@
        {'maxwidth'|@translate}{'Maximum width of the pictures'|@translate} @@ -290,7 +290,7 @@
        {'maxheight'|@translate}{'Maximum height of the pictures'|@translate} diff --git a/admin/thumbnail.php b/admin/thumbnail.php index 7fc81dc3d..a1c7bbcd5 100644 --- a/admin/thumbnail.php +++ b/admin/thumbnail.php @@ -115,7 +115,7 @@ function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext) // creation and backup of final picture if (!is_writable($tndir)) { - array_push($page['errors'], '['.$tndir.'] : '.l10n('no_write_access')); + array_push($page['errors'], '['.$tndir.'] : '.l10n('no write access')); return false; } imagejpeg($destImage, $dest_file, $conf['tn_compression_level']); @@ -136,14 +136,14 @@ function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext) // error else { - echo l10n('tn_no_support')." "; + echo l10n('Picture unreachable or no support')." "; if ( isset( $extenstion ) ) { - echo l10n('tn_format').' '.$extension; + echo l10n('for the file format').' '.$extension; } else { - echo l10n('tn_thisformat'); + echo l10n('for this file format'); } exit(); } @@ -233,11 +233,11 @@ if (isset($_POST['submit'])) // checking criteria if (!preg_match('/^[0-9]{2,3}$/', $_POST['width']) or $_POST['width'] < 10) { - array_push($page['errors'], l10n('tn_err_width').' 10'); + array_push($page['errors'], l10n('width must be a number superior to').' 10'); } if (!preg_match('/^[0-9]{2,3}$/', $_POST['height']) or $_POST['height'] < 10) { - array_push($page['errors'], l10n('tn_err_height').' 10'); + array_push($page['errors'], l10n('height must be a number superior to').' 10'); } // picture miniaturization diff --git a/admin/user_list.php b/admin/user_list.php index 6054d0160..1583de0a1 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -168,10 +168,10 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); check_status(ACCESS_ADMINISTRATOR); $page['order_by_items'] = array( - 'id' => l10n('registration_date'), + 'id' => l10n('registration date'), 'username' => l10n('Username'), 'level' => l10n('Privacy level'), - 'language' => l10n('language'), + 'Language' => l10n('Language'), ); $page['direction_items'] = array( @@ -191,19 +191,19 @@ if ($conf['double_password_type_in_admin'] == true) { if(empty($_POST['password'])) { - array_push($page['errors'], l10n('Password is missing')); + array_push($page['errors'], l10n('Password is missing. Please enter the password.')); } else if(empty($_POST['password_conf'])) { - array_push($page['errors'], l10n('Password confirmation is missing')); + array_push($page['errors'], l10n('Password confirmation is missing. Please confirm the chosen password.')); } else if(empty($_POST['email'])) { - array_push($page['errors'], l10n('Email address is missing')); + array_push($page['errors'], l10n('Email address is missing. Please specify an email address.')); } else if ($_POST['password'] != $_POST['password_conf']) { - array_push($page['errors'], l10n('Password confirmation error')); + array_push($page['errors'], l10n('Password confirmation error.')); } else { @@ -215,7 +215,7 @@ if ($conf['double_password_type_in_admin'] == true) array_push( $page['infos'], sprintf( - l10n('user "%s" added'), + l10n('user \"%s\" added'), $_POST['login'] ) ); @@ -235,7 +235,7 @@ else if ($conf['double_password_type_in_admin'] == false) array_push( $page['infos'], sprintf( - l10n('user "%s" added'), + l10n('user \"%s\" added'), $_POST['login'] ) ); @@ -693,7 +693,7 @@ foreach ($visible_user_list as $local_user) } $properties[] = (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) - ? l10n('is_high_enabled') : l10n('is_high_disabled'); + ? l10n('') : l10n(''); $template->append( 'users', @@ -704,12 +704,12 @@ foreach ($visible_user_list as $local_user) 'U_PERM' => $perm_url.$local_user['id'], 'USERNAME' => stripslashes($local_user['username']) .($local_user['id'] == $conf['guest_id'] - ? '
        ['.l10n('is_the_guest').']' : '') + ? '
        ['.l10n('guest').']' : '') .($local_user['id'] == $conf['default_user_id'] - ? '
        ['.l10n('is_the_default').']' : ''), + ? '
        ['.l10n('default values').']' : ''), 'STATUS' => l10n('user_status_'. $local_user['status']).(($local_user['adviser'] == 'true') - ? '
        ['.l10n('adviser').']' : ''), + ? '
        ['.l10n('Adviser').']' : ''), 'EMAIL' => get_email_address_as_display_text($local_user['email']), 'GROUPS' => $groups_string, 'PROPERTIES' => implode( ', ', $properties), diff --git a/admin/user_perm.php b/admin/user_perm.php index 2156982c0..5f91eb972 100644 --- a/admin/user_perm.php +++ b/admin/user_perm.php @@ -126,12 +126,12 @@ $template->assign( array( 'TITLE' => sprintf( - l10n('Manage permissions for user "%s"'), + l10n('Manage permissions for user \"%s\"'), get_username($page['user'] ) ), - 'L_CAT_OPTIONS_TRUE'=>l10n('authorized'), - 'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'), + 'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'), + 'L_CAT_OPTIONS_FALSE'=>l10n('Forbidden'), 'F_ACTION' => PHPWG_ROOT_PATH. diff --git a/identification.php b/identification.php index 2b6e856b9..1fffab422 100644 --- a/identification.php +++ b/identification.php @@ -39,7 +39,7 @@ if ( !empty($_GET['redirect']) ) $redirect_to = urldecode($_GET['redirect']); if ( is_a_guest() ) { - array_push($errors, l10n('access_forbiden')); + array_push($errors, l10n('You are not authorized to access the requested page')); } } @@ -62,7 +62,7 @@ if (isset($_POST['login'])) } else { - array_push( $errors, l10n('invalid_pwd') ); + array_push( $errors, l10n('Invalid password!') ); } } } @@ -71,7 +71,7 @@ if (isset($_POST['login'])) // // Start output of page // -$title = l10n('identification'); +$title = l10n('Identification'); $page['body_id'] = 'theIdentificationPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); diff --git a/include/calendar_base.class.php b/include/calendar_base.class.php index ee1fe7bea..02fa9451d 100644 --- a/include/calendar_base.class.php +++ b/include/calendar_base.class.php @@ -95,7 +95,7 @@ class CalendarBase } elseif ('any' === $date_component ) { - $label = l10n('calendar_any'); + $label = l10n('All'); } return $label; } @@ -192,7 +192,7 @@ class CalendarBase array( 'start' ) ); $nav_bar_datas[]=array( - 'LABEL' => l10n('calendar_any'), + 'LABEL' => l10n('All'), 'URL' => $url ); } diff --git a/include/common.inc.php b/include/common.inc.php index 124625e4d..814eaaf40 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -173,19 +173,19 @@ if (isset($user['internal_status']['guest_must_be_guest']) and $user['internal_status']['guest_must_be_guest'] === true) { - $header_msgs[] = l10n('guest_must_be_guest'); + $header_msgs[] = l10n('Bad status for user "guest", using default status. Please notify the webmaster.'); } if ($conf['gallery_locked']) { - $header_msgs[] = l10n('gallery_locked_message'); + $header_msgs[] = l10n('The gallery is locked for maintenance. Please, come back later.'); if ( script_basename() != 'identification' and !is_admin() ) { set_status_header(503, 'Service Unavailable'); @header('Retry-After: 900'); header('Content-Type: text/html; charset='.get_pwg_charset()); - echo ''.l10n('gallery_locked_message').''; + echo ''.l10n('The gallery is locked for maintenance. Please, come back later.').''; echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size exit(); } @@ -203,7 +203,7 @@ if ($conf['check_upgrade_feed']) if (is_adviser()) { - $header_msgs[] = l10n('adviser_mode_enabled'); + $header_msgs[] = l10n('Adviser mode enabled'); } if (count($header_msgs) > 0) diff --git a/include/functions.inc.php b/include/functions.inc.php index 765f17c51..fed1d3f5c 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -30,6 +30,7 @@ include_once( PHPWG_ROOT_PATH .'include/functions_html.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/functions_tag.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' ); +include_once( PHPWG_ROOT_PATH .'include/php-gettext/gettext.inc.php' ); //----------------------------------------------------------- generic functions function get_extra_fields($order_by_fields) @@ -39,7 +40,7 @@ function get_extra_fields($order_by_fields) $order_by_fields ); if (!empty($fields)) - { + { $fields = ','.$fields; } return $fields; @@ -173,7 +174,7 @@ function mkgetdir($dir, $flags=MKGETDIR_DEFAULT) umask($umask); if ($mkd==false) { - !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no_write_access')); + !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no write access')); return false; } if( $flags&MKGETDIR_PROTECT_HTACCESS ) @@ -189,7 +190,7 @@ function mkgetdir($dir, $flags=MKGETDIR_DEFAULT) } if ( !is_writable($dir) ) { - !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no_write_access')); + !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no write access')); return false; } return true; @@ -213,7 +214,7 @@ function mkget_thumbnail_dir($dirname, &$errors) if (! mkgetdir($tndir, MKGETDIR_NONE) ) { array_push($errors, - '['.$dirname.'] : '.l10n('no_write_access')); + '['.$dirname.'] : '.l10n('no write access')); return false; } return $tndir; @@ -620,7 +621,7 @@ function redirect_html( $url , $msg = '', $refresh_time = 0) if (empty($msg)) { - $msg = nl2br(l10n('redirect_msg')); + $msg = nl2br(l10n('Redirection...')); } $refresh = $refresh_time; @@ -866,16 +867,28 @@ function get_name_from_file($filename) * @param string key * @return string */ -function l10n($key) +function l10n($key, $textdomain='messages') { - global $lang, $conf; + global $user; - if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key)) + if (empty($user['language'])) { - trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_WARNING); + $locale = $GLOBALS['language']; + } + else + { + $locale = $user['language']; } - return isset($lang[$key]) ? $lang[$key] : $key; + T_setlocale(LC_ALL, $locale.'.UTF-8'); + + // Specify location of translation tables + T_bindtextdomain($textdomain, "./language"); + + // Choose domain + T_textdomain($textdomain); + + return T_gettext($key); } /** @@ -887,18 +900,35 @@ function l10n($key) * @param decimal value * @return string */ -function l10n_dec($singular_fmt_key, $plural_fmt_key, $decimal) +function l10n_dec($singular_fmt_key, $plural_fmt_key, + $decimal, $textdomain='messages') { - global $lang_info; - - return - sprintf( - l10n(( - (($decimal > 1) or ($decimal == 0 and $lang_info['zero_plural'])) - ? $plural_fmt_key - : $singular_fmt_key - )), $decimal); + global $user; + + if (empty($user['language'])) + { + $locale = $GLOBALS['language']; + } + else + { + $locale = $user['language']; + } + + T_setlocale(LC_ALL, $locale.'.UTF-8'); + + // Specify location of translation tables + T_bindtextdomain($textdomain, "./language"); + + // Choose domain + T_textdomain($textdomain); + + return sprintf(T_ngettext($singular_fmt_key, + $plural_fmt_key, + $decimal), + $decimal + ); } + /* * returns a single element to use with l10n_args * @@ -1435,7 +1465,7 @@ function get_icon($date, $is_child_date = false) if (!isset($cache['get_icon']['title'])) { $cache['get_icon']['title'] = sprintf( - l10n('elements posted during the last %d days'), + l10n('images posted during the last %d days'), $user['recent_period'] ); } diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index d35114ca3..c0f9aee1e 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -286,9 +286,9 @@ function get_category_preferred_image_orders() return trigger_event('get_category_preferred_image_orders', array( - array(l10n('default_sort'), '', true), + array(l10n('Default'), '', true), array(l10n('Average rate'), 'average_rate DESC', $conf['rate']), - array(l10n('most_visited_cat'), 'hit DESC', true), + array(l10n('Most visited'), 'hit DESC', true), array(l10n('Creation date'), 'date_creation DESC', true), array(l10n('Post date'), 'date_available DESC', true), array(l10n('File name'), 'file ASC', true), @@ -297,7 +297,7 @@ function get_category_preferred_image_orders() 'rank ASC', ('categories' == @$page['section'] and !isset($page['flat']) and !isset($page['chronology_field']) ) ), - array( l10n('permissions'), 'level DESC', is_admin() ) + array( l10n('Permissions'), 'level DESC', is_admin() ) )); } @@ -479,7 +479,7 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_ //no descendant categories or descendants do not contain images if (! $short_message) { - $display_text.= ' '.l10n('images_available_cpl'); + $display_text.= ' '.l10n('in this category'); } } else diff --git a/include/functions_comment.inc.php b/include/functions_comment.inc.php index c4f021edf..a35c8ad60 100644 --- a/include/functions_comment.inc.php +++ b/include/functions_comment.inc.php @@ -103,7 +103,7 @@ SELECT COUNT(*) AS user_exists $row = pwg_db_fetch_assoc( pwg_query( $query ) ); if ( $row['user_exists'] == 1 ) { - array_push($infos, l10n('comment_user_exists') ); + array_push($infos, l10n('This login is already used by another user') ); $comment_action='reject'; } } @@ -140,7 +140,7 @@ SELECT id FROM '.COMMENTS_TABLE.' AND author_id = '.$comm['author_id']; if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 ) { - array_push( $infos, l10n('comment_anti-flood') ); + array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') ); $comment_action='reject'; } } @@ -268,7 +268,7 @@ SELECT id FROM '.COMMENTS_TABLE.' AND author_id = '.$comm['author_id']; if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 ) { - //?? array_push( $infos, l10n('comment_anti-flood') ); + //?? array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') ); $comment_action='reject'; } } diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 4be5ef077..70ffe48a5 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -292,9 +292,9 @@ function access_denied() if ( isset($user) and !is_a_guest() ) { echo ''; - echo '
        '.l10n('access_forbiden').'
        '; - echo ''.l10n('identification').' '; - echo ''.l10n('home').'
        '; + echo '
        '.l10n('You are not authorized to access the requested page').'
        '; + echo ''.l10n('Identification').' '; + echo ''.l10n('Home').'
        '; echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size exit(); } @@ -399,7 +399,7 @@ $btrace_msg function get_tags_content_title() { global $page; - $title = count($page['tags']) > 1 ? l10n('Tags') : l10n('Tag'); + $title = count($page['tags']) > 1 ? l10n('Tag') : l10n('Tag'); $title.= ' '; for ($i=0; $i' .$page['tags'][$i]['name'] .''; @@ -431,7 +431,7 @@ function get_tags_content_title() ) ) .'" style="border:none;" title="' - .l10n('remove this tag') + .l10n('remove this tag from the list') .'">x' diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php index 3220d592e..c550d6857 100644 --- a/include/functions_mail.inc.php +++ b/include/functions_mail.inc.php @@ -646,7 +646,7 @@ function pwg_mail($to, $args = array()) 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 'PHPWG_URL' => PHPWG_URL, - 'TITLE_MAIL' => urlencode(l10n('title_send_mail')), + 'TITLE_MAIL' => urlencode(l10n('A comment on your site')), 'MAIL' => get_webmaster_mail_address() )); diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php index 77416db01..4daff6496 100644 --- a/include/functions_notification.inc.php +++ b/include/functions_notification.inc.php @@ -529,7 +529,7 @@ function get_html_description_recent_post_date($date_detail) .l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements']) .' (' .'' - .l10n('recent_pics_cat').'' + .l10n('Recent pictures').'' .')' .'
        '; diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index bed0c7962..d48c55f53 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -47,7 +47,7 @@ function validate_mail_address($user_id, $mail_address) if ( !preg_match( $regex, $mail_address ) ) { - return l10n('reg_err_mail_address'); + return l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'); } if (defined("PHPWG_INSTALLED") and !empty($mail_address)) @@ -61,7 +61,7 @@ where upper('.$conf['user_fields']['email'].') = upper(\''.$mail_address.'\') list($count) = pwg_db_fetch_row(pwg_query($query)); if ($count != 0) { - return l10n('reg_err_mail_address_dbl'); + return l10n('a user use already this mail address'); } } } @@ -86,7 +86,7 @@ WHERE LOWER(".stripslashes($conf['user_fields']['username']).") = '".strtolower( if ($count > 0) { - return l10n('reg_err_login5'); + return l10n('this login is already used'); } } } @@ -98,19 +98,19 @@ function register_user($login, $password, $mail_address, if ($login == '') { - array_push($errors, l10n('reg_err_login1')); + array_push($errors, l10n('Please, enter a login')); } if (preg_match('/^.* $/', $login)) { - array_push($errors, l10n('reg_err_login2')); + array_push($errors, l10n('login mustn\'t end with a space character')); } if (preg_match('/^ .*$/', $login)) { - array_push($errors, l10n('reg_err_login3')); + array_push($errors, l10n('login mustn\'t start with a space character')); } if (get_userid($login)) { - array_push($errors, l10n('reg_err_login5')); + array_push($errors, l10n('this login is already used')); } $mail_error = validate_mail_address(null, $mail_address); if ('' != $mail_error) diff --git a/include/menubar.inc.php b/include/menubar.inc.php index 35fdb8750..0a9800d9b 100644 --- a/include/menubar.inc.php +++ b/include/menubar.inc.php @@ -148,16 +148,16 @@ function initialize_menu() $block->data['favorites'] = array( 'URL' => make_index_url(array('section' => 'favorites')), - 'TITLE' => l10n('favorite_cat_hint'), - 'NAME' => l10n('favorite_cat') + 'TITLE' => l10n('display my favorites pictures'), + 'NAME' => l10n('My favorites') ); } $block->data['most_visited'] = array( 'URL' => make_index_url(array('section' => 'most_visited')), - 'TITLE' => l10n('most_visited_cat_hint'), - 'NAME' => l10n('most_visited_cat') + 'TITLE' => l10n('display most visited pictures'), + 'NAME' => l10n('Most visited') ); if ($conf['rate']) @@ -165,31 +165,31 @@ function initialize_menu() $block->data['best_rated'] = array( 'URL' => make_index_url(array('section' => 'best_rated')), - 'TITLE' => l10n('best_rated_cat_hint'), - 'NAME' => l10n('best_rated_cat') + 'TITLE' => l10n('display best rated items'), + 'NAME' => l10n('Best rated') ); } $block->data['random'] = array( 'URL' => get_root_url().'random.php', - 'TITLE' => l10n('random_cat_hint'), - 'NAME' => l10n('random_cat'), + 'TITLE' => l10n('display a set of random pictures'), + 'NAME' => l10n('Random pictures'), 'REL'=> 'rel="nofollow"' ); $block->data['recent_pics'] = array( 'URL' => make_index_url(array('section' => 'recent_pics')), - 'TITLE' => l10n('recent_pics_cat_hint'), - 'NAME' => l10n('recent_pics_cat'), + 'TITLE' => l10n('display most recent pictures'), + 'NAME' => l10n('Recent pictures'), ); $block->data['recent_cats'] = array( 'URL' => make_index_url(array('section' => 'recent_cats')), - 'TITLE' => l10n('recent_cats_cat_hint'), - 'NAME' => l10n('recent_cats_cat'), + 'TITLE' => l10n('display recently updated categories'), + 'NAME' => l10n('Recent categories'), ); @@ -204,8 +204,8 @@ function initialize_menu() 'chronology_view' => 'calendar' ) ), - 'TITLE' => l10n('calendar_hint'), - 'NAME' => l10n('calendar'), + 'TITLE' => l10n('display each day with pictures, month per month'), + 'NAME' => l10n('Calendar'), 'REL'=> 'rel="nofollow"' ); $block->template = 'menubar_specials.tpl'; @@ -230,7 +230,7 @@ function initialize_menu() // search link $block->data['search'] = array( - 'TITLE'=>l10n('hint_search'), + 'TITLE'=>l10n('search'), 'NAME'=>l10n('Search'), 'URL'=> get_root_url().'search.php', 'REL'=> 'rel="search"' @@ -239,15 +239,15 @@ function initialize_menu() // comments link $block->data['comments'] = array( - 'TITLE'=>l10n('hint_comments'), - 'NAME'=>l10n('comments'), + 'TITLE'=>l10n('See last users comments'), + 'NAME'=>l10n('Comments'), 'URL'=> get_root_url().'comments.php', ); // about link $block->data['about'] = array( - 'TITLE' => l10n('about_page_title'), + 'TITLE' => l10n('About Piwigo'), 'NAME' => l10n('About'), 'URL' => get_root_url().'about.php', ); diff --git a/include/php-gettext/gettext.inc.php b/include/php-gettext/gettext.inc.php new file mode 100644 index 000000000..69d4d7c2a --- /dev/null +++ b/include/php-gettext/gettext.inc.php @@ -0,0 +1,418 @@ + + Copyright (c) 2009 Danilo Segan + + Drop in replacement for native gettext. + + This file is part of PHP-gettext. + + PHP-gettext is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + PHP-gettext is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with PHP-gettext; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ +/* +LC_CTYPE 0 +LC_NUMERIC 1 +LC_TIME 2 +LC_COLLATE 3 +LC_MONETARY 4 +LC_MESSAGES 5 +LC_ALL 6 +*/ + + +// LC_MESSAGES is not available if php-gettext is not loaded +// while the other constants are already available from session extension. +if (!defined('LC_MESSAGES')) { + define('LC_MESSAGES', 5); +} + +require('streams.php'); +require('gettext.php'); + + +// Variables + +global $text_domains, $default_domain, $LC_CATEGORIES, $EMULATEGETTEXT, $CURRENTLOCALE; +$text_domains = array(); +$default_domain = 'messages'; +$LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', 'LC_MESSAGES', 'LC_ALL'); +$EMULATEGETTEXT = 0; +$CURRENTLOCALE = ''; + +/* Class to hold a single domain included in $text_domains. */ +class domain { + var $l10n; + var $path; + var $codeset; +} + +// Utility functions + +/** + * Return a list of locales to try for any POSIX-style locale specification. + */ +function get_list_of_locales($locale) { + /* Figure out all possible locale names and start with the most + * specific ones. I.e. for sr_CS.UTF-8@latin, look through all of + * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr. + */ + $locale_names = array(); + $lang = NULL; + $country = NULL; + $charset = NULL; + $modifier = NULL; + if ($locale) { + if (preg_match("/^(?P[a-z]{2,3})" // language code + ."(?:_(?P[A-Z]{2}))?" // country code + ."(?:\.(?P[-A-Za-z0-9_]+))?" // charset + ."(?:@(?P[-A-Za-z0-9_]+))?$/", // @ modifier + $locale, $matches)) { + + if (isset($matches["lang"])) $lang = $matches["lang"]; + if (isset($matches["country"])) $country = $matches["country"]; + if (isset($matches["charset"])) $charset = $matches["charset"]; + if (isset($matches["modifier"])) $modifier = $matches["modifier"]; + + if ($modifier) { + if ($country) { + if ($charset) + array_push($locale_names, "${lang}_$country.$charset@$modifier"); + array_push($locale_names, "${lang}_$country@$modifier"); + } elseif ($charset) + array_push($locale_names, "${lang}.$charset@$modifier"); + array_push($locale_names, "$lang@$modifier"); + } + if ($country) { + if ($charset) + array_push($locale_names, "${lang}_$country.$charset"); + array_push($locale_names, "${lang}_$country"); + } elseif ($charset) + array_push($locale_names, "${lang}.$charset"); + array_push($locale_names, $lang); + } + + // If the locale name doesn't match POSIX style, just include it as-is. + if (!in_array($locale, $locale_names)) + array_push($locale_names, $locale); + } + return $locale_names; +} + +/** + * Utility function to get a StreamReader for the given text domain. + */ +function _get_reader($domain=null, $category=5, $enable_cache=true) { + global $text_domains, $default_domain, $LC_CATEGORIES; + if (!isset($domain)) $domain = $default_domain; + if (!isset($text_domains[$domain]->l10n)) { + // get the current locale + $locale = _setlocale(LC_MESSAGES, 0); + $bound_path = isset($text_domains[$domain]->path) ? + $text_domains[$domain]->path : './'; + $subpath = $LC_CATEGORIES[$category] ."/$domain.mo"; + + $locale_names = get_list_of_locales($locale); + $input = null; + foreach ($locale_names as $locale) { + $full_path = $bound_path . $locale . "/" . $subpath; + if (file_exists($full_path)) { + $input = new FileReader($full_path); + break; + } + } + + if (!array_key_exists($domain, $text_domains)) { + // Initialize an empty domain object. + $text_domains[$domain] = new domain(); + } + $text_domains[$domain]->l10n = new gettext_reader($input, + $enable_cache); + } + return $text_domains[$domain]->l10n; +} + +/** + * Returns whether we are using our emulated gettext API or PHP built-in one. + */ +function locale_emulation() { + global $EMULATEGETTEXT; + return $EMULATEGETTEXT; +} + +/** + * Checks if the current locale is supported on this system. + */ +function _check_locale() { + global $EMULATEGETTEXT; + return !$EMULATEGETTEXT; +} + +/** + * Get the codeset for the given domain. + */ +function _get_codeset($domain=null) { + global $text_domains, $default_domain, $LC_CATEGORIES; + if (!isset($domain)) $domain = $default_domain; + return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding'); +} + +/** + * Convert the given string to the encoding set by bind_textdomain_codeset. + */ +function _encode($text) { + $source_encoding = mb_detect_encoding($text); + $target_encoding = _get_codeset(); + if ($source_encoding != $target_encoding) { + return mb_convert_encoding($text, $target_encoding, $source_encoding); + } + else { + return $text; + } +} + + + + +// Custom implementation of the standard gettext related functions + +/** + * Returns passed in $locale, or environment variable $LANG if $locale == ''. + */ +function _get_default_locale($locale) { + if ($locale == '') // emulate variable support + return getenv('LANG'); + else + return $locale; +} + +/** + * Sets a requested locale, if needed emulates it. + */ +function _setlocale($category, $locale) { + global $CURRENTLOCALE, $EMULATEGETTEXT; + if ($locale === 0) { // use === to differentiate between string "0" + if ($CURRENTLOCALE != '') + return $CURRENTLOCALE; + else + // obey LANG variable, maybe extend to support all of LC_* vars + // even if we tried to read locale without setting it first + return _setlocale($category, $CURRENTLOCALE); + } else { + if (function_exists('setlocale')) { + $ret = setlocale($category, $locale); + if (($locale == '' and !$ret) or // failed setting it by env + ($locale != '' and $ret != $locale)) { // failed setting it + // Failed setting it according to environment. + $CURRENTLOCALE = _get_default_locale($locale); + $EMULATEGETTEXT = 1; + } else { + $CURRENTLOCALE = $ret; + $EMULATEGETTEXT = 0; + } + } else { + // No function setlocale(), emulate it all. + $CURRENTLOCALE = _get_default_locale($locale); + $EMULATEGETTEXT = 1; + } + // Allow locale to be changed on the go for one translation domain. + global $text_domains, $default_domain; + unset($text_domains[$default_domain]->l10n); + return $CURRENTLOCALE; + } +} + +/** + * Sets the path for a domain. + */ +function _bindtextdomain($domain, $path) { + global $text_domains; + // ensure $path ends with a slash ('/' should work for both, but lets still play nice) + if (substr(php_uname(), 0, 7) == "Windows") { + if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/') + $path .= '\\'; + } else { + if ($path[strlen($path)-1] != '/') + $path .= '/'; + } + if (!array_key_exists($domain, $text_domains)) { + // Initialize an empty domain object. + $text_domains[$domain] = new domain(); + } + $text_domains[$domain]->path = $path; +} + +/** + * Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. + */ +function _bind_textdomain_codeset($domain, $codeset) { + global $text_domains; + $text_domains[$domain]->codeset = $codeset; +} + +/** + * Sets the default domain. + */ +function _textdomain($domain) { + global $default_domain; + $default_domain = $domain; +} + +/** + * Lookup a message in the current domain. + */ +function _gettext($msgid) { + $l10n = _get_reader(); + //return $l10n->translate($msgid); + return _encode($l10n->translate($msgid)); +} +/** + * Alias for gettext. + */ +function __($msgid) { + return _gettext($msgid); +} +/** + * Plural version of gettext. + */ +function _ngettext($single, $plural, $number) { + $l10n = _get_reader(); + //return $l10n->ngettext($single, $plural, $number); + return _encode($l10n->ngettext($single, $plural, $number)); +} + +/** + * Override the current domain. + */ +function _dgettext($domain, $msgid) { + $l10n = _get_reader($domain); + //return $l10n->translate($msgid); + return _encode($l10n->translate($msgid)); +} +/** + * Plural version of dgettext. + */ +function _dngettext($domain, $single, $plural, $number) { + $l10n = _get_reader($domain); + //return $l10n->ngettext($single, $plural, $number); + return _encode($l10n->ngettext($single, $plural, $number)); +} + +/** + * Overrides the domain and category for a single lookup. + */ +function _dcgettext($domain, $msgid, $category) { + $l10n = _get_reader($domain, $category); + //return $l10n->translate($msgid); + return _encode($l10n->translate($msgid)); +} +/** + * Plural version of dcgettext. + */ +function _dcngettext($domain, $single, $plural, $number, $category) { + $l10n = _get_reader($domain, $category); + //return $l10n->ngettext($single, $plural, $number); + return _encode($l10n->ngettext($single, $plural, $number)); +} + + + +// Wrappers to use if the standard gettext functions are available, but the current locale is not supported by the system. +// Use the standard impl if the current locale is supported, use the custom impl otherwise. + +function T_setlocale($category, $locale) { + return _setlocale($category, $locale); +} + +function T_bindtextdomain($domain, $path) { + if (_check_locale()) return bindtextdomain($domain, $path); + else return _bindtextdomain($domain, $path); +} +function T_bind_textdomain_codeset($domain, $codeset) { + // bind_textdomain_codeset is available only in PHP 4.2.0+ + if (_check_locale() and function_exists('bind_textdomain_codeset')) return bind_textdomain_codeset($domain, $codeset); + else return _bind_textdomain_codeset($domain, $codeset); +} +function T_textdomain($domain) { + if (_check_locale()) return textdomain($domain); + else return _textdomain($domain); +} +function T_gettext($msgid) { + if (_check_locale()) return gettext($msgid); + else return _gettext($msgid); +} +function T_($msgid) { + if (_check_locale()) return _($msgid); + return __($msgid); +} +function T_ngettext($single, $plural, $number) { + if (_check_locale()) return ngettext($single, $plural, $number); + else return _ngettext($single, $plural, $number); +} +function T_dgettext($domain, $msgid) { + if (_check_locale()) return dgettext($domain, $msgid); + else return _dgettext($domain, $msgid); +} +function T_dngettext($domain, $single, $plural, $number) { + if (_check_locale()) return dngettext($domain, $single, $plural, $number); + else return _dngettext($domain, $single, $plural, $number); +} +function T_dcgettext($domain, $msgid, $category) { + if (_check_locale()) return dcgettext($domain, $msgid, $category); + else return _dcgettext($domain, $msgid, $category); +} +function T_dcngettext($domain, $single, $plural, $number, $category) { + if (_check_locale()) return dcngettext($domain, $single, $plural, $number, $category); + else return _dcngettext($domain, $single, $plural, $number, $category); +} + + + +// Wrappers used as a drop in replacement for the standard gettext functions + +if (!function_exists('gettext')) { + function bindtextdomain($domain, $path) { + return _bindtextdomain($domain, $path); + } + function bind_textdomain_codeset($domain, $codeset) { + return _bind_textdomain_codeset($domain, $codeset); + } + function textdomain($domain) { + return _textdomain($domain); + } + function gettext($msgid) { + return _gettext($msgid); + } + function _($msgid) { + return __($msgid); + } + function ngettext($single, $plural, $number) { + return _ngettext($single, $plural, $number); + } + function dgettext($domain, $msgid) { + return _dgettext($domain, $msgid); + } + function dngettext($domain, $single, $plural, $number) { + return _dngettext($domain, $single, $plural, $number); + } + function dcgettext($domain, $msgid, $category) { + return _dcgettext($domain, $msgid, $category); + } + function dcngettext($domain, $single, $plural, $number, $category) { + return _dcngettext($domain, $single, $plural, $number, $category); + } +} + +?> diff --git a/include/php-gettext/gettext.php b/include/php-gettext/gettext.php new file mode 100644 index 000000000..f11da2e27 --- /dev/null +++ b/include/php-gettext/gettext.php @@ -0,0 +1,408 @@ +. + Copyright (c) 2005 Nico Kaiser + + This file is part of PHP-gettext. + + PHP-gettext is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + PHP-gettext is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with PHP-gettext; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +/** + * Provides a simple gettext replacement that works independently from + * the system's gettext abilities. + * It can read MO files and use them for translating strings. + * The files are passed to gettext_reader as a Stream (see streams.php) + * + * This version has the ability to cache all strings and translations to + * speed up the string lookup. + * While the cache is enabled by default, it can be switched off with the + * second parameter in the constructor (e.g. whenusing very large MO files + * that you don't want to keep in memory) + */ +class gettext_reader { + //public: + var $error = 0; // public variable that holds error code (0 if no error) + + //private: + var $BYTEORDER = 0; // 0: low endian, 1: big endian + var $STREAM = NULL; + var $short_circuit = false; + var $enable_cache = false; + var $originals = NULL; // offset of original table + var $translations = NULL; // offset of translation table + var $pluralheader = NULL; // cache header field for plural forms + var $total = 0; // total string count + var $table_originals = NULL; // table for original strings (offsets) + var $table_translations = NULL; // table for translated strings (offsets) + var $cache_translations = NULL; // original -> translation mapping + + + /* Methods */ + + + /** + * Reads a 32bit Integer from the Stream + * + * @access private + * @return Integer from the Stream + */ + function readint() { + if ($this->BYTEORDER == 0) { + // low endian + $input=unpack('V', $this->STREAM->read(4)); + return array_shift($input); + } else { + // big endian + $input=unpack('N', $this->STREAM->read(4)); + return array_shift($input); + } + } + + function read($bytes) { + return $this->STREAM->read($bytes); + } + + /** + * Reads an array of Integers from the Stream + * + * @param int count How many elements should be read + * @return Array of Integers + */ + function readintarray($count) { + if ($this->BYTEORDER == 0) { + // low endian + return unpack('V'.$count, $this->STREAM->read(4 * $count)); + } else { + // big endian + return unpack('N'.$count, $this->STREAM->read(4 * $count)); + } + } + + /** + * Constructor + * + * @param object Reader the StreamReader object + * @param boolean enable_cache Enable or disable caching of strings (default on) + */ + function gettext_reader($Reader, $enable_cache = true) { + // If there isn't a StreamReader, turn on short circuit mode. + if (! $Reader || isset($Reader->error) ) { + $this->short_circuit = true; + return; + } + + // Caching can be turned off + $this->enable_cache = $enable_cache; + + $MAGIC1 = "\x95\x04\x12\xde"; + $MAGIC2 = "\xde\x12\x04\x95"; + + $this->STREAM = $Reader; + $magic = $this->read(4); + if ($magic == $MAGIC1) { + $this->BYTEORDER = 1; + } elseif ($magic == $MAGIC2) { + $this->BYTEORDER = 0; + } else { + $this->error = 1; // not MO file + return false; + } + + // FIXME: Do we care about revision? We should. + $revision = $this->readint(); + + $this->total = $this->readint(); + $this->originals = $this->readint(); + $this->translations = $this->readint(); + } + + /** + * Loads the translation tables from the MO file into the cache + * If caching is enabled, also loads all strings into a cache + * to speed up translation lookups + * + * @access private + */ + function load_tables() { + if (is_array($this->cache_translations) && + is_array($this->table_originals) && + is_array($this->table_translations)) + return; + + /* get original and translations tables */ + $this->STREAM->seekto($this->originals); + $this->table_originals = $this->readintarray($this->total * 2); + $this->STREAM->seekto($this->translations); + $this->table_translations = $this->readintarray($this->total * 2); + + if ($this->enable_cache) { + $this->cache_translations = array (); + /* read all strings in the cache */ + for ($i = 0; $i < $this->total; $i++) { + $this->STREAM->seekto($this->table_originals[$i * 2 + 2]); + $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]); + $this->STREAM->seekto($this->table_translations[$i * 2 + 2]); + $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]); + $this->cache_translations[$original] = $translation; + } + } + } + + /** + * Returns a string from the "originals" table + * + * @access private + * @param int num Offset number of original string + * @return string Requested string if found, otherwise '' + */ + function get_original_string($num) { + $length = $this->table_originals[$num * 2 + 1]; + $offset = $this->table_originals[$num * 2 + 2]; + if (! $length) + return ''; + $this->STREAM->seekto($offset); + $data = $this->STREAM->read($length); + return (string)$data; + } + + /** + * Returns a string from the "translations" table + * + * @access private + * @param int num Offset number of original string + * @return string Requested string if found, otherwise '' + */ + function get_translation_string($num) { + $length = $this->table_translations[$num * 2 + 1]; + $offset = $this->table_translations[$num * 2 + 2]; + if (! $length) + return ''; + $this->STREAM->seekto($offset); + $data = $this->STREAM->read($length); + return (string)$data; + } + + /** + * Binary search for string + * + * @access private + * @param string string + * @param int start (internally used in recursive function) + * @param int end (internally used in recursive function) + * @return int string number (offset in originals table) + */ + function find_string($string, $start = -1, $end = -1) { + if (($start == -1) or ($end == -1)) { + // find_string is called with only one parameter, set start end end + $start = 0; + $end = $this->total; + } + if (abs($start - $end) <= 1) { + // We're done, now we either found the string, or it doesn't exist + $txt = $this->get_original_string($start); + if ($string == $txt) + return $start; + else + return -1; + } else if ($start > $end) { + // start > end -> turn around and start over + return $this->find_string($string, $end, $start); + } else { + // Divide table in two parts + $half = (int)(($start + $end) / 2); + $cmp = strcmp($string, $this->get_original_string($half)); + if ($cmp == 0) + // string is exactly in the middle => return it + return $half; + else if ($cmp < 0) + // The string is in the upper half + return $this->find_string($string, $start, $half); + else + // The string is in the lower half + return $this->find_string($string, $half, $end); + } + } + + /** + * Translates a string + * + * @access public + * @param string string to be translated + * @return string translated string (or original, if not found) + */ + function translate($string) { + if ($this->short_circuit) + return $string; + $this->load_tables(); + + if ($this->enable_cache) { + // Caching enabled, get translated string from cache + if (array_key_exists($string, $this->cache_translations)) + return $this->cache_translations[$string]; + else + return $string; + } else { + // Caching not enabled, try to find string + $num = $this->find_string($string); + if ($num == -1) + return $string; + else + return $this->get_translation_string($num); + } + } + + /** + * Sanitize plural form expression for use in PHP eval call. + * + * @access private + * @return string sanitized plural form expression + */ + function sanitize_plural_expression($expr) { + // Get rid of disallowed characters. + $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr); + + // Add parenthesis for tertiary '?' operator. + $expr .= ';'; + $res = ''; + $p = 0; + for ($i = 0; $i < strlen($expr); $i++) { + $ch = $expr[$i]; + switch ($ch) { + case '?': + $res .= ' ? ('; + $p++; + break; + case ':': + $res .= ') : ('; + break; + case ';': + $res .= str_repeat( ')', $p) . ';'; + $p = 0; + break; + default: + $res .= $ch; + } + } + return $res; + } + + /** + * Parse full PO header and extract only plural forms line. + * + * @access private + * @return string verbatim plural form header field + */ + function extract_plural_forms_header_from_po_header($header) { + if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) + $expr = $regs[2]; + else + $expr = "nplurals=2; plural=n == 1 ? 0 : 1;"; + return $expr; + } + + /** + * Get possible plural forms from MO header + * + * @access private + * @return string plural form header + */ + function get_plural_forms() { + // lets assume message number 0 is header + // this is true, right? + $this->load_tables(); + + // cache header field for plural forms + if (! is_string($this->pluralheader)) { + if ($this->enable_cache) { + $header = $this->cache_translations[""]; + } else { + $header = $this->get_translation_string(0); + } + $expr = $this->extract_plural_forms_header_from_po_header($header); + $this->pluralheader = $this->sanitize_plural_expression($expr); + } + return $this->pluralheader; + } + + /** + * Detects which plural form to take + * + * @access private + * @param n count + * @return int array index of the right plural form + */ + function select_string($n) { + $string = $this->get_plural_forms(); + $string = str_replace('nplurals',"\$total",$string); + $string = str_replace("n",$n,$string); + $string = str_replace('plural',"\$plural",$string); + + $total = 0; + $plural = 0; + + eval("$string"); + if ($plural >= $total) $plural = $total - 1; + return $plural; + } + + /** + * Plural version of gettext + * + * @access public + * @param string single + * @param string plural + * @param string number + * @return translated plural form + */ + function ngettext($single, $plural, $number) { + if ($this->short_circuit) { + if ($number != 1) + return $plural; + else + return $single; + } + + // find out the appropriate form + $select = $this->select_string($number); + + // this should contains all strings separated by NULLs + $key = $single.chr(0).$plural; + + + if ($this->enable_cache) { + if (! array_key_exists($key, $this->cache_translations)) { + return ($number != 1) ? $plural : $single; + } else { + $result = $this->cache_translations[$key]; + $list = explode(chr(0), $result); + return $list[$select]; + } + } else { + $num = $this->find_string($key); + if ($num == -1) { + return ($number != 1) ? $plural : $single; + } else { + $result = $this->get_translation_string($num); + $list = explode(chr(0), $result); + return $list[$select]; + } + } + } + +} + +?> diff --git a/include/php-gettext/streams.php b/include/php-gettext/streams.php new file mode 100644 index 000000000..3cdc1584e --- /dev/null +++ b/include/php-gettext/streams.php @@ -0,0 +1,167 @@ +. + + This file is part of PHP-gettext. + + PHP-gettext is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + PHP-gettext is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with PHP-gettext; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + + + // Simple class to wrap file streams, string streams, etc. + // seek is essential, and it should be byte stream +class StreamReader { + // should return a string [FIXME: perhaps return array of bytes?] + function read($bytes) { + return false; + } + + // should return new position + function seekto($position) { + return false; + } + + // returns current position + function currentpos() { + return false; + } + + // returns length of entire stream (limit for seekto()s) + function length() { + return false; + } +}; + +class StringReader { + var $_pos; + var $_str; + + function StringReader($str='') { + $this->_str = $str; + $this->_pos = 0; + } + + function read($bytes) { + $data = substr($this->_str, $this->_pos, $bytes); + $this->_pos += $bytes; + if (strlen($this->_str)<$this->_pos) + $this->_pos = strlen($this->_str); + + return $data; + } + + function seekto($pos) { + $this->_pos = $pos; + if (strlen($this->_str)<$this->_pos) + $this->_pos = strlen($this->_str); + return $this->_pos; + } + + function currentpos() { + return $this->_pos; + } + + function length() { + return strlen($this->_str); + } + +}; + + +class FileReader { + var $_pos; + var $_fd; + var $_length; + + function FileReader($filename) { + if (file_exists($filename)) { + + $this->_length=filesize($filename); + $this->_pos = 0; + $this->_fd = fopen($filename,'rb'); + if (!$this->_fd) { + $this->error = 3; // Cannot read file, probably permissions + return false; + } + } else { + $this->error = 2; // File doesn't exist + return false; + } + } + + function read($bytes) { + if ($bytes) { + fseek($this->_fd, $this->_pos); + + // PHP 5.1.1 does not read more than 8192 bytes in one fread() + // the discussions at PHP Bugs suggest it's the intended behaviour + $data = ''; + while ($bytes > 0) { + $chunk = fread($this->_fd, $bytes); + $data .= $chunk; + $bytes -= strlen($chunk); + } + $this->_pos = ftell($this->_fd); + + return $data; + } else return ''; + } + + function seekto($pos) { + fseek($this->_fd, $pos); + $this->_pos = ftell($this->_fd); + return $this->_pos; + } + + function currentpos() { + return $this->_pos; + } + + function length() { + return $this->_length; + } + + function close() { + fclose($this->_fd); + } + +}; + +// Preloads entire file in memory first, then creates a StringReader +// over it (it assumes knowledge of StringReader internals) +class CachedFileReader extends StringReader { + function CachedFileReader($filename) { + if (file_exists($filename)) { + + $length=filesize($filename); + $fd = fopen($filename,'rb'); + + if (!$fd) { + $this->error = 3; // Cannot read file, probably permissions + return false; + } + $this->_str = fread($fd, $length); + fclose($fd); + + } else { + $this->error = 2; // File doesn't exist + return false; + } + } +}; + + +?> diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php index fd4b907bc..35f686453 100644 --- a/include/picture_comment.inc.php +++ b/include/picture_comment.inc.php @@ -58,13 +58,13 @@ if ( $page['show_comments'] and isset( $_POST['content'] ) ) switch ($comment_action) { case 'moderate': - array_push( $infos, l10n('comment_to_validate') ); + array_push( $infos, l10n('An administrator must authorize your comment before it is visible.') ); case 'validate': - array_push( $infos, l10n('comment_added')); + array_push( $infos, l10n('Your comment has been registered')); break; case 'reject': set_status_header(403); - array_push($infos, l10n('comment_not_added') ); + array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') ); break; default: trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING); diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 2abe2e63b..f0c78357e 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -237,7 +237,7 @@ if ('categories' == $page['section']) } else { - $page['title'] = l10n('no_category'); + $page['title'] = l10n('Home'); } if @@ -361,7 +361,7 @@ SELECT DISTINCT image_id'.get_extra_fields($conf['order_by']).' array( 'items' => $search_result['items'], 'title' => '' - .l10n('search_result').'', + .l10n('Search results').'', ) ); } @@ -375,7 +375,7 @@ SELECT DISTINCT image_id'.get_extra_fields($conf['order_by']).' $page = array_merge( $page, array( - 'title' => l10n('favorites') + 'title' => l10n('Favorites') ) ); @@ -456,7 +456,7 @@ SELECT DISTINCT(id)'.get_extra_fields($conf['order_by']).' $page, array( 'title' => '' - .l10n('recent_pics_cat').'', + .l10n('Recent pictures').'', 'items' => array_from_query($query, 'id'), ) ); @@ -469,7 +469,7 @@ SELECT DISTINCT(id)'.get_extra_fields($conf['order_by']).' $page = array_merge( $page, array( - 'title' => l10n('recent_cats_cat'), + 'title' => l10n('Recent categories'), ) ); } @@ -494,7 +494,7 @@ SELECT DISTINCT(id), hit, file $page, array( 'title' => '' - .$conf['top_number'].' '.l10n('most_visited_cat').'', + .$conf['top_number'].' '.l10n('Most visited').'', 'items' => array_from_query($query, 'id'), ) ); @@ -520,7 +520,7 @@ SELECT DISTINCT(id), average_rate $page, array( 'title' => '' - .$conf['top_number'].' '.l10n('best_rated_cat').'', + .$conf['top_number'].' '.l10n('Best rated').'', 'items' => array_from_query($query, 'id'), ) ); @@ -543,7 +543,7 @@ SELECT DISTINCT(id)'.get_extra_fields($conf['order_by']).' $page, array( 'title' => '' - .l10n('random_cat').'', + .l10n('Random pictures').'', 'items' => array_from_query($query, 'id'), ) ); diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index 8116a50b6..f97fcca35 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -562,7 +562,7 @@ SELECT DISTINCT image_id switch ($comment_action) { case 'reject': - array_push($infos, l10n('comment_not_added') ); + array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') ); return new PwgError(403, implode("\n", $infos) ); case 'validate': case 'moderate': diff --git a/install.php b/install.php index 0b751a475..088122e0c 100644 --- a/install.php +++ b/install.php @@ -231,7 +231,7 @@ if ( isset( $_POST['install'] )) $_POST['dbpasswd'], $_POST['dbname']))!==false) { - array_push( $infos, l10n('step1_confirmation') ); + array_push( $infos, l10n('Parameters are correct') ); $required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION'); if ( version_compare(pwg_get_db_version(), $required_version, '>=') ) @@ -260,18 +260,18 @@ if ( isset( $_POST['install'] )) } else { - array_push( $errors, l10n('step1_err_server') ); + array_push( $errors, l10n('Can\'t connect to server') ); } $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name )); if ( empty($webmaster)) - array_push( $errors, l10n('step2_err_login1') ); + array_push( $errors, l10n('enter a login for webmaster') ); else if ( preg_match( '/[\'"]/', $webmaster ) ) - array_push( $errors, l10n('step2_err_login3') ); + array_push( $errors, l10n('webmaster login can\'t contain characters \' or \"') ); if ( $admin_pass1 != $admin_pass2 || empty($admin_pass1) ) - array_push( $errors, l10n('step2_err_pass') ); + array_push( $errors, l10n('please enter your password again') ); if ( empty($admin_mail)) - array_push( $errors, l10n('reg_err_mail_address') ); + array_push( $errors, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') ); else { $error_mail_address = validate_mail_address(null, $admin_mail); @@ -304,7 +304,7 @@ define(\'DB_COLLATE\', \'\'); { $html_content = htmlentities( $file_content, ENT_QUOTES ); $html_content = nl2br( $html_content ); - $error_copy = l10n('step1_err_copy'); + $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file \"include/config_database.inc.php\"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'); $error_copy .= '
        --------------------------------------------------------------------
        '; $error_copy .= '' . $html_content . ''; $error_copy .= '
        --------------------------------------------------------------------
        '; @@ -442,7 +442,7 @@ else 'F_DB_PREFIX' => $table_prefix, 'F_ADMIN' => $admin_name, 'F_ADMIN_EMAIL' => $admin_mail, - 'L_INSTALL_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'), + 'L_INSTALL_HELP' => sprintf(l10n('Need help ? Ask your question on Piwigo message board.'), PHPWG_URL.'/forum'), )); } @@ -460,7 +460,9 @@ elseif ($step == 3) } else { - array_push($infos, l10n('install_end_message')); + array_push($infos, l10n('The configuration of Piwigo is finished, here is the next step

        +* go to the identification page and use the login/password given for webmaster
        +* this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories')); if (isset($error_copy)) { diff --git a/install/php5_apache_configuration.php b/install/php5_apache_configuration.php index d41542d83..fce474082 100644 --- a/install/php5_apache_configuration.php +++ b/install/php5_apache_configuration.php @@ -108,7 +108,7 @@ function closePage() { echo ' -
        '.sprintf(l10n('install_help'), PHPWG_URL.'/forum').'
        +
        '.sprintf(l10n('Need help ? Ask your question on Piwigo message board.'), PHPWG_URL.'/forum').'
        '; @@ -140,7 +140,7 @@ else echo ' - + @@ -177,7 +177,7 @@ y.callService( {if isset($rating)} - + - + - + @@ -88,7 +88,7 @@ - + @@ -102,13 +102,13 @@
        '.l10n('language').''.l10n('Language').' + diff --git a/template/yoga/comments.tpl b/template/yoga/comments.tpl index d6a78387d..68941e03d 100644 --- a/template/yoga/comments.tpl +++ b/template/yoga/comments.tpl @@ -2,7 +2,7 @@
          -
        • {'home'|@translate}
          • +
        • {'Home'|@translate}

        {'User comments'|@translate}

        diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl index 57d8c31d3..89c034965 100644 --- a/template/yoga/footer.tpl +++ b/template/yoga/footer.tpl @@ -1,7 +1,7 @@ @@ -45,7 +45,7 @@ {if $authorize_remembering }
      • - +
        • @@ -57,7 +57,7 @@

        {if isset($U_REGISTER) } - {'Register'|@translate} {'Register'|@translate} + {'Register'|@translate} {'Register'|@translate} {/if} {'Forgot your password?'|@translate} {'Forgot your password?'|@translate}

        diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl index 9ccaa8376..6bad8e319 100644 --- a/template/yoga/index.tpl +++ b/template/yoga/index.tpl @@ -15,15 +15,15 @@ {/if} {if isset($favorite) } -
      • favorite
        • +
      • favorite
        • {/if} {if isset($U_CADDIE) } -
      • {'caddie'|@translate}
        • +
      • {'caddie'|@translate}
        • {/if} {if isset($U_EDIT) } -
      • {'edit'|@translate}
        • +
      • {'edit'|@translate}
        • {/if} {if isset($U_SEARCH_RULES) } @@ -35,19 +35,19 @@ {/if} {if isset($U_MODE_FLAT) } -
      • {'mode_flat_hint'|@translate}
        • +
      • {'display all elements in all sub-categories'|@translate}
        • {/if} {if isset($U_MODE_NORMAL) } -
      • {'mode_normal_hint'|@translate}
        • +
      • {'return to normal view mode'|@translate}
        • {/if} {if isset($U_MODE_POSTED) } -
      • {'mode_posted_hint'|@translate}
        • +
      • {'display a calendar by posted date'|@translate}
        • {/if} {if isset($U_MODE_CREATED) } -
      • {'mode_created_hint'|@translate}
        • +
      • {'display a calendar by creation date'|@translate}
        • {/if} {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if} @@ -56,7 +56,7 @@

        {$TITLE}

        {if isset($chronology_views) } -
        {'calendar_view'|@translate}: +
        {'View'|@translate}:
        {/if} @@ -52,7 +52,7 @@
        • {'Forgot your password?'|@translate}
          • {if isset($U_REGISTER)} -
        • {'Register'|@translate}
          • +
        • {'Register'|@translate}
          • {/if}
        diff --git a/template/yoga/menubar_menu.tpl b/template/yoga/menubar_menu.tpl index e0ba44483..0d6541b97 100644 --- a/template/yoga/menubar_menu.tpl +++ b/template/yoga/menubar_menu.tpl @@ -1,4 +1,4 @@ -
        {'title_menu'|@translate}
        +
        {'Menu'|@translate}
        {if isset($block->data.qsearch) and $block->data.qsearch==true} diff --git a/template/yoga/menubar_specials.tpl b/template/yoga/menubar_specials.tpl index e551558f6..1f00a2dc9 100644 --- a/template/yoga/menubar_specials.tpl +++ b/template/yoga/menubar_specials.tpl @@ -1,4 +1,4 @@ -
        {'special_categories'|@translate}
        +
        {'Specials'|@translate}
          {foreach from=$block->data item=link} diff --git a/template/yoga/menubar_tags.tpl b/template/yoga/menubar_tags.tpl index 1decddcbb..220175008 100644 --- a/template/yoga/menubar_tags.tpl +++ b/template/yoga/menubar_tags.tpl @@ -10,7 +10,7 @@ + {/if} - {$tag.name}{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *} + {$tag.name}{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *} {/foreach}
        diff --git a/template/yoga/navigation_bar.tpl b/template/yoga/navigation_bar.tpl index a4c0b3bbc..82c66bd15 100644 --- a/template/yoga/navigation_bar.tpl +++ b/template/yoga/navigation_bar.tpl @@ -1,10 +1,10 @@
        {if isset($navbar.URL_FIRST)} - {'first_page'|@translate} | - | + {'First'|@translate} | + | {else} - {'first_page'|@translate} | - {'previous_page'|@translate} | + {'First'|@translate} | + {'Previous'|@translate} | {/if} {assign var='prev_page' value=0} @@ -19,10 +19,10 @@ {/foreach} {if isset($navbar.URL_NEXT)} - | - | {'last_page'|@translate} + | + | {'Last'|@translate} {else} - | {'next_page'|@translate} - | {'last_page'|@translate} + | {'Next'|@translate} + | {'Last'|@translate} {/if}
        diff --git a/template/yoga/nbm.tpl b/template/yoga/nbm.tpl index 68e523069..646335813 100644 --- a/template/yoga/nbm.tpl +++ b/template/yoga/nbm.tpl @@ -2,9 +2,9 @@
          -
        • {'home'|@translate}
          • +
        • {'Home'|@translate}
        -

        {'nbm_item_notification'|@translate}

        +

        {'Notification'|@translate}

        {if not empty($errors)} diff --git a/template/yoga/notification.tpl b/template/yoga/notification.tpl index e313aff21..8f6dcb680 100644 --- a/template/yoga/notification.tpl +++ b/template/yoga/notification.tpl @@ -1,12 +1,12 @@ {html_head} - + {/html_head}
          -
        • {'home'|@translate}
          • +
        • {'Home'|@translate}

        {'Notification'|@translate}

        @@ -18,7 +18,7 @@ {'Image only RSS feed'|@translate}

        - {'Complete RSS feed'|@translate} + {'Complete RSS feed (images, comments)'|@translate}
        diff --git a/template/yoga/password.tpl b/template/yoga/password.tpl index fec7d53fa..1e0471bd5 100644 --- a/template/yoga/password.tpl +++ b/template/yoga/password.tpl @@ -2,7 +2,7 @@
          -
        • {'home'|@translate}
          • +
        • {'Home'|@translate}

        {'Password forgotten'|@translate}

        diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl index 0572c8e07..25f065868 100644 --- a/template/yoga/picture.tpl +++ b/template/yoga/picture.tpl @@ -28,7 +28,7 @@
        - {'home'|@translate} + {'Home'|@translate} {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if} {$LEVEL_SEPARATOR}{$current.TITLE}
        @@ -44,21 +44,21 @@ {'slideshow'|@translate} {/if} {if isset($U_SLIDESHOW_STOP) } - {'slideshow_stop'|@translate} + {'stop the slideshow'|@translate} {/if} - metadata + metadata {if isset($current.U_DOWNLOAD) } - {'download'|@translate} + {'download'|@translate} {/if} {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} {if isset($favorite) } favorite {/if} {if !empty($U_SET_AS_REPRESENTATIVE) } - {'representative'|@translate} + {'representative'|@translate} {/if} {if isset($U_ADMIN) } - {'edit'|@translate} + {'edit'|@translate} {/if} {if isset($U_CADDIE) }{*caddie management BEGIN*} - {'caddie'|@translate} + {'caddie'|@translate} {/if}{*caddie management END*}
        {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} @@ -92,19 +92,19 @@ y.callService( {if isset($U_SLIDESHOW_STOP) }

        - [ {'slideshow_stop'|@translate} ] + [ {'stop the slideshow'|@translate} ]

        {/if}
        {if isset($previous) } - {/if} {if isset($next) } - {/if} @@ -168,7 +168,7 @@ y.callService( {assign var='rate_text' value='%.2f (rated %d times, standard deviation = %.2f)'|@translate } {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) } {else} - {'no_rate'|@translate} + {'no rate'|@translate} {/if}
        - {if isset($rating.USER_RATE)}{'update_rate'|@translate}{else}{'new_rate'|@translate}{/if} + {if isset($rating.USER_RATE)}{'Rate this picture'|@translate}{else}{'Rate this picture'|@translate}{/if} @@ -264,11 +264,11 @@ y.callService( {if isset($comment_add)}
        - {'comments_add'|@translate} + {'Add a comment'|@translate} {if $comment_add.SHOW_AUTHOR} - + {/if} - +
        diff --git a/template/yoga/picture_content.tpl b/template/yoga/picture_content.tpl index 0081cd805..384a9ce1a 100644 --- a/template/yoga/picture_content.tpl +++ b/template/yoga/picture_content.tpl @@ -7,5 +7,5 @@ {/if}> {if isset($high) } -

        {'picture_high'|@translate}

        +

        {'Click on the picture to see it in high definition'|@translate}

        {/if} diff --git a/template/yoga/picture_nav_buttons.tpl b/template/yoga/picture_nav_buttons.tpl index ead51219a..15b6afa40 100644 --- a/template/yoga/picture_nav_buttons.tpl +++ b/template/yoga/picture_nav_buttons.tpl @@ -1,59 +1,59 @@
        {if isset($last)} - {'last_page'|@translate} + {'Last'|@translate} {else} {/if} {if isset($next)} - + {else} {/if} {if isset($slideshow.U_START_PLAY)} - {'start_play'|@translate} + {'Play of slideshow'|@translate} {/if} {if isset($slideshow.U_STOP_PLAY)} - {'stop_play'|@translate} + {'Pause of slideshow'|@translate} {/if} {if isset($U_UP) and !isset($slideshow)} - {'thumbnails'|@translate} + {'Thumbnails'|@translate} {/if} {if isset($previous)} - + {else} {/if} {if isset($first)} - {'first_page'|@translate} + {'First'|@translate} {else} {/if} {if isset($slideshow.U_START_REPEAT)} - {'start_repeat'|@translate} + {'Repeat the slideshow'|@translate} {/if} {if isset($slideshow.U_STOP_REPEAT)} - {'stop_repeat'|@translate} + {'Not repeat the slideshow'|@translate} {/if} {if isset($slideshow)} {if isset($slideshow.U_DEC_PERIOD)} - {'dec_period'|@translate} + {'Accelerate diaporama speed'|@translate} {else} {/if} {if isset($slideshow.U_INC_PERIOD)} - {'inc_period'|@translate} + {'Reduce diaporama speed'|@translate} {else} {/if} diff --git a/template/yoga/profile.tpl b/template/yoga/profile.tpl index 53fdeab82..b94c3967c 100644 --- a/template/yoga/profile.tpl +++ b/template/yoga/profile.tpl @@ -12,7 +12,7 @@
          -
        • {'home'|@translate}
          • +
        • {'Home'|@translate}

        {'Profile'|@translate}

        diff --git a/template/yoga/profile_content.tpl b/template/yoga/profile_content.tpl index e81a28c63..e6736f078 100644 --- a/template/yoga/profile_content.tpl +++ b/template/yoga/profile_content.tpl @@ -25,7 +25,7 @@ {/if}
      • - +
        • @@ -40,60 +40,60 @@
        - {'preferences'|@translate} + {'Preferences'|@translate}
        • - +
        • - +
        • - + {html_options name=template options=$template_options selected=$template_selection}
        • - + {html_options name=language options=$language_options selected=$language_selection}
        • - +
        • - {'auto_expand'|@translate} + {'Expand all categories'|@translate} {html_radios name='expand' options=$radio_options selected=$EXPAND}
        • - {'show_nb_comments'|@translate} + {'Show number of comments'|@translate} {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
        • - {'show_nb_hits'|@translate} + {'Show number of hits'|@translate} {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
        • - +
        • - +
          • @@ -103,7 +103,7 @@

          - +

          diff --git a/template/yoga/redirect.tpl b/template/yoga/redirect.tpl index 65afd2f2d..aa90953ec 100644 --- a/template/yoga/redirect.tpl +++ b/template/yoga/redirect.tpl @@ -8,6 +8,6 @@

          - {'click_to_redirect'|@translate} + {'Click here if your browser does not automatically forward you'|@translate}

          diff --git a/template/yoga/register.tpl b/template/yoga/register.tpl index bd7792617..7e5a31d70 100644 --- a/template/yoga/register.tpl +++ b/template/yoga/register.tpl @@ -4,7 +4,7 @@
            -
          • {'home'|@translate}
            • +
          • {'Home'|@translate}

          {'Registration'|@translate}

          diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl index 76e8ce9ea..57f799e75 100644 --- a/template/yoga/search.tpl +++ b/template/yoga/search.tpl @@ -22,7 +22,7 @@
          • (?)
            • -
          • {'home'|@translate}
            • +
          • {'Home'|@translate}

          {'Search'|@translate}

          @@ -40,18 +40,18 @@
          {'Filter'|@translate} -
          @@ -66,9 +66,9 @@ {/if}
          - {'search_date'|@translate} + {'Search by Date'|@translate}
            -
            • +
            • @@ -77,7 +77,7 @@
            -
            • +
          • @@ -117,14 +117,14 @@
          - {'search_options'|@translate} -
        {'mail_address'|@translate} *{'E-mail address'|@translate} *
        {'upload_name'|@translate}{'Name of the picture'|@translate}
        {'upload_author'|@translate}{'Author'|@translate}
        {'comment'|@translate}{'Comment'|@translate}
        {else} - {'upload_successful'|@translate}
        + {'Picture uploaded with success, an administrator will validate it as soon as possible'|@translate}
        {/if} {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS} -
        * : {'mandatory'|@translate}
        +
        * : {'obligatory'|@translate}
        {/if} diff --git a/upgrade.php b/upgrade.php index 394bed440..ec379432d 100644 --- a/upgrade.php +++ b/upgrade.php @@ -194,7 +194,7 @@ $template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma'); $template->set_filenames(array('upgrade'=>'upgrade.tpl')); $template->assign(array( 'RELEASE' => PHPWG_VERSION, - 'L_UPGRADE_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'), + 'L_UPGRADE_HELP' => sprintf(l10n('Need help ? Ask your question on Piwigo message board.'), PHPWG_URL.'/forum'), ) ); @@ -278,9 +278,11 @@ if (isset($_POST['submit']) and check_upgrade()) if (!@file_put_contents($config_file, $config_file_contents)) { array_push($page['infos'], - l10n('in include/config_database.inc.php, before ?>, insert:') . ' -

        ' - ); + l10n_args('in %s, before ?>, insert:', + 'include/config_database.inc.php') . + '

        ' + ); } } @@ -314,7 +316,7 @@ if (isset($_POST['submit']) and check_upgrade()) ); array_push($page['infos'], - l10n('perform a maintenance check') + l10n('Perform a maintenance check in [Administration>Specials>Maintenance] if you encounter any problem.') ); // Save $page['infos'] in order to restore after maintenance actions diff --git a/upload.php b/upload.php index 94591cf03..8d362dd27 100644 --- a/upload.php +++ b/upload.php @@ -61,7 +61,7 @@ function validate_upload( $temp_name, $my_max_file_size, $extension = get_extension( $_FILES['picture']['name'] ); if (!in_array($extension, $conf['picture_ext'])) { - array_push( $result['error'], l10n('upload_advise_filetype') ); + array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') ); return $result; } if ( !isset( $_FILES['picture'] ) ) @@ -72,7 +72,7 @@ function validate_upload( $temp_name, $my_max_file_size, else if ( $_FILES['picture']['size'] > $my_max_file_size * 1024 ) { array_push( $result['error'], - l10n('upload_advise_filesize').$my_max_file_size.' KB' ); + l10n('the filesize of the picture must not exceed : ').$my_max_file_size.' KB' ); } else { @@ -80,7 +80,7 @@ function validate_upload( $temp_name, $my_max_file_size, // upload de la photo sous un nom temporaire if ( !move_uploaded_file( $_FILES['picture']['tmp_name'], $temp_name ) ) { - array_push( $result['error'], l10n('upload_cannot_upload') ); + array_push( $result['error'], l10n('can\'t upload the picture on the server') ); } else { @@ -90,14 +90,14 @@ function validate_upload( $temp_name, $my_max_file_size, and $size[0] > $image_max_width ) { array_push( $result['error'], - l10n('upload_advise_width').$image_max_width.' px' ); + l10n('the width of the picture must not exceed : ').$image_max_width.' px' ); } if ( isset( $image_max_height ) and $image_max_height != "" and $size[1] > $image_max_height ) { array_push( $result['error'], - l10n('upload_advise_height').$image_max_height.' px' ); + l10n('the height of the picture must not exceed : ').$image_max_height.' px' ); } // $size[2] == 1 means GIF // $size[2] == 2 means JPG @@ -108,7 +108,7 @@ function validate_upload( $temp_name, $my_max_file_size, case 2 : $result['type'] = 'jpg'; break; case 3 : $result['type'] = 'png'; break; default : - array_push( $result['error'], l10n('upload_advise_filetype') ); + array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') ); } } } @@ -181,21 +181,21 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) ) $path = $category['cat_dir'].$_FILES['picture']['name']; if ( @is_file( $path ) ) { - array_push( $error, l10n('upload_file_exists') ); + array_push( $error, l10n('A picture\'s name already used') ); } // test de la pr�sence des champs obligatoires if ( empty($_FILES['picture']['name'])) { - array_push( $error, l10n('upload_filenotfound') ); + array_push( $error, l10n('You must choose a picture fileformat for the image') ); } if ( !preg_match( '/([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)/', $_POST['mail_address'] ) ) { - array_push( $error, l10n('reg_err_mail_address') ); + array_push( $error, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') ); } if ( empty($_POST['username']) ) { - array_push( $error, l10n('upload_err_username') ); + array_push( $error, l10n('the username must be given') ); } $date_creation = ''; @@ -209,7 +209,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) ) } else { - array_push( $error, l10n('err_date') ); + array_push( $error, l10n('wrong date') ); } } // creation of the "infos" field : @@ -224,7 +224,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) ) if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $_FILES['picture']['name'] ) ) { - array_push( $error, l10n('update_wrong_dirname') ); + array_push( $error, l10n('wrong filename') ); } if ( sizeof( $error ) == 0 ) @@ -318,7 +318,7 @@ if ( isset( $_POST['submit'] ) and isset( $_GET['waiting_id'] ) ) // // Start output of page // -$title= l10n('upload_title'); +$title= l10n('Upload a picture'); $page['body_id'] = 'theUploadPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('upload'=>'upload.tpl')); @@ -350,7 +350,7 @@ $u_form.= '&waiting_id='.$page['waiting_id']; if ( isset( $page['waiting_id'] ) ) { - $advise_title = l10n('upload_advise_thumbnail').$_FILES['picture']['name']; + $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to ').$_FILES['picture']['name']; } else { @@ -381,7 +381,7 @@ if ( !$page['upload_successful'] ) //--------------------------------------------------------------------- advises if ( !empty($conf['upload_maxfilesize']) ) { - $content = l10n('upload_advise_filesize'); + $content = l10n('the filesize of the picture must not exceed : '); $content.= $conf['upload_maxfilesize'].' KB'; $template->append('advises', $content); } @@ -390,13 +390,13 @@ if ( !$page['upload_successful'] ) { if ( $conf['upload_maxwidth_thumbnail'] != '' ) { - $content = l10n('upload_advise_width'); + $content = l10n('the width of the picture must not exceed : '); $content.= $conf['upload_maxwidth_thumbnail'].' px'; $template->append('advises', $content); } if ( $conf['upload_maxheight_thumbnail'] != '' ) { - $content = l10n('upload_advise_height'); + $content = l10n('the height of the picture must not exceed : '); $content.= $conf['upload_maxheight_thumbnail'].' px'; $template->append('advises', $content); } @@ -405,18 +405,18 @@ if ( !$page['upload_successful'] ) { if ( $conf['upload_maxwidth'] != '' ) { - $content = l10n('upload_advise_width'); + $content = l10n('the width of the picture must not exceed : '); $content.= $conf['upload_maxwidth'].' px'; $template->append('advises', $content); } if ( $conf['upload_maxheight'] != '' ) { - $content = l10n('upload_advise_height'); + $content = l10n('the height of the picture must not exceed : '); $content.= $conf['upload_maxheight'].' px'; $template->append('advises', $content); } } - $template->append('advises', l10n('upload_advise_filetype')); + $template->append('advises', l10n('the picture must be to the fileformat jpg, gif or png')); //----------------------------------------- optionnal username and mail address if ( !isset( $page['waiting_id'] ) ) -- cgit v1.2.3