Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 093eccb6 authored by Thomas Citharel's avatar Thomas Citharel Committed by GitHub
Browse files

Merge pull request #636 from nextcloud/bugfix/434/fix_wrong_year 

fix display of year in upper left corner for certain cases
parents bfeb6407 52bb6102

js/app/filters/datepickerfilter.js

+5 −8
Original line number Diff line number Diff line
@@ -33,16 +33,13 @@ app.filter('datepickerFilter', function () { 
				return moment(datetime).format('ll');



			case 'agendaWeek':

				return t('calendar', 'Week {number} of {year}',

					{number:moment(datetime).week(),

						year: moment(datetime).week() === 1 ?

							moment(datetime).add(1, 'week').year() :

							moment(datetime).year()});

				return t('calendar', 'Week {number} of {year}', {

					number: moment(datetime).week(),

					year: moment(datetime).year()

				});



			case 'month':

				return moment(datetime).week() === 1 ?

					moment(datetime).add(1, 'week').format('MMMM GGGG') :

					moment(datetime).format('MMMM GGGG');

				return moment(datetime).format('MMMM YYYY');



			default:

				return '';