Fix #16810: $s_os in custom_strings_inc.php partially ignored

mantisbt · Jan 12, 2014 · 56b33e8 · 56b33e8
1 parent 7694a38
commit 56b33e8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/account_prof_edit_page.php b/account_prof_edit_page.php
@@ -107,7 +107,7 @@
 </tr>
 <tr class="row-2">
 	<th class="category">
-		<span class="required">*</span><?php echo lang_get( 'operating_system' ) ?>
+		<span class="required">*</span><?php echo lang_get( 'os' ) ?>
 	</th>
 	<td>
 		<input type="text" name="os" size="32" maxlength="32" value="<?php echo string_attribute( $v_os ) ?>" />

diff --git a/account_prof_menu_page.php b/account_prof_menu_page.php
@@ -102,7 +102,7 @@
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container">
-				<label for="os" class="required"><span><?php echo lang_get( 'operating_system' ) ?></span></label>
+				<label for="os" class="required"><span><?php echo lang_get( 'os' ) ?></span></label>
 				<span class="input"><input id="os" type="text" name="os" size="32" maxlength="32" /></span>
 				<span class="label-style"></span>
 			</div>

diff --git a/core/profile_api.php b/core/profile_api.php
@@ -66,7 +66,7 @@ function profile_create( $p_user_id, $p_platform, $p_os, $p_os_build, $p_descrip
 
 	# os cannot be blank
 	if( is_blank( $p_os ) ) {
-		error_parameters( lang_get( 'operating_system' ) );
+		error_parameters( lang_get( 'os' ) );
 		trigger_error( ERROR_EMPTY_FIELD, ERROR );
 	}
 
@@ -137,7 +137,7 @@ function profile_update( $p_user_id, $p_profile_id, $p_platform, $p_os, $p_os_bu
 
 	# os cannot be blank
 	if( is_blank( $p_os ) ) {
-		error_parameters( lang_get( 'operating_system' ) );
+		error_parameters( lang_get( 'os' ) );
 		trigger_error( ERROR_EMPTY_FIELD, ERROR );
 	}
 

diff --git a/lang/strings_english.txt b/lang/strings_english.txt
@@ -400,7 +400,6 @@ $s_profile_deleted_msg = 'Deleted profile...';
 $s_edit_profile_title = 'Edit Profile';
 $s_platform = 'Platform';
 $s_platform_label = 'Platform:';
-$s_operating_system = 'Operating System';
 $s_additional_description = 'Additional Description';
 $s_update_profile_button = 'Update Profile';