Fixed issue #13247: missing translation in beginner tour

LimeSurvey · Mar 12, 2018 · 7284018 · 7284018
1 parent 2b46b99
commit 7284018
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/application/core/LsDefaultDataSets.php b/application/core/LsDefaultDataSets.php
@@ -317,14 +317,14 @@ public static function getTutorialData()
                 'template' => ""
                 ."<div class='popover tour lstutorial__template--mainContainer'>" 
                 ."<div class='arrow'></div>"
-                ."<button class='pull-right ls-space margin top-5 right-5 btn btn-warning btn-sm' data-role='end' data-toggle='tooltip' title='".gT('End tour')."'><i class='fa fa-close'></i></button>"
+                ."<button class='pull-right ls-space margin top-5 right-5 btn btn-warning btn-sm' data-role='end' data-toggle='tooltip' title='".gT('End tour','js')."'><i class='fa fa-close'></i></button>"
                 ."<h3 class='popover-title lstutorial__template--title'></h3>"
                     ."<div class='popover-content lstutorial__template--content'></div>"
                     ."<div class='popover-navigation lstutorial__template--navigation'>"
                         ."<div class='row'>"
                             ."<div class='btn-group col-xs-12' role='group' aria-label='...'>"
-                                ."<button class='btn btn-default col-md-6' data-role='prev'>".gT('Previous')."</button>"
-                                ."<button class='btn btn-primary col-md-6' data-role='next'>".gT('Next')."</button>"
+                                ."<button class='btn btn-default col-md-6' data-role='prev'>".gT('Previous','js')."</button>"
+                                ."<button class='btn btn-primary col-md-6' data-role='next'>".gT('Next','js')."</button>"
                             ."</div>"
                         ."</div>"
                     ."</div>"

diff --git a/application/models/Tutorial.php b/application/models/Tutorial.php
@@ -141,10 +141,14 @@ public function findByName($tutorialName) {
         $defaultTutorials = LsDefaultDataSets::getTutorialData();
         if (array_key_exists($tutorialName, $defaultTutorials)) {
             $oTutorial = new Tutorial();
-            $oTutorial->setAttributes($defaultTutorials[$tutorialName]);
+
+            array_walk($defaultTutorials[$tutorialName], function($attribute, $key) use (&$oTutorial) {
+                $oTutorial->setAttribute($key, $attribute);
+            });
+
             return $oTutorial;
         }
-        $tutorial = $this->find('name=:name', [':name' => $tutorialName]);
+       return $this->find('name=:name', [':name' => $tutorialName]);
     }
 
     public function getDefaultTutorials()