Dev: template => theme, in controllers and helpers eT/gT

LimeSurvey · Nov 22, 2017 · ab0584d · ab0584d
1 parent 2cff408
commit ab0584d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/application/controllers/admin/themes.php b/application/controllers/admin/themes.php
@@ -360,7 +360,7 @@ public function index($editfile = '', $screenname = 'welcome', $templatename = '
         // This can happen if the global default template is deleted
         if (!Template::checkIfTemplateExists($templatename)) {
             // Redirect to the default template
-            Yii::app()->setFlashMessage(sprintf(gT('Template %s does not exist.'), htmlspecialchars($templatename, ENT_QUOTES)), 'error');
+            Yii::app()->setFlashMessage(sprintf(gT('Theme %s does not exist.'), htmlspecialchars($templatename, ENT_QUOTES)), 'error');
             $this->getController()->redirect(array('admin/themes/sa/view/', 'templatename'=>'default'));
         }
 
@@ -625,7 +625,7 @@ public function templatesavechanges()
                     in_array($relativePathEditfile, $cssfiles) === false &&
                     in_array($relativePathEditfile, $jsfiles) === false
                     ) {
-                        Yii::app()->user->setFlash('error', gT('Invalid template name'));
+                        Yii::app()->user->setFlash('error', gT('Invalid theme name'));
                         $this->getController()->redirect(array("admin/themes/sa/upload"));
                     }
 
@@ -1065,7 +1065,7 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
             $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor($sLayoutFile, array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
         } catch (Twig_Error_Syntax $ex) {
             $myoutput = sprintf(
-                gT('No Twig output due to error in Twig template: %s'),
+                gT('No Twig output due to error in Twig theme: %s'),
                 $ex->getMessage()
             );
             Yii::app()->user->setFlash(
@@ -1131,11 +1131,11 @@ protected function showIntroNotification()
         $user = User::model()->findByPk(Yii::app()->session['loginID']);
         $not = new UniqueNotification(array(
             'user_id'    => $user->uid,
-            'title'      => gT('LimeSurvey 3.0 template editor'),
+            'title'      => gT('LimeSurvey 3.0 theme editor'),
             'markAsNew'  => false,
             'importance' => Notification::HIGH_IMPORTANCE,
             'message'    => sprintf(
-                gT('Welcome to the new template editor of LimeSurvey 3.0. To get an overview of new functionality and possibilities, please visit the %s LimeSurvey manual %s. For further questions and information, feel free to post your questions on the %s LimeSurvey forums %s.', 'unescaped'),
+                gT('Welcome to the new theme editor of LimeSurvey 3.0. To get an overview of new functionality and possibilities, please visit the %s LimeSurvey manual %s. For further questions and information, feel free to post your questions on the %s LimeSurvey forums %s.', 'unescaped'),
                 '<a target="_blank" href="http://manual.limesurvey.org/Templating">', '</a>',
                 '<a target="_blank" href="https://www.limesurvey.org/community/forums">', '</a>'
             )

diff --git a/application/controllers/admin/useraction.php b/application/controllers/admin/useraction.php
@@ -757,7 +757,7 @@ private function _refreshtemplates()
                 } catch (Exception $ex) {
                     Yii::app()->setFlashMessage(
                         sprintf(
-                            gT('Could not save template %s: %s'),
+                            gT('Could not save theme %s: %s'),
                             $tp,
                             $ex->getMessage()
                         ),

diff --git a/application/helpers/questionHelper.php b/application/helpers/questionHelper.php
@@ -1567,8 +1567,8 @@ public static function getAttributesDefinitions()
             'inputtype'=>'question_template',
             'options'=>array(),
             'default' => "core",
-            "help"=>gT('Use a customized question template for this question'),
-            "caption"=>gT('Question template')
+            "help"=>gT('Use a customized question theme for this question'),
+            "caption"=>gT('Question theme')
         );
 
         /**