Merge remote-tracking branch 'origin/dev' into dev

app/appearance/langs/en_US.json

@@ -41,6 +41,11 @@
   "filterOperatorEndsWith": "Ends with",
   "filterOperatorIsEmpty": "Is empty",
   "filterOperatorIsNotEmpty": "Is not empty",
+  "filterOperatorIsBetween": "Is between",
+  "filterOperatorIsBefore": "Is before",
+  "filterOperatorIsAfter": "Is after",
+  "filterOperatorIsOnOrBefore": "Is on or before",
+  "filterOperatorIsOnOrAfter": "Is on or after",
   "asc": "Ascending",
   "desc": "Descending",
   "hideCol": "Hide column",

app/appearance/langs/es_ES.json

@@ -41,6 +41,11 @@
   "filterOperatorEndsWith": "Termina en",
   "filterOperatorIsEmpty": "Está vacío",
   "filterOperatorIsNotEmpty": "No está vacío",
+  "filterOperatorIsBetween": "Está entre",
+  "filterOperatorIsBefore": "Es antes",
+  "filterOperatorIsAfter": "Es posterior a",
+  "filterOperatorIsOnOrBefore": "Está activado o antes",
+  "filterOperatorIsOnOrAfter": "Está encendido o después",
   "asc": "Ascendente",
   "desc": "Descendente",
   "hideCol": "Ocultar columna",

app/appearance/langs/fr_FR.json

@@ -41,6 +41,11 @@
   "filterOperatorEndsWith": "Se termine par",
   "filterOperatorIsEmpty": "Est vide",
   "filterOperatorIsNotEmpty": "N'est pas vide",
+  "filterOperatorIsBetween": "Est entre",
+  "filterOperatorIsBefore": "Est avant",
+  "filterOperatorIsAfter": "Est après",
+  "filterOperatorIsOnOrBefore": "Est le ou avant",
+  "filterOperatorIsOnOrAfter": "Est allumé ou après",
   "asc": "Ascendant",
   "desc": "Descendant",
   "hideCol": "Masquer la colonne",

app/appearance/langs/zh_CHT.json

@@ -41,6 +41,11 @@
   "filterOperatorEndsWith": "結尾為",
   "filterOperatorIsEmpty": "為空",
   "filterOperatorIsNotEmpty": "不為空",
+  "filterOperatorIsBetween": "介於",
+  "filterOperatorIsBefore": "早於",
+  "filterOperatorIsAfter": "晚於",
+  "filterOperatorIsOnOrBefore": "早於或等於",
+  "filterOperatorIsOnOrAfter": "晚於或等於",
   "asc": "升序",
   "desc": "降序",
   "hideCol": "隱藏列",

app/appearance/langs/zh_CN.json

@@ -41,6 +41,11 @@
   "filterOperatorEndsWith": "结尾为",
   "filterOperatorIsEmpty": "为空",
   "filterOperatorIsNotEmpty": "不为空",
+  "filterOperatorIsBetween": "介于",
+  "filterOperatorIsBefore": "早于",
+  "filterOperatorIsAfter": "晚于",
+  "filterOperatorIsOnOrBefore": "早于或等于",
+  "filterOperatorIsOnOrAfter": "晚于或等于",
   "asc": "升序",
   "desc": "降序",
   "hideCol": "隐藏列",

kernel/av/table.go

@@ -192,10 +192,12 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool
 		case FilterOperatorIsLessOrEqual:
 			return value.Date.Content <= other.Date.Content
 		case FilterOperatorIsBetween:
+			start := value.Date.Content <= other.Date.Content
+			end := true
 			if value.Date.HasEndDate {
-				// TODO: date filter (between)
+				end = value.Date.Content2 >= other.Date.Content2
 			}
-			return value.Date.Content >= other.Date.Content && value.Date.Content <= other.Date.Content2
+			return start && end
 		case FilterOperatorIsEmpty:
 			return 0 == value.Date.Content
 		case FilterOperatorIsNotEmpty:

kernel/util/file.go

@@ -68,7 +68,9 @@ func RemoveID(name string) string {
 	ext := path.Ext(name)
 	name = strings.TrimSuffix(name, ext)
 	if 23 < len(name) {
-		name = name[:len(name)-23]
+		if id := name[len(name)-22:]; ast.IsNodeIDPattern(id) {
+			name = name[:len(name)-23]
+		}
 	}
 	return name + ext
 }