Add Month & Weekday locale accessors.

cmd/generate_resources.go

@@ -107,7 +107,6 @@ type translator struct {
 
 	FmtMonthsAbbreviated string
 	FmtMonthsNarrow      string
-	FmtMonthsShort       string
 	FmtMonthsWide        string
 
 	FmtDaysAbbreviated string
@@ -428,10 +427,6 @@ func postProcess(cldr *cldr.CLDR) {
 			trans.FmtMonthsNarrow = base.FmtMonthsNarrow
 		}
 
-		if len(trans.FmtMonthsShort) == 0 && found {
-			trans.FmtMonthsShort = base.FmtMonthsShort
-		}
-
 		if len(trans.FmtMonthsWide) == 0 && found {
 			trans.FmtMonthsWide = base.FmtMonthsWide
 		}
@@ -813,7 +808,7 @@ func preProcess(cldrVar *cldr.CLDR) {
 						// month context starts at 'format', but there is also has 'stand-alone'
 						// I'm making the decision to use the 'stand-alone' if, and only if,
 						// the value does not exist in the 'format' month context
-						var abbrSet, narrSet, shortSet, wideSet bool
+						var abbrSet, narrSet, wideSet bool
 
 						for _, monthctx := range calendar.Months.MonthContext {
 
@@ -873,11 +868,6 @@ func preProcess(cldrVar *cldr.CLDR) {
 											narrSet = true
 											trans.FmtMonthsNarrow = fmt.Sprintf("%#v", monthData)
 										}
-									case "short":
-										if !shortSet {
-											shortSet = true
-											trans.FmtMonthsShort = fmt.Sprintf("%#v", monthData)
-										}
 									case "wide":
 										if !wideSet {
 											wideSet = true
@@ -1310,7 +1300,7 @@ func parseDateTimeFormat(baseLocale, format string) (results string) {
 
 				results += `
 					tz, _ := t.Zone()
-					
+
 					if btz, ok := ` + baseLocale + `.timezones[tz]; ok {
 						b = append(b, btz...)
 					} else {

cmd/translator.tmpl

@@ -42,7 +42,6 @@ type {{ .Locale }} struct {
 	{{- end }}
 	monthsAbbreviated      [][]byte
 	monthsNarrow      	   [][]byte
-	monthsShort      	   [][]byte
 	monthsWide      	   [][]byte
 	daysAbbreviated        [][]byte
 	daysNarrow      	   [][]byte
@@ -100,9 +99,6 @@ func New() locales.Translator {
 		{{- if gt (len .FmtMonthsNarrow) 0 }}
 		monthsNarrow:   {{ .FmtMonthsNarrow }},
 		{{- end -}}
-		{{- if gt (len .FmtMonthsShort) 0 }}
-		monthsShort:   {{ .FmtMonthsShort }},
-		{{- end -}}
 		{{- if gt (len .FmtMonthsWide) 0 }}
 		monthsWide:   {{ .FmtMonthsWide }},
 		{{- end -}}
@@ -173,6 +169,76 @@ func({{ .BaseLocale }} *{{ .Locale }}) RangePluralRule(num1 float64, v1 uint64,n
 	{{ .RangeFunc }}
 }
 
+// MonthAbbreviated returns the locales abbreviated month given the 'month' provided
+func({{ .BaseLocale }} *{{ .Locale }}) MonthAbbreviated(month time.Month) []byte {
+	return {{ .BaseLocale }}.monthsAbbreviated[month]
+}
+
+// MonthsAbbreviated returns the locales abbreviated months
+func({{ .BaseLocale }} *{{ .Locale }}) MonthsAbbreviated() [][]byte {
+	return {{ .BaseLocale }}.monthsAbbreviated[1:]
+}
+
+// MonthNarrow returns the locales narrow month given the 'month' provided
+func({{ .BaseLocale }} *{{ .Locale }}) MonthNarrow(month time.Month) []byte {
+	return {{ .BaseLocale }}.monthsNarrow[month]
+}
+
+// MonthsNarrow returns the locales narrow months
+func({{ .BaseLocale }} *{{ .Locale }}) MonthsNarrow() [][]byte {
+	return {{ .BaseLocale }}.monthsNarrow[1:]
+}
+
+// MonthWide returns the locales wide month given the 'month' provided
+func({{ .BaseLocale }} *{{ .Locale }}) MonthWide(month time.Month) []byte {
+	return {{ .BaseLocale }}.monthsWide[month]
+}
+
+// MonthsWide returns the locales wide months
+func({{ .BaseLocale }} *{{ .Locale }}) MonthsWide() [][]byte {
+	return {{ .BaseLocale }}.monthsWide[1:]
+}
+
+// WeekdayAbbreviated returns the locales abbreviated weekday given the 'weekday' provided
+func({{ .BaseLocale }} *{{ .Locale }}) WeekdayAbbreviated(weekday time.Weekday) []byte {
+	return {{ .BaseLocale }}.daysAbbreviated[weekday]
+}
+
+// WeekdaysAbbreviated returns the locales abbreviated weekdays
+func({{ .BaseLocale }} *{{ .Locale }}) WeekdaysAbbreviated() [][]byte {
+	return {{ .BaseLocale }}.daysAbbreviated
+}
+
+// WeekdayNarrow returns the locales narrow weekday given the 'weekday' provided
+func({{ .BaseLocale }} *{{ .Locale }}) WeekdayNarrow(weekday time.Weekday) []byte {
+	return {{ .BaseLocale }}.daysNarrow[weekday]
+}
+
+// WeekdaysNarrow returns the locales narrow weekdays
+func({{ .BaseLocale }} *{{ .Locale }}) WeekdaysNarrow() [][]byte {
+	return {{ .BaseLocale }}.daysNarrow
+}
+
+// WeekdayShort returns the locales short weekday given the 'weekday' provided
+func({{ .BaseLocale }} *{{ .Locale }}) WeekdayShort(weekday time.Weekday) []byte {
+	return {{ .BaseLocale }}.daysShort[weekday]
+}
+
+// WeekdaysShort returns the locales short weekdays
+func({{ .BaseLocale }} *{{ .Locale }}) WeekdaysShort() [][]byte {
+	return {{ .BaseLocale }}.daysShort
+}
+
+// WeekdayWide returns the locales wide weekday given the 'weekday' provided
+func({{ .BaseLocale }} *{{ .Locale }}) WeekdayWide(weekday time.Weekday) []byte {
+	return {{ .BaseLocale }}.daysWide[weekday]
+}
+
+// WeekdaysWide returns the locales wide weekdays
+func({{ .BaseLocale }} *{{ .Locale }}) WeekdaysWide() [][]byte {
+	return {{ .BaseLocale }}.daysWide
+}
+
 // FmtNumber returns 'num' with digits/precision of 'v' for '{{ .Locale }}' and handles both Whole and Real numbers based on 'v'
 // returned as a []byte just in case the caller wishes to add more and can help
 // avoid allocations; otherwise just cast as string.