Merge pull request #8882 from jdarwood007/3.0/feature7646

[3.0] Show Other for time format when customized

Author: jdarwood007

Languages/en_US/General.php

@@ -351,6 +351,7 @@
 $txt['are_sure_remove_topic'] = 'Are you sure you want to remove this topic?';
 $txt['yes'] = 'Yes';
 $txt['no'] = 'No';
+$txt['other'] = 'Other';
 
 $txt['search_end_results'] = 'End of results';
 $txt['search_on'] = 'on';

Themes/default/Profile.template.php

@@ -3110,13 +3110,18 @@ function template_profile_timeformat_modify()
 								<select name="easyformat" id="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;">';
 
 	// Help the user by showing a list of common time formats.
-	foreach (Utils::$context['easy_timeformats'] as $time_format)
+	$found = false;
+	foreach (Utils::$context['easy_timeformats'] as $time_format) {
+		$found = $found || $time_format['format'] == Utils::$context['member']['time_format'];
+
 		echo '
 									<option value="', $time_format['format'], '"', $time_format['format'] == Utils::$context['member']['time_format'] ? ' selected' : '', '>', $time_format['title'], '</option>';
+	}
 
 	echo '
+									<option value="other"', !$found ? ' selected' : '', ' disabled>', Lang::getTxt('other', file: 'General'), '</option>
 								</select>
-								<input type="text" name="time_format" id="time_format" value="', Utils::$context['member']['time_format'], '" size="30">
+								<input type="text" name="time_format" id="time_format" value="', Utils::$context['member']['time_format'], '" onchange="document.forms.creator.easyformat.value = \'other\'" size="30">
 							</dd>';
 }