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 --- admin/include/c13y_internal.class.php | 12 ++++++------ admin/include/check_integrity.class.php | 6 +++--- admin/include/functions.php | 8 ++++---- admin/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 +- 8 files changed, 31 insertions(+), 31 deletions(-) (limited to 'admin/include') 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']); -- cgit v1.2.3