Merge pull request jakopako#277 from jakopako:jakopako/issue221

date string 'streda 17.05.2023 @20:00' not parsed correctly
MarkJaroski · Feb 12, 2024 · 0cec78f · 0cec78f
2 parents 39debf6 + 8ca1d16
commit 0cec78f
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 1 deletion.
diff --git a/date/date.go b/date/date.go
@@ -62,7 +62,7 @@ func GetDateFormat(date string, parts CoveredDateParts) (string, string) {
 		return defaultFormat, defaultLanguage
 	}
 
-	separators := []rune{' ', ',', '.', '-', ':'}
+	separators := []rune{' ', ',', '.', '-', ':', '@'}
 
 	tokens := []string{}
 	sepTokens := []string{}

diff --git a/date/date_test.go b/date/date_test.go
@@ -478,3 +478,35 @@ func TestGetDateFormat16(t *testing.T) {
 		}
 	}
 }
+
+func TestGetDateFormat17(t *testing.T) {
+	dateFormats := []formatTestStruct{
+		{
+			input:        "nedeľa 25.02.2024 @18:00",
+			coveredParts: CoveredDateParts{Day: true, Month: true, Year: true, Time: true},
+			formatString: "Monday 2.1.2006 @15:04",
+			language:     "sk_SK",
+		},
+		{
+			input:        "piatok 01.03.2024 @20:00",
+			coveredParts: CoveredDateParts{Day: true, Month: true, Year: true, Time: true},
+			formatString: "Monday 2.1.2006 @15:04",
+			language:     "sk_SK",
+		},
+		{
+			input:        "štvrtok 07.03.2024 @18:30",
+			coveredParts: CoveredDateParts{Day: true, Month: true, Year: true, Time: true},
+			formatString: "Monday 2.1.2006 @15:04",
+			language:     "sk_SK",
+		},
+	}
+	for _, df := range dateFormats {
+		f, l := GetDateFormat(df.input, df.coveredParts)
+		if f != df.formatString {
+			log.Fatalf("expected %s but got %s", df.formatString, f)
+		}
+		if l != df.language {
+			log.Fatalf("expected date language %s but got %s", df.language, l)
+		}
+	}
+}
diff --git a/date/day_format.go b/date/day_format.go
@@ -17,6 +17,10 @@ var longDayNames = []langMap{
 		lang:     "nl_BE",
 		namesMap: longDayNamesNlBE,
 	},
+	{
+		lang:     "sk_SK",
+		namesMap: longDayNamesSkSK,
+	},
 }
 
 var shortDayNames = []langMap{
@@ -36,6 +40,10 @@ var shortDayNames = []langMap{
 		lang:     "nl_BE",
 		namesMap: shortDayNamesNlBE,
 	},
+	{
+		lang:     "sk_SK",
+		namesMap: shortDayNamesSkSK,
+	},
 }
 
 var shortDayNamesEnUS = map[string]bool{
@@ -117,3 +125,23 @@ var longDayNamesNlBE = map[string]bool{
 	"vrijdag":   true,
 	"zaterdag":  true,
 }
+
+var shortDayNamesSkSK = map[string]bool{
+	"ne": true,
+	"po": true,
+	"ut": true,
+	"st": true,
+	"št": true,
+	"pi": true,
+	"so": true,
+}
+
+var longDayNamesSkSK = map[string]bool{
+	"nedeľa":   true,
+	"pondelok": true,
+	"utorok":   true,
+	"streda":   true,
+	"štvrtok":  true,
+	"piatok":   true,
+	"sobota":   true,
+}
diff --git a/date/month_format.go b/date/month_format.go
@@ -22,6 +22,10 @@ var longMonthNames = []langMap{
 		lang:     "nl_BE",
 		namesMap: longMonthNamesNlBE,
 	},
+	{
+		lang:     "sk_SK",
+		namesMap: longMonthNamesSkSK,
+	},
 }
 
 var shortMonthNames = []langMap{
@@ -41,6 +45,10 @@ var shortMonthNames = []langMap{
 		lang:     "nl_BE",
 		namesMap: shortMonthNamesNlBE,
 	},
+	{
+		lang:     "sk_SK",
+		namesMap: shortMonthNamesSkSK,
+	},
 }
 
 var shortMonthNamesEnUS = map[string]bool{
@@ -162,3 +170,33 @@ var longMonthNamesNlBE = map[string]bool{
 	"november":  true,
 	"december":  true,
 }
+
+var shortMonthNamesSkSK = map[string]bool{
+	"jan": true,
+	"feb": true,
+	"mar": true,
+	"apr": true,
+	"máj": true,
+	"jún": true,
+	"júl": true,
+	"aug": true,
+	"sep": true,
+	"okt": true,
+	"nov": true,
+	"dec": true,
+}
+
+var longMonthNamesSkSK = map[string]bool{
+	"január":    true,
+	"február":   true,
+	"marec":     true,
+	"apríl":     true,
+	"máj":       true,
+	"jún":       true,
+	"júl":       true,
+	"august":    true,
+	"september": true,
+	"október":   true,
+	"november":  true,
+	"december":  true,
+}