diff --git a/src/core/i18n.ts b/src/core/i18n.ts index 947ce76..a0081a1 100644 --- a/src/core/i18n.ts +++ b/src/core/i18n.ts @@ -548,7 +548,7 @@ const translations: Record = { akathists: '📜 Canons & Akathists', parimii: '📖 Paroemia', horologion: '⏰ Horologion', - sbornik: '📚 Sbornik', + sbornik: '📚 Hymnal', paraclete: '📗 Paraclete', irmologion: '🎵 Irmologion', menaion: '📕 Menaion', @@ -601,7 +601,7 @@ const translations: Record = { }, sbornik: { - title: 'Богослужебный сборник', + title: 'Liturgical Hymnal', subtitle: 'Reference collection: troparia, kontakia, theotokia and biblical songs (Church Slavonic)', sections: { sunday: 'Troparia and Kontakia: Sunday', diff --git a/src/ui/app.ts b/src/ui/app.ts index 5e79d58..bc4a432 100644 --- a/src/ui/app.ts +++ b/src/ui/app.ts @@ -231,7 +231,7 @@ export class App { // Re-read settings fresh on each navigation this.settings = loadSettings(); const lang = this.settings.language as LanguageCode; - const calendarType = this.settings.calendarType || 'julian'; + const calendarType = this.settings.calendarType || 'gregorian'; switch (this.currentView) { case 'calendar': diff --git a/src/ui/calendar-view.ts b/src/ui/calendar-view.ts index 4d495f1..25d693a 100644 --- a/src/ui/calendar-view.ts +++ b/src/ui/calendar-view.ts @@ -398,7 +398,7 @@ export class CalendarView { private t: ReturnType; private calendarType: 'julian' | 'gregorian'; - constructor(container: HTMLElement, date: JDate, onDateChange: (d: JDate) => void, language: LanguageCode = 'en', calendarType: 'julian' | 'gregorian' = 'julian') { + constructor(container: HTMLElement, date: JDate, onDateChange: (d: JDate) => void, language: LanguageCode = 'en', calendarType: 'julian' | 'gregorian' = 'gregorian') { this.container = container; this.currentDate = date; this.onDateChange = onDateChange; @@ -550,10 +550,9 @@ export class CalendarView { const gregorianDayName = this.t.calendar.dayNamesFull[gregorianDate.getDay()]; const gregorianStr = `${gregorianDayName}, ${gregorianDate.getDate()} ${this.t.calendar.monthsGenitive[gregorianDate.getMonth()]} ${gregorianDate.getFullYear()} г.`; // Julian date (church calendar) - const julianDayName = this.t.calendar.dayNamesFull[this.currentDate.getDayOfWeek()]; // Anno Mundi year (Old Slavonic year = year + 5508) const annoMundi = julianYear + 5508; - const julianStr = `${julianDayName}, ${this.currentDate.getDay()} ${this.t.calendar.monthsGenitive[this.currentDate.getMonth() - 1]}, год ${julianYear} ${this.t.calendar.fromYear}, ${annoMundi} ${this.t.calendar.fromAdam}`; + const julianStr = `${this.currentDate.getDay()} ${this.t.calendar.monthsGenitive[this.currentDate.getMonth() - 1]}, год ${julianYear} ${this.t.calendar.fromYear}, ${annoMundi} ${this.t.calendar.fromAdam}`; this.container.innerHTML = `
@@ -574,15 +573,16 @@ export class CalendarView {
-

+

${julianStr}

+ +
+
${this.t.calendar.gregorianDate[0].toLowerCase() + this.t.calendar.gregorianDate.slice(1)}: ${gregorianStr}
-
-
${this.t.loading}
@@ -754,7 +754,7 @@ export class CalendarView { const toneSuffix = tone > 0 ? `; ${this.t.calendar.tone}${tone}` : ''; const feastSuffix = feastName && feastCid !== periodCid ? `; ${feastName}` : ''; const titleColor = feastName ? 'text-red-700' : 'text-navy'; - titleEl.innerHTML = `${periodName}${toneSuffix}${feastSuffix}`; + titleEl.innerHTML = `${periodName}${toneSuffix}${feastSuffix}`; } if (feastCid) this.skipCids.add(feastCid); diff --git a/src/ui/settings-view.ts b/src/ui/settings-view.ts index a5ffd66..6b27d59 100644 --- a/src/ui/settings-view.ts +++ b/src/ui/settings-view.ts @@ -47,7 +47,7 @@ const DEFAULT_SETTINGS: Settings = { defaultBibleVersion: 'kjv', showVerseNumbers: true, verseNewLine: false, - calendarType: 'julian', + calendarType: 'gregorian', serviceRole: 'priest', latitude: 55.7558, longitude: 37.6176,