fix(CustomView) correctly translate standard datetime filter columns

tsolucio · Jan 31, 2018 · a9e90b5 · a9e90b5
1 parent 44f15ee
commit a9e90b5
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/modules/CustomView/EditView.php b/modules/CustomView/EditView.php
@@ -196,35 +196,19 @@ function getStdFilterHTML($module, $selected = "") {
 	global $current_language, $app_strings, $current_user, $oCustomView;
 	$stdfilter = array();
 	$result = $oCustomView->getStdCriteriaByModule($module);
-	$mod_strings = return_module_language($current_language, $module);
 
 	if (isset($result)) {
 		foreach ($result as $key => $value) {
 			if ($value == 'Start Date & Time') {
 				$value = 'Start Date';
 			}
 			$use_module_label =  getTranslatedString($module, $module);
-			if (isset($mod_strings[$value])) {
-				if ($key == $selected) {
-					$filter['value'] = $key;
-					$filter['text'] = $use_module_label." - ".getTranslatedString($value);
-					$filter['selected'] = "selected";
-				} else {
-						$filter['value'] = $key;
-						$filter['text'] = $use_module_label." - ".getTranslatedString($value);
-						$filter['selected'] ="";
-				}
+			$filter['value'] = $key;
+			$filter['text'] = $use_module_label.' - '.getTranslatedString($value, $module);
+			if ($key == $selected) {
+				$filter['selected'] = 'selected';
 			} else {
-				if ($key == $selected) {
-					$filter['value'] = $key;
-
-					$filter['text'] = $use_module_label." - ".$value;
-					$filter['selected'] = 'selected';
-				} else {
-					$filter['value'] = $key;
-					$filter['text'] = $use_module_label." - ".$value;
-					$filter['selected'] ='';
-				}
+				$filter['selected'] = '';
 			}
 			$stdfilter[]=$filter;
 			// If a user doesn't have permission for a field and it has been used to filter a custom view, it should be displayed to him as Not Accessible.