Merge pull request #4114 from melloware/PV4113

Fix #4113: Calendar showMonthAfterYear locale option
pull/4391/head
Tuğçe Küçükoğlu 2023-09-05 17:09:23 +03:00 committed by GitHub
commit 81d971ef56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 26 deletions

View File

@ -86,32 +86,62 @@
</slot> </slot>
</button> </button>
<div :class="cx('title')" v-bind="ptm('title')"> <div :class="cx('title')" v-bind="ptm('title')">
<button <span v-if="$primevue.config.locale.showMonthAfterYear">
v-if="currentView === 'date'" <button
type="button" v-if="currentView !== 'year'"
@click="switchToMonthView" type="button"
@keydown="onContainerButtonKeydown" @click="switchToYearView"
:class="cx('monthTitle')" @keydown="onContainerButtonKeydown"
:disabled="switchViewButtonDisabled" :class="cx('yearTitle')"
:aria-label="$primevue.config.locale.chooseMonth" :disabled="switchViewButtonDisabled"
v-bind="ptm('monthTitle')" :aria-label="$primevue.config.locale.chooseYear"
data-pc-group-section="view" v-bind="ptm('yearTitle')"
> data-pc-group-section="view"
{{ getMonthName(month.month) }} >
</button> {{ getYear(month) }}
<button </button>
v-if="currentView !== 'year'" <button
type="button" v-if="currentView === 'date'"
@click="switchToYearView" type="button"
@keydown="onContainerButtonKeydown" @click="switchToMonthView"
:class="cx('yearTitle')" @keydown="onContainerButtonKeydown"
:disabled="switchViewButtonDisabled" :class="cx('monthTitle')"
:aria-label="$primevue.config.locale.chooseYear" :disabled="switchViewButtonDisabled"
v-bind="ptm('yearTitle')" :aria-label="$primevue.config.locale.chooseMonth"
data-pc-group-section="view" v-bind="ptm('monthTitle')"
> data-pc-group-section="view"
{{ getYear(month) }} >
</button> {{ getMonthName(month.month) }}
</button>
</span>
<span v-else>
<button
v-if="currentView === 'date'"
type="button"
@click="switchToMonthView"
@keydown="onContainerButtonKeydown"
:class="cx('monthTitle')"
:disabled="switchViewButtonDisabled"
:aria-label="$primevue.config.locale.chooseMonth"
v-bind="ptm('monthTitle')"
data-pc-group-section="view"
>
{{ getMonthName(month.month) }}
</button>
<button
v-if="currentView !== 'year'"
type="button"
@click="switchToYearView"
@keydown="onContainerButtonKeydown"
:class="cx('yearTitle')"
:disabled="switchViewButtonDisabled"
:aria-label="$primevue.config.locale.chooseYear"
v-bind="ptm('yearTitle')"
data-pc-group-section="view"
>
{{ getYear(month) }}
</button>
</span>
<span v-if="currentView === 'year'" :class="cx('decadeTitle')" v-bind="ptm('decadeTitle')"> <span v-if="currentView === 'year'" :class="cx('decadeTitle')" v-bind="ptm('decadeTitle')">
<slot name="decade" :years="yearPickerValues"> {{ yearPickerValues[0].value }} - {{ yearPickerValues[yearPickerValues.length - 1].value }} </slot> <slot name="decade" :years="yearPickerValues"> {{ yearPickerValues[0].value }} - {{ yearPickerValues[yearPickerValues.length - 1].value }} </slot>
</span> </span>

View File

@ -326,6 +326,7 @@ export interface PrimeVueLocaleOptions {
today?: string; today?: string;
weekHeader?: string; weekHeader?: string;
firstDayOfWeek?: number; firstDayOfWeek?: number;
showMonthAfterYear?: boolean;
dateFormat?: string; dateFormat?: string;
weak?: string; weak?: string;
medium?: string; medium?: string;

View File

@ -59,6 +59,7 @@ export const defaultOptions = {
today: 'Today', today: 'Today',
weekHeader: 'Wk', weekHeader: 'Wk',
firstDayOfWeek: 0, firstDayOfWeek: 0,
showMonthAfterYear: false,
dateFormat: 'mm/dd/yy', dateFormat: 'mm/dd/yy',
weak: 'Weak', weak: 'Weak',
medium: 'Medium', medium: 'Medium',