diff options
| -rw-r--r-- | internal/config/config.go | 2 | ||||
| -rw-r--r-- | internal/export/calendar.go | 4 | ||||
| -rw-r--r-- | internal/i18n/golden_test.go | 4 | ||||
| -rw-r--r-- | internal/i18n/i18n.go | 5 | ||||
| -rw-r--r-- | internal/i18n/lang/en.ini | 2 | ||||
| -rw-r--r-- | internal/i18n/lang/pl.ini | 2 |
6 files changed, 16 insertions, 3 deletions
diff --git a/internal/config/config.go b/internal/config/config.go index ebbe67d..bb15182 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -60,7 +60,7 @@ const configHeader = `# lectio configuration (INI). Full-line comments only (# o // Version is lectio's release version, shared by every binary's // -v/--version output (lectio, lectio-ui, lectio-web). -const Version = "0.45.0" +const Version = "0.45.1" // SourceURL is where lectio's corresponding source can be obtained. It is // not decoration: lectio is AGPL-3.0-or-later, and section 13 requires a diff --git a/internal/export/calendar.go b/internal/export/calendar.go index 10f9ffb..1d3b043 100644 --- a/internal/export/calendar.go +++ b/internal/export/calendar.go @@ -68,9 +68,9 @@ func CalendarPDF(year, month int, days []CalendarDay, lectionary, lang string) ( pw, ph := pdf.GetPageSize() ui := i18n.Get(lang) - lect := ui.OptModern + lect := ui.CalModern if lectionary == "traditional" { - lect = ui.OptTraditional + lect = ui.CalTraditional } monthName := time.Month(month).String() if month >= 1 && month <= 12 && ui.Months[month-1] != "" { diff --git a/internal/i18n/golden_test.go b/internal/i18n/golden_test.go index 0dc87dd..5a29097 100644 --- a/internal/i18n/golden_test.go +++ b/internal/i18n/golden_test.go @@ -50,6 +50,8 @@ var enUI = UI{ BannerReadings: "Readings", BannerConnective: "for", Months: [12]string{"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}, + CalModern: "novus ordo calendar", + CalTraditional: "traditional roman calendar", Lectionary: "lectionary", OptModern: "modern", OptTraditional: "traditional", @@ -136,6 +138,8 @@ var plUI = UI{ BannerReadings: "Czytania", BannerConnective: "na", Months: [12]string{"Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"}, + CalModern: "kalendarz Novus Ordo", + CalTraditional: "tradycyjny kalendarz rzymski", Lectionary: "lekcjonarz", OptModern: "nowy", OptTraditional: "tradycyjny", diff --git a/internal/i18n/i18n.go b/internal/i18n/i18n.go index 1589476..fece4a8 100644 --- a/internal/i18n/i18n.go +++ b/internal/i18n/i18n.go @@ -51,6 +51,11 @@ type UI struct { // exported calendar's title. Months [12]string + // CalModern/CalTraditional name the liturgical form in the exported month + // calendar's title -- the full "novus ordo calendar" / "traditional roman + // calendar", fuller than the short OptModern/OptTraditional dropdown labels. + CalModern, CalTraditional string + // Web control labels. Lectionary, OptModern, OptTraditional string Parts, OptGospel, OptAll string diff --git a/internal/i18n/lang/en.ini b/internal/i18n/lang/en.ini index 87face3..8444a4d 100644 --- a/internal/i18n/lang/en.ini +++ b/internal/i18n/lang/en.ini @@ -34,6 +34,8 @@ banner_gospel = Gospel banner_readings = Readings banner_connective = for months = January,February,March,April,May,June,July,August,September,October,November,December +cal_modern = novus ordo calendar +cal_traditional = traditional roman calendar lectionary = lectionary opt_modern = modern opt_traditional = traditional diff --git a/internal/i18n/lang/pl.ini b/internal/i18n/lang/pl.ini index cce1854..305c4c9 100644 --- a/internal/i18n/lang/pl.ini +++ b/internal/i18n/lang/pl.ini @@ -34,6 +34,8 @@ banner_gospel = Ewangelia banner_readings = Czytania banner_connective = na months = Styczeń,Luty,Marzec,Kwiecień,Maj,Czerwiec,Lipiec,Sierpień,Wrzesień,Październik,Listopad,Grudzień +cal_modern = kalendarz Novus Ordo +cal_traditional = tradycyjny kalendarz rzymski lectionary = lekcjonarz opt_modern = nowy opt_traditional = tradycyjny |