Skip to content

Commit

Permalink
Remove and consolidate language strings
Browse files Browse the repository at this point in the history
- Deleted unused Profile-related strings
- Regrouped duplicated strings, e.g. edit_profile_title -> edit_profile,
  add_profile_title and add_profile_button -> add_profile
- Renamed additional_description -> profile_description
- Moved generic strings out of the "User/Global Profiles" block

Fixes #11463, #27258
  • Loading branch information
dregad committed Sep 18, 2020
1 parent 6677d03 commit 7bf00a0
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 40 deletions.
6 changes: 3 additions & 3 deletions account_prof_edit_page.php
Expand Up @@ -105,7 +105,7 @@
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-user"></i>
<?php echo lang_get( 'edit_profile_title' ) ?>
<?php echo lang_get( 'edit_profile' ) ?>
</h4>
</div>

Expand Down Expand Up @@ -158,7 +158,7 @@ class="input-sm" size="16" maxlength="16"
<tr>
<th class="category">
<label for="description">
<?php echo lang_get( 'additional_description' ) ?>
<?php echo lang_get( 'profile_description' ) ?>
</label>
</th>
<td>
Expand All @@ -180,7 +180,7 @@ class="form-control"
<?php echo lang_get( 'required' ) ?>
</span>
<button class="btn btn-primary btn-white btn-round">
<?php echo lang_get( 'update_profile_button' ) ?>
<?php echo lang_get( 'update_profile' ) ?>
</button>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions account_prof_menu_page.php
Expand Up @@ -245,7 +245,7 @@
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-file-o"></i>
<?php echo lang_get( 'add_profile_title' ) ?>
<?php echo lang_get( 'add_profile' ) ?>
</h4>
</div>

Expand Down Expand Up @@ -295,7 +295,7 @@
<tr>
<td class="category">
<label for="description">
<?php echo lang_get( 'additional_description' ) ?>
<?php echo lang_get( 'profile_description' ) ?>
</label>
</td>
<td>
Expand All @@ -314,7 +314,7 @@ class="form-control"
* <?php echo lang_get( 'required' ); ?>
</span>
<button class="btn btn-primary btn-white btn-round">
<?php echo lang_get('add_profile_button'); ?>
<?php echo lang_get('add_profile'); ?>
</button>
</div>
</div>
Expand Down
44 changes: 13 additions & 31 deletions lang/strings_english.txt
Expand Up @@ -420,37 +420,16 @@ $s_prefs_reset_msg = 'Preferences have been reset...';
# account_prefs_update.php
$s_prefs_updated_msg = 'Preferences have been updated...';

# account_profile_add.php
$s_profile_added_msg = 'Profile added...';

# account_profile_delete.php
$s_profile_deleted_msg = 'Deleted profile...';

# account_profile_edit_page.php
$s_edit_profile_title = 'Edit Profile';
$s_platform = 'Platform';
$s_additional_description = 'Additional Description';
$s_update_profile_button = 'Update Profile';
$s_global_profile = 'Global Profile';
$s_default_profile = 'Default Profile';
$s_delete_profile_confirm_msg = 'Are you sure you want to delete profile "%1$s"?';

# account_profile_make_default.php
$s_profile_defaulted_msg = 'Default profile updated...';

# account_profile_manage_page.php
$s_add_profile_title = 'Add Profile';
$s_add_profile_button = 'Add Profile';
$s_edit_or_delete_profiles_title = 'Edit or Delete Profiles';
# User/Global Profiles
$s_select_profile = 'Select Profile';
$s_add_profile = 'Add Profile';
$s_edit_profile = 'Edit Profile';
$s_make_default = 'Make Default';
$s_clear_default = 'Clear Default';
$s_update_profile = 'Update Profile';
$s_delete_profile = 'Delete Profile';
$s_select_profile = 'Select Profile';
$s_submit_button = 'Submit';

# account_profile_update.php
$s_profile_updated_msg = 'Profile updated...';
$s_delete_profile_confirm_msg = 'Are you sure you want to delete profile "%1$s"?';
$s_global_profile = 'Global Profile';
$s_default_profile = 'Default Profile';
$s_profile_description = 'System Description';

# account_sponsor_page.php
$s_my_sponsorship = 'My Sponsorships';
Expand Down Expand Up @@ -581,8 +560,9 @@ $s_resolution = 'Resolution';
$s_status = 'Status';
$s_duplicate_id = 'Duplicate ID';
$s_os = 'OS';
$s_projection = 'Projection';
$s_platform = 'Platform';
$s_os_build = 'OS Version';
$s_projection = 'Projection';
$s_eta = 'ETA';
$s_product_version = 'Product Version';
$s_build = 'Build';
Expand Down Expand Up @@ -1280,7 +1260,6 @@ $s_set_as_persistent_filter = 'Set as persistent filter';
# bug_view_advanced_page.php
$s_view_simple_link = 'View Simple';
$s_product_build = 'Product Build';
$s_system_profile = 'System Description';
$s_update_bug_button = 'Edit';
$s_bug_assign_to_button = 'Assign To:';
$s_bug_status_to_button = 'Change Status To:';
Expand Down Expand Up @@ -1815,3 +1794,6 @@ $s_persist = 'Persist';
$s_load = 'Load';
$s_apply_changes = 'Apply changes';
$s_undo = 'Undo';
$s_submit = 'Submit';
$s_make_default = 'Make Default';
$s_clear_default = 'Clear Default';
2 changes: 1 addition & 1 deletion lost_pwd_page.php
Expand Up @@ -109,7 +109,7 @@
<div class="space-10"></div>
<?php echo lang_get( 'lost_password_info' ); ?>
<div class="space-10"></div>
<input type="submit" class="width-40 pull-right btn btn-success btn-inverse bigger-110" value="<?php echo lang_get( 'submit_button' ) ?>" />
<input type="submit" class="width-40 pull-right btn btn-success btn-inverse bigger-110" value="<?php echo lang_get( 'submit' ) ?>" />
<?php
} else {
echo '<div class="space-10"></div>';
Expand Down
2 changes: 1 addition & 1 deletion news_menu_page.php
Expand Up @@ -179,7 +179,7 @@
</div>
</div>
<div class="widget-toolbox padding-8 clearfix">
<input type="submit" class="btn btn-primary btn-white btn-round" value="<?php echo lang_get( 'submit_button' ) ?>" />
<input type="submit" class="btn btn-primary btn-white btn-round" value="<?php echo lang_get( 'submit' ) ?>" />
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion print_all_bug_page_word.php
Expand Up @@ -148,7 +148,7 @@
$t_lang_steps_to_reproduce = lang_get( 'steps_to_reproduce' );
$t_lang_additional_information = lang_get( 'additional_information' );
$t_lang_bug_notes_title = lang_get( 'bug_notes_title' );
$t_lang_system_profile = lang_get( 'system_profile' );
$t_lang_system_profile = lang_get( 'profile_description' );
$t_lang_attached_files = lang_get( 'attached_files' );
$t_lang_tags = lang_get( 'tags' );

Expand Down

0 comments on commit 7bf00a0

Please sign in to comment.