From 45396e375e645dc5184c5ff5e2e77e5cde07c0d8 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 24 Sep 2005 18:59:38 +0000 Subject: [PATCH] r438: - change "phrase" to "string" - change structure of .strings.xml - changed fetch_phrases() to fetch_strings() --- includes/init.php | 2 +- includes/language.php | 8 +- includes/strings/english-us.strings.xml | 1216 +++++++++++------------ 3 files changed, 613 insertions(+), 613 deletions(-) diff --git a/includes/init.php b/includes/init.php index b9386f1..8024588 100755 --- a/includes/init.php +++ b/includes/init.php @@ -116,7 +116,7 @@ $bugsys->load('localize'); require_once('./includes/language.php'); $LANGDATA = fetch_user_language(); -$lang->init_with_table(fetch_phrases($LANGDATA['id'])); +$lang->init_with_table(fetch_strings($LANGDATA['id'])); // ################################################################### // initialize the date system diff --git a/includes/language.php b/includes/language.php index 1f5b11a..f15e58d 100644 --- a/includes/language.php +++ b/includes/language.php @@ -23,7 +23,7 @@ function build_language_cache($languageid) $bugsys->db->query("DELETE FROM localization WHERE languageid = $languageid"); - $localizations = fetch_phrases($language['languageid'], true); + $localizations = fetch_strings($language['languageid'], true); foreach ($localizations AS $key => $value) { $bugsys->db->query("INSERT INTO localization (localkey, localtext, languageid) VALUES ('" . $bugsys->escape($key) . "', '" . $bugsys->escape($value) . "', $languageid)"); @@ -32,7 +32,7 @@ function build_language_cache($languageid) // ################################################################### // fetches phrases from the system -function fetch_phrases($languageid, $forcexml = false) +function fetch_strings($languageid, $forcexml = false) { global $bugsys; @@ -56,9 +56,9 @@ function fetch_phrases($languageid, $forcexml = false) } $xml = $bugsys->xml->parse($xmldata); - foreach ($xml['language']['phrase'] AS $phrase) + foreach ($xml['localization']['string'] AS $string) { - $locals[ $phrase['key']['value'] ] = $phrase['value']['value']; + $locals[ $string['key']['value'] ] = $string['value']['value']; } } else diff --git a/includes/strings/english-us.strings.xml b/includes/strings/english-us.strings.xml index 250db0d..af291e3 100755 --- a/includes/strings/english-us.strings.xml +++ b/includes/strings/english-us.strings.xml @@ -1,1824 +1,1824 @@ - + - + - + - + account_activated - + - + account_pending_approval - + - + action - + - + actions - + - + additional_bug_fields - + - + add_comment - + - + add_component - + - + add_new_action - + - + add_new_field - + - + add_new_language - + - + add_new_priority - + - + add_new_product - + - + add_new_resolution - + - + add_new_severity - + - + add_new_status - + - + add_new_usergroup - + - + add_new_version - + - + add_product - + - + add_to_favourites - + - + add_version - + - + administration_x - + - + admin_locations - + - + admin_menu - + - + alert_bad_attachment - + - + alert_bad_bug - + - + already_logged_in - + - + attachment_added - + - + attachment_deleted - + - + attachment_updated - + - + automatic_actions - + - + bugstrike_login - + - + bugstrike_settings - + - + bug_added - + - + bug_edit_done - + - + bug_fields - + - + cant_delete_default_usergroup - + - + can_be_searched - + - + can_view_edit_field - + - + can_view_field - + - + character_set - + - + charset - + - + checkbox_flag - + - + checked - + - + checked_by_default - + - + comment_added - + - + comment_updated - + - + component - + - + confirm - + - + confirm_action_delete - + - + confirm_custom_field_delete - + - + confirm_delete_priority - + - + confirm_delete_product - + - + confirm_delete_resolution - + - + confirm_delete_severity - + - + confirm_delete_status - + - + confirm_delete_usergroup - + - + confirm_delete_version - + - + custom_bug_fields - + - + custom_field_added - + - + custom_field_error_need_field_changes - + - + custom_field_need_values - + - + custom_field_permissions - + - + custom_field_updated - + - + default_language - + - + default_value - + - + delete - + - + delete_field - + - + description - + - + direction - + - + display_name - + - + display_name_description - + - + drop_dwon_menu - + - + edit - + - + edit_auto_action - + - + edit_field - + - + edit_language - + - + edit_priority - + - + edit_priority_title - + - + edit_product - + - + edit_product_title - + - + edit_resolution - + - + edit_resolution_title - + - + edit_settings - + - + edit_severity - + - + edit_severity_title - + - + edit_status - + - + edit_status_title - + - + edit_usergroup - + - + edit_version - + - + edit_version_title - + - + email - + - + error - + - + error_already_registered - + - + error_already_voted - + - + error_enter_bug_description - + - + error_enter_bug_title - + - + error_file_not_in_tmp - + - + error_file_not_uploaded - + - + error_file_not_uploaded_at_all - + - + error_file_partial_upload - + - + error_file_too_big - + - + error_file_too_big_php - + - + error_invalid_id - + - + error_invalid_registration_key - + - + error_need_action_name - + - + error_need_credentials - + - + error_need_display_name - + - + error_need_file_description - + - + error_need_summary - + - + error_no_comment_text - + - + error_no_new_registrations - + - + error_no_permission - + - + favourite_added - + - + favourite_removed - + - + field_changes - + - + field_id - + - + field_type - + - + field_x_is_required - + - + fill_in_version_number - + - + global_fields - + - + global_versions - + - + go - + - + go_back_and_fill_both_fields - + - + guest - + - + home - + - + inavlid_email_pass - + - + invalid_admin_session_terminated - + - + invalid_comment_id - + - + invalid_field_type - + - + invalid_jump_location - + - + invalid_pcv - + - + logged_out - + - + login - + - + login_redirect - + - + logout - + - + log_kill_attachment - + - + log_mark_obsoletes - + - + log_new_attachment - + - + log_new_attachment_comment - + - + log_new_comment - + - + log_update_attachment - + - + log_update_bug - + - + log_update_comment - + - + ltr - + - + make_first_option_default - + - + manage_phrases - + - + master_languages - + - + max_length - + - + name - + - + need_to_activate_account - + - + new_auto_action - + - + new_priority - + - + new_resolution - + - + new_severity - + - + new_status - + - + new_usergroup - + - + no - + - + not_logged_in - + - + no_permission - + - + number_of_users - + - + obsoleted_attachments - + - + options - + - + password - + - + permissions_canadminbugs - + - + permissions_canadminfields - + - + permissions_canadmingroups - + - + permissions_canadminpanel - + - + permissions_canadmintools - + - + permissions_canadminusers - + - + permissions_canadminversions - + - + permissions_canassign - + - + permissions_canbeassignedto - + - + permissions_canchangestatus - + - + permissions_caneditattach - + - + permissions_caneditinfo - + - + permissions_caneditothers - + - + permissions_caneditown - + - + permissions_cangetattach - + - + permissions_canpostcomments - + - + permissions_canputattach - + - + permissions_cansearch - + - + permissions_cansubmitbugs - + - + permissions_cansubscribe - + - + permissions_canviewbugs - + - + permissions_canviewhidden - + - + permissions_canvote - + - + permissions_group_admin - + - + permissions_group_general - + - + permissions_group_moderation - + - + permissions_group_posting - + - + priorities - + - + priority - + - + The order in which the priorities are displayed. The higher the number, the lower down in the list it is.]]> The order in which the priorities are displayed. The higher the number, the lower down in the list it is.]]> priority_display_order - + - + priority_manager - + - + The title of this priority flag (eg: `Slated for Development` or `Address Now`)]]> The title of this priority flag (eg: `Slated for Development` or `Address Now`)]]> priority_title - + - + private - + - + producs_versions_components - + - + product - + - + products_and_versions - + - + products_versions - + - + A short description of this product.]]> A short description of this product.]]> product_description - + - + The order in which the products are displayed.]]> The order in which the products are displayed.]]> product_display_order - + - + The name that can be used to submit email reports. This should be unique.]]> The name that can be used to submit email reports. This should be unique.]]> product_shortname - + - + product_title - + - + redirect - + - + regex_match - + - + register_blank_email - + - + register_blank_password - + - + register_emails_no_match - + - + register_email_in_use - + - + register_invalid_email - + - + register_passwords_no_match - + - + registration_complete - + - + remove_from_favourites - + - + required - + - + reset - + - + resolution - + - + resolutions - + - + The order in which the resolutions are displayed. The higher the number, the lower down in the list it is.]]> The order in which the resolutions are displayed. The higher the number, the lower down in the list it is.]]> resolution_display_order - + - + resolution_manager - + - + The title of this resolution flag (eg: `Fixed` or `Bogus`)]]> The title of this resolution flag (eg: `Fixed` or `Bogus`)]]> resolution_title - + - + rtl - + - + save_display_order - + - + search_no_criteria - + - + search_no_results - + - + selection_values - + - + select_type - + - + settinggroup_general - + - + settinggroup_pagination - + - + settinggroup_reporting - + - + settinggroup_untouchables - + - + settings - + - + yes if you want to allow users to post raw HTML in their bug reports. This is very dangerous and it is not recommended.]]> yes if you want to allow users to post raw HTML in their bug reports. This is very dangerous and it is not recommended.]]> setting_allowhtml_desc - + - + setting_allowhtml_title - + - + setting_allownewreg_desc - + - + setting_allownewreg_title - + - + setting_dateformat_desc - + - + setting_dateformat_title - + - + Not Selected.]]> Not Selected.]]> setting_defaultassign_desc - + - + setting_defaultassign_title - + - + setting_defaultcomment_desc - + - + setting_defaultcomment_title - + - + setting_defaultpp_desc - + - + setting_defaultpp_title - + - + setting_defaultpriority_desc - + - + setting_defaultpriority_title - + - + setting_defaultresolve_desc - + - + setting_defaultresolve_title - + - + setting_defaultseverity_desc - + - + setting_defaultseverity_title - + - + setting_defaultstatus_desc - + - + setting_defaultstatus_title - + - + setting_maxpp_desc - + - + setting_maxpp_title - + - + setting_moderatenewusers_desc - + - + setting_moderatenewusers_title - + - + setting_pagelinks_desc - + - + setting_pagelinks_title - + - + yes will send all new users, after they've been verified, a welcoming email.]]> yes will send all new users, after they've been verified, a welcoming email.]]> setting_sendwelcomemail_desc - + - + setting_sendwelcomemail_title - + - + setting_trackertitle_desc - + - + setting_trackertitle_title - + - + setting_trackerversion_desc - + - + setting_trackerversion_title - + - + setting_verifyemail_desc - + - + setting_verifyemail_title - + - + setting_webmasteremail_desc - + - + setting_webmasteremail_title - + - + severities - + - + severity - + - + The order in which the severities are displayed. The higher the number, the lower down in the list it is.]]> The order in which the severities are displayed. The higher the number, the lower down in the list it is.]]> severity_display_order - + - + severity_manager - + - + The title of this severity flag (eg: `Major` or `Critical`)]]> The title of this severity flag (eg: `Major` or `Critical`)]]> severity_title - + - + single_line_text_box - + - + status - + - + statuses - + - + The colour of the status. This will be displayed on bug listings page to make viewing easier. Note: you must enter the # sign if you are using HEX values.]]> The colour of the status. This will be displayed on bug listings page to make viewing easier. Note: you must enter the # sign if you are using HEX values.]]> status_color - + - + The order in which the statuses ar displayed.]]> The order in which the statuses ar displayed.]]> status_display_order - + - + status_manager - + - + The title of this status flag (eg: `Confirmed` or `Closed (Fixed)`)]]> The title of this status flag (eg: `Confirmed` or `Closed (Fixed)`)]]> status_title - + - + submit - + - + title - + - + tracker_home - + - + type_specific_fields - + - + unchecked - + - + usergroup - + - + usergroups - + - + Place all closed HTML tags that will close any open HTML tags entered above.]]> Place all closed HTML tags that will close any open HTML tags entered above.]]> usergroup_close_markup - + - + usergroup_details - + - + This is the title that others will be able to see when comments are posted.]]> This is the title that others will be able to see when comments are posted.]]> usergroup_display_title - + - + usergroup_manager - + - + Place all open HTML tags here that will be wrapped around the username.]]> Place all open HTML tags here that will be wrapped around the username.]]> usergroup_open_markup - + - + usergroup_permission_settings - + - + usergroup_title - + - + user_management - + - + user_selectable - + - + version - + - + The order in which the versions are displayed.]]> The order in which the versions are displayed.]]> version_display_order - + - + This is the version string for this product.]]> This is the version string for this product.]]> version_title - + - + vote_added - + - + here.]]> here.]]> wait_to_be_redirected - + - + yes - + - \ No newline at end of file + \ No newline at end of file -- 2.22.5