diff --git a/src/activities/calendar/calendar.js b/src/activities/calendar/calendar.js
index efdcc92dc..fddca5323 100644
--- a/src/activities/calendar/calendar.js
+++ b/src/activities/calendar/calendar.js
@@ -1,241 +1,242 @@
 /* GCompris - calendar.js
  *
  * Copyright (C) 2017 Amit Sagtani <asagtani06@gmail.com>
  *
  * Authors:
  *   Amit Sagtani <asagtani06@gmail.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 3 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 .pragma library
 .import QtQuick 2.6 as Quick
 .import QtQml 2.2 as Qml
 .import GCompris 1.0 as GCompris //for ApplicationInfo
 .import "qrc:/gcompris/src/core/core.js" as Core
 
 var currentLevel = 0
 var numberOfLevel
 var currentSubLevel = 1
 var currentDataSet
 var currentLevelConfig
 var dataset
 var items
 var daySelected = 1
 var monthSelected = 2
 var yearSelected = 2018
 var dayOfWeekSelected
 var minRange //sum of min. visible month and year on calendar for navigation bar next/prev button visibility.
 var maxRange //sum of max. visible month and year on calendar for navigation bar next/prev button visibility.
 var correctAnswer
 var mode
 var daysInMonths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 
 function start(items_) {
     items = items_
     numberOfLevel = items.levels.length
     currentLevel = 0
 
     if(Qt.locale(GCompris.ApplicationSettings.locale).firstDayOfWeek == Qml.Locale.Monday) {
         items.daysOfTheWeekModel.move(0, items.daysOfTheWeekModel.count - 1, 1)
     }
     initLevel();
 }
 
 function stop() {
 }
 
 function initLevel() {
     currentSubLevel = 1;
     items.bar.level = currentLevel + 1
     currentLevelConfig = items.levels[currentLevel]
     setCalendarConfigurations()
     initQuestion();
 }
 
 function nextLevel() {
     if(numberOfLevel <= ++currentLevel) {
         currentLevel = 0
     }
     initLevel();
 }
 
 function previousLevel() {
     if(--currentLevel < 0) {
         currentLevel = numberOfLevel - 1
     }
     initLevel();
 }
 
 // Configure calendar properties for every level.
 function setCalendarConfigurations() {
     minRange = Number(currentLevelConfig["minimumDate"].slice(5,7)) + Number(currentLevelConfig["minimumDate"].slice(0,4)) - 1;
     maxRange = Number(currentLevelConfig["maximumDate"].slice(5,7)) + Number(currentLevelConfig["maximumDate"].slice(0,4)) - 1;
     mode = currentLevelConfig["mode"]
     items.calendar.navigationBarVisible = currentLevelConfig["navigationBarVisible"]
     items.calendar.minimumDate = currentLevelConfig["minimumDate"]
     items.calendar.maximumDate = currentLevelConfig["maximumDate"]
     items.calendar.visibleYear = currentLevelConfig["visibleYear"]
     yearSelected = currentLevelConfig["visibleYear"]
     items.calendar.visibleMonth = currentLevelConfig["visibleMonth"]
     monthSelected = currentLevelConfig["visibleMonth"]
     items.answerChoices.visible = (mode === "findDayOfWeek") ? true : false
     items.okButton.visible = !items.answerChoices.visible
     currentDataSet = currentLevelConfig["questionAnswers"]
     currentDataSet = Core.shuffle(currentDataSet)
     items.score.numberOfSubLevels = currentDataSet.length
     items.score.currentSubLevel = currentSubLevel
 }
 
 function isLeapYear(year) {
     if(year % 100 == 0 && year % 400 != 0) {
         return false
     } else if(year % 4 == 0) {
         return true
     } else {
         return false
     }
 }
 
 function getDateInLongFormat(date) {
     var months = [qsTr("January"), qsTr("February"), qsTr("March"), qsTr("April"), qsTr("May"), qsTr("June"), qsTr("July"),
         qsTr("August"), qsTr("September"), qsTr("October"), qsTr("November"), qsTr("December")];
     //: return current date with format including current day, current month(in textual format) and current year
     return qsTr("%1 %2 %3").arg(date.day).arg(months[date.month]).arg(date.year)
 }
 
 function generateRandomYearMonthDay(minimumDate, maximumDate) {
     var minYear = Number(minimumDate.slice(0, 4))
     var maxYear = Number(maximumDate.slice(0, 4))
     var minMonth = Number(minimumDate.slice(5, 7))
     var maxMonth = Number(maximumDate.slice(5, 7))
     var minDate = Number(minimumDate.slice(8, 10))
     var currentYear = minYear + Math.floor(Math.random() * Math.floor((maxYear - minYear + 1)))
     var currentMonth = minMonth + Math.floor(Math.random() * Math.floor((maxMonth - minMonth + 1)))
     var currentDate
     daysInMonths[1] = (isLeapYear(currentYear)) ? 29 : 28;
     currentDate = minDate + Math.floor(Math.random() * Math.floor((daysInMonths[currentMonth - 1] - minDate + 1)))
     return { year: currentYear, month: currentMonth - 1, day: currentDate }
 }
 
 function addOffsetToCurrentDate(currentDate) {
     var maxOffset = currentLevelConfig.questionAnswers.maxOffset
     var offset = Math.floor(maxOffset / 2) + Math.floor(Math.random() * Math.floor(maxOffset))
+    var storedOffset = offset
     daysInMonths[1] = (isLeapYear(currentDate.year)) ? 29 : 28;
     offset += currentDate.day
     var answerDate = 1;
     var answerMonth = currentDate.month
     var answerYear = currentDate.year
     while(offset > 0) {
         if(offset - daysInMonths[answerMonth] > 0) {
             offset -= daysInMonths[answerMonth]
             answerMonth++;
         } else {
             answerDate = offset;
             offset = 0
         }
         if(answerMonth > 12) {
             answerYear++;
             daysInMonths[1] = (isLeapYear(answerYear)) ? 29 : 28;
             answerMonth = 0;
         }
     }
-    return { year: answerYear, month: answerMonth, day: answerDate, offset: offset } 
+    return { year: answerYear, month: answerMonth, day: answerDate, offset: storedOffset }
 }
 
 function getTemplateQuestionText(mode, date) {
     var questionText
     if(mode == "findDayOfWeek") {
-        questionText = qsTr("What day of the week is on %1?").arg(date.day)
+        questionText = qsTr("What day of the week is on %1?").arg(getDateInLongFormat(date))
     } else if(mode == "findDay") {
         questionText = qsTr("Select day %1?").arg(date.day)
     } else if(mode == "findMonthOnly") {
         questionText = qsTr("Find month number %1").arg(date.month + 1)
     } else {
         if(date.offset) {
             //: The second argument represents the given date in complete format(with complete month name) and the first argument represents the difference in days between given date and answer date.
             questionText = qsTr("Find the date %1 days after %2").arg(date.offset).arg(getDateInLongFormat(date))
         } else
             //: The argument represents the answer date in complete format(with complete month name)
             questionText = qsTr("Find the date %1").arg(getDateInLongFormat(date))
     }
     return questionText
 }
 
 function initQuestion() {
     if(currentDataSet.length < currentSubLevel) {
         items.bonus.good("lion")
     }
     else {
         if(!currentLevelConfig.questionsExplicitlyGiven) {
             var randomDate = generateRandomYearMonthDay(currentLevelConfig.minimumDate, currentLevelConfig.maximumDate)
             items.score.currentSubLevel = currentSubLevel
             if(currentLevelConfig.mode == "findDayOfWeek") {
                 var selectedDate = new Date(randomDate.year, randomDate.month - 1, randomDate.day)
                 correctAnswer.dayOfWeek = Number(selectedDate.getDay())
             } else if(currentLevelConfig.mode == "findYearMonthDay" && currentLevelConfig.questionAnswers.maxOffset) {
                 correctAnswer = addOffsetToCurrentDate(randomDate)
                 randomDate.offset = correctAnswer.offset
             } else {
                 correctAnswer = randomDate
             }
             items.questionItem.text = getTemplateQuestionText(currentLevelConfig.mode, randomDate)
         } else {
             items.score.currentSubLevel = currentSubLevel
             items.questionItem.text = currentDataSet[currentSubLevel-1]["question"]
             correctAnswer = currentDataSet[currentSubLevel-1]["answer"]
         }
     }
 }
 
 function updateScore(isCorrectAnswer) {
     if(isCorrectAnswer) {
         items.questionDelay.start()
         items.okButtonParticles.burst(20)
         items.score.playWinAnimation()
         currentSubLevel++;
     }
     else
         items.bonus.bad("lion")
 }
 
 function checkAnswer() {
     var isCorrectAnswer = false
     // For levels having questions based on day of week only.
     if(mode === "findDayOfWeek") {
         if(dayOfWeekSelected === correctAnswer["dayOfWeek"]) {
             isCorrectAnswer = true
         }
     }
     // For levels having question based on month only.
     else if(mode === "findMonthOnly") {
         if(correctAnswer["month"].indexOf(monthSelected) >= 0) {
             isCorrectAnswer = true
         }
     }
     // For levels having question based on day only.
     else if(mode === "findDay") {
         if(daySelected === correctAnswer["day"]) {
             isCorrectAnswer = true
         }
     }
     // For levels having questions based on dayOfWeek, month and year.
     else {
         if(monthSelected === correctAnswer["month"] && daySelected === correctAnswer["day"] && yearSelected === correctAnswer["year"]) {
             isCorrectAnswer = true
         }
     }
     updateScore(isCorrectAnswer)
 }