aboutsummaryrefslogtreecommitdiffhomepage
path: root/reader/date
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net>2018-04-09 21:27:15 -0700
committerGravatar Frédéric Guillot <fred@miniflux.net>2018-04-09 21:27:15 -0700
commit02ba735ba92e47b6f1136d051dfe6923fd742be1 (patch)
treebd1bbe00f44b55586fe40913ce490e7e26d31249 /reader/date
parent20f874399db84032ebfba1769267470a4494d554 (diff)
Handle some non-english date formats
Diffstat (limited to 'reader/date')
-rw-r--r--reader/date/parser.go32
-rw-r--r--reader/date/parser_test.go6
2 files changed, 37 insertions, 1 deletions
diff --git a/reader/date/parser.go b/reader/date/parser.go
index 063bf99..d215775 100644
--- a/reader/date/parser.go
+++ b/reader/date/parser.go
@@ -71,6 +71,8 @@ var dateFormats = []string{
"Mon, 2 Jan 2006 15:04:05 -0700",
"Mon, 2 Jan 2006 15:04:05",
"Mon, 2 Jan 2006 15:04",
+ "Mon, 02 Jan 2006, 15:04",
+ "Mon, 2 Jan 2006, 15:04",
"Mon,2 Jan 2006",
"Mon, 2 Jan 2006",
"Mon, 2 Jan 15:04:05 MST",
@@ -192,6 +194,7 @@ var dateFormats = []string{
// Parse parses a given date string using a large
// list of commonly found feed date formats.
func Parse(ds string) (t time.Time, err error) {
+ ds = replaceNonEnglishWords(ds)
d := strings.TrimSpace(ds)
if d == "" {
return t, errors.New("date parser: empty value")
@@ -211,3 +214,32 @@ func Parse(ds string) (t time.Time, err error) {
err = fmt.Errorf(`date parser: failed to parse date "%s"`, ds)
return
}
+
+// Replace German and French dates to English.
+func replaceNonEnglishWords(ds string) string {
+ r := strings.NewReplacer(
+ "Mo,", "Mon,",
+ "Di,", "Tue,",
+ "Mi,", "Wed,",
+ "Do,", "Thu,",
+ "Fr,", "Fri,",
+ "Sa,", "Sat,",
+ "So,", "Sun,",
+ "Mär ", "Mar ",
+ "Mai ", "May ",
+ "Okt ", "Oct ",
+ "Dez ", "Dec ",
+ "lun,", "Mon,",
+ "mar,", "Tue,",
+ "mer,", "Wed,",
+ "jeu,", "Thu,",
+ "ven,", "Fri,",
+ "sam,", "Sat,",
+ "dim,", "Sun,",
+ "avr ", "Apr ",
+ "mai ", "May ",
+ "jui ", "Jun ",
+ )
+
+ return r.Replace(ds)
+}
diff --git a/reader/date/parser_test.go b/reader/date/parser_test.go
index 92b7d31..18341ec 100644
--- a/reader/date/parser_test.go
+++ b/reader/date/parser_test.go
@@ -47,11 +47,15 @@ func TestParseWeirdDateFormat(t *testing.T) {
"Friday, December 22, 2017 - 3:09pm",
"Friday, December 8, 2017 - 3:07pm",
"Thu, 25 Feb 2016 00:00:00 Europe/Brussels",
+ "Mon, 09 Apr 2018, 16:04",
+ "Di, 23 Jan 2018 00:00:00 +0100",
+ "Do, 29 Mär 2018 00:00:00 +0200",
+ "mer, 9 avr 2018 00:00:00 +0200",
}
for _, date := range dates {
if _, err := Parse(date); err != nil {
- t.Fatalf(`Unable to parse date: "%s"`, date)
+ t.Fatalf(`Unable to parse date: %q`, date)
}
}
}