From 09ff3de1f548a897dd77f99de75ccdaf63081dc0 Mon Sep 17 00:00:00 2001 From: soufiane Date: Fri, 3 May 2024 11:50:14 +0200 Subject: [PATCH] Revert "wait #6641 @1:00" This reverts commit f2a3729145bdfd2b354181efa7b91ccb7d675f24. --- js/quiz.animations.js | 4 ++-- js/quiz.screen.outro.js | 6 +++--- views/footer.blade.php | 6 +++--- views/header_question.blade.php | 4 ++-- views/screens/intro.blade.php | 2 +- views/screens/outro.blade.php | 10 +++++----- views/screens/question_draganddrop.blade.php | 2 +- views/screens/question_match.blade.php | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/js/quiz.animations.js b/js/quiz.animations.js index 95f18c8..ab7c4be 100644 --- a/js/quiz.animations.js +++ b/js/quiz.animations.js @@ -47,8 +47,8 @@ QuizAnimations.prototype = { }, instantReviewAnimation: function (status) { - let ok = [this.quiz.l10n.__('Fantastic'), this.quiz.l10n.__('Impressive'), this.quiz.l10n.__('Perfect'), this.quiz.l10n.__('Well done'), this.quiz.l10n.__('Bravo'), this.quiz.l10n.__('Good job'), this.quiz.l10n.__('Excellent'), this.quiz.l10n.__('Impressive'), this.quiz.l10n.__('Great job'), this.quiz.l10n.__('Superb'), this.quiz.l10n.__('Nice one')]; - let nok = [this.quiz.l10n.__('Unlucky'), this.quiz.l10n.__('Not this time'), this.quiz.l10n.__('Check the tip'), this.quiz.l10n.__('Oops!')]; + let ok = [this.quiz.l10n.__('Fantastic'), this.quiz.l10n.__('Impressive'), this.quiz.l10n.__('Perfect'), this.quiz.l10n.__('Well done'), this.quiz.l10n.__('Bravo'), this.quiz.l10n.__('Good job'), this.quiz.l10n.__('Excellent'), this.quiz.l10n.__('Impressive'), this.quiz.l10n.__('Great job'), this.quiz.l10n.__('Superb'), this.quiz.l10n.__('Terrific')]; + let nok = [this.quiz.l10n.__('Keep trying'), this.quiz.l10n.__('Try again'), this.quiz.l10n.__('Double-check'), this.quiz.l10n.__('Reconsider')]; let selector = $("#instantReviewAnimation") let text = status === "NOK" ? nok[Math.floor(Math.random() * nok.length)] : ok[Math.floor(Math.random() * ok.length)]; diff --git a/js/quiz.screen.outro.js b/js/quiz.screen.outro.js index 3033eac..fbba9b0 100644 --- a/js/quiz.screen.outro.js +++ b/js/quiz.screen.outro.js @@ -107,7 +107,7 @@ QuizScreenOutro.prototype = { let maxScore = this.quiz.score.maxScore, score = this.quiz.score.score let nok = { title: this.quiz.l10n.__("Ooops!"), - text: this.quiz.l10n.__("Unfortunately, you didn't score enough answers correctly to unlock your digital badge. Review the content and have another go.", { + text: this.quiz.l10n.__("Unfortunately, you did not get enough correct answers (:score out of :maxScore).", { 'score': score, 'maxScore': maxScore }) + " " + this.quiz.l10n.__("Please go back and review the content before retaking the quiz."), @@ -117,7 +117,7 @@ QuizScreenOutro.prototype = { }; let ok = { title: this.quiz.l10n.__("Congratulation!"), - text: this.quiz.l10n.__("You have completed the quiz! You can now access your digital badge.", { + text: this.quiz.l10n.__("You have completed the quiz with :score correct answers out of :maxScore", { 'score': score, 'maxScore': maxScore }), @@ -261,7 +261,7 @@ QuizScreenOutro.prototype = { if (review.type === "draganddrop") { titleType = ' - ' + this.quiz.l10n.__('Drag and Drop') } else if (review.type === "match") { - titleType = ' - ' + this.quiz.l10n.__('Card Match') + titleType = ' - ' + this.quiz.l10n.__('Match the answers') } html += '
  • '; html += '

    ' + this.quiz.l10n.__('Question :index', {index: i + 1}) + titleType + '

    '; diff --git a/views/footer.blade.php b/views/footer.blade.php index 7f2659f..0e07da7 100644 --- a/views/footer.blade.php +++ b/views/footer.blade.php @@ -19,10 +19,10 @@ @if(isset($matchMaking)) {{ $__('Confirm the match') }} @else - {{ $__('Check') }} + {{ $__('Validate answer') }} @endif - {{$__('Space')}} + {{$__('space')}} @isset($time) @@ -33,7 +33,7 @@ @if($data['instantReview']) {{$__('Continue')}} - {{$__('Space')}} + {{$__('space')}} @endif diff --git a/views/header_question.blade.php b/views/header_question.blade.php index 0a453b5..993f241 100644 --- a/views/header_question.blade.php +++ b/views/header_question.blade.php @@ -24,7 +24,7 @@

    {{$question['question']}} - {{$__('Drag the cards left or right to drop in the correct zone')}}{{__(': ')}}
    {{$question['question']}}     + {{$__('Swipe up or down each card in the right container')}}{{__(': ')}}
    {{$question['question']}}

    {{$__('Use arrow keys to move the cards to the corresponding zone')}}

    @elseif($question['type']==='match') @@ -32,7 +32,7 @@ {{$question['question']}}

    {{$__('Swipe the cards left and right to change selection and confirm your match')}}

    + class="only-desktop">{{$__('When you feel the answer is appropriate, confirm the match to move on to the next question')}} @else

    {{$question['question']}}

    @endif diff --git a/views/screens/intro.blade.php b/views/screens/intro.blade.php index 5fd5dce..68338da 100644 --- a/views/screens/intro.blade.php +++ b/views/screens/intro.blade.php @@ -26,7 +26,7 @@ diff --git a/views/screens/outro.blade.php b/views/screens/outro.blade.php index 08e8a89..073b7d8 100644 --- a/views/screens/outro.blade.php +++ b/views/screens/outro.blade.php @@ -39,22 +39,22 @@

    @if($data->restart_button) -
    {{$__('Want to gain certification?')}}
    +
    {{$__('Want to improve your score?')}}
    - {{$__('Retake')}} + {{$__('Restart')}} @endif diff --git a/views/screens/question_draganddrop.blade.php b/views/screens/question_draganddrop.blade.php index 57c428a..b5da27e 100644 --- a/views/screens/question_draganddrop.blade.php +++ b/views/screens/question_draganddrop.blade.php @@ -23,5 +23,5 @@ @include('screens.question_draganddrop_area',['data'=>$data,'area'=>2,'question'=>$question,'theme'=>$theme]) - @include('footer', ['countdown' => $countdown,'question' => $question,'data' => $data, 'reset' => true, 'text' => $__('Check'), 'info' => $info]) + @include('footer', ['countdown' => $countdown,'question' => $question,'data' => $data, 'reset' => true, 'text' => $__('Validate answer'), 'info' => $info]) diff --git a/views/screens/question_match.blade.php b/views/screens/question_match.blade.php index b9eb932..f3dc49f 100644 --- a/views/screens/question_match.blade.php +++ b/views/screens/question_match.blade.php @@ -44,5 +44,5 @@
    - @include('footer', ['countdown' => $countdown,'question' => $question, 'data' => $data, 'reset' => true, 'text' => $__('Check'), 'info' => $info, 'matchMaking' => true]) + @include('footer', ['countdown' => $countdown,'question' => $question, 'data' => $data, 'reset' => true, 'text' => $__('Validate answer'), 'info' => $info, 'matchMaking' => true]) -- 2.39.5