Dev Translation fixes

LimeSurvey · Feb 11, 2020 · 1faaefc · 1faaefc
1 parent ee4d5e7
commit 1faaefc
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/application/controllers/admin/LimeSurveyFileManager.php b/application/controllers/admin/LimeSurveyFileManager.php
@@ -81,7 +81,7 @@ public function index($surveyid = null)
             'Delete file' => gT('Delete file'),
             'Copy file' => gT('Copy file'),
             'Move file' => gT('Move file'),
-            'Allowed file formats' => gT('Allowed file formats'),
+            'Allowed file extensions' => gT('Allowed file extensions'),
             'File formats' => '.'.gT(implode(", .", $this->allowedFileExtensions)) 
         ];
 

diff --git a/application/controllers/admin/emailtemplates.php b/application/controllers/admin/emailtemplates.php
@@ -57,8 +57,8 @@ function index($iSurveyId) {
                 'Subject' => gT('Subject'),
                 'Message' => gT('Message'),
                 'Validate Expressions' => gT('Validate ExpressionScript'),
-                'Reset current' => gT('Reset current'),
-                'Add file to current' => gT('Add file to current'),
+                'Reset to default' => gT('Reset to default'),
+                'Add attachment to template' => gT('Add attachment to template'),
                ]
         ];
         $this->_renderWrappedTemplate('emailtemplates', 'emailtemplatescomponent', $aData);

diff --git a/application/controllers/admin/questionedit.php b/application/controllers/admin/questionedit.php
@@ -826,7 +826,7 @@ private function storeNewQuestionData($aQuestionData = null, $subquestion = fals
         if ($oQuestion == null) {
             throw new LSJsonException(
                 500,
-                gT("Question creation failed, input array malformed or invalid"),
+                gT("Question creation failed - input was malformed or invalid"),
                 0,
                 null,
                 true

diff --git a/application/helpers/questionHelper.php b/application/helpers/questionHelper.php
@@ -182,7 +182,7 @@ public static function getAttributesDefinitions()
                 "1"=>gT('Yes'),
                 ),
             'default' => "1",
-            'help'=>gT('Use Javascript functions to remove text and uncheck checkbox (or use only ExpressionScript engine).'),
+            'help'=>gT('Use JavaScript functions to remove text and uncheck checkbox (or use only the ExpressionScript engine).'),
             'caption'=>gT('Remove text or uncheck checkbox automatically')
         );
 

diff --git a/application/libraries/ExtensionInstaller/ExtensionUpdater.php b/application/libraries/ExtensionInstaller/ExtensionUpdater.php
@@ -133,15 +133,15 @@ public function getVersionMessage(array $versions)
         $extensionName = $this->getExtensionName();
         $extensionType = $this->getExtensionType();
         if ($this->foundSecurityVersion($versions)) {
-            $message = gT('There are <b>security updates</b> available for %s <b>%s</b>.', 'js');
+            $message = '<b>'.gT('There are security updates available for %s (type: %s).', 'js').'</b>';
         } else {
-            $message = gT('There are updates available for %s <b>%s</b>.', 'js');
+            $message = gT('There are updates available for %s (type: %s).', 'js');
         }
 
         $message = sprintf(
             $message,
-            $this->convertExtensionType($extensionType),
-            $extensionName
+            $extensionName,
+            $this->convertExtensionType($extensionType)
         );
 
         $latestVersion = $this->getLatestVersion($versions);
@@ -153,9 +153,8 @@ public function getVersionMessage(array $versions)
 
         if (!empty($latestVersion['manualUpdateUrl'])) {
             $message .= ' ' . sprintf(
-                gT('Please visit <a href="%s">%s</a> to download the update.', 'js'),
-                $latestVersion['manualUpdateUrl'],
-                $latestVersion['manualUpdateUrl']
+                gT('Please visit %s to download the update.', 'js'),
+                '<a href="'.$latestVersion['manualUpdateUrl'].'">'.$latestVersion['manualUpdateUrl'].'</a>'
             );
         }
 

diff --git a/application/libraries/PluginManager/PluginManager.php b/application/libraries/PluginManager/PluginManager.php
@@ -599,7 +599,7 @@ protected function getPluginDescription(string $class, \ExtensionConfig $extensi
         }
 
         if (empty($desc)) {
-            $desc = gT('N/A');
+            $desc = '-';
         }
 
         return $desc;

diff --git a/assets/packages/emailtemplates/src/EmailTemplatesApp.vue b/assets/packages/emailtemplates/src/EmailTemplatesApp.vue
@@ -53,7 +53,7 @@
                             <div class="ls-flex-row col-12">
                                 <button id="EmailTemplates--actionbutton-validateCurrentContent" class="btn btn-default" @click.prevent="validateCurrentContent"> {{"Validate ExpressionScript"}} </button>
                                 <button id="EmailTemplates--actionbutton-resetCurrentContent" class="btn btn-default" @click.prevent="resetCurrentContent"> {{"Reset to default"}} </button>
-                                <button id="EmailTemplates--actionbutton-addFileToCurrent" class="btn btn-default" @click.prevent="addFileToCurrent"> {{"Add attachment to templates"}} </button>
+                                <button id="EmailTemplates--actionbutton-addFileToCurrent" class="btn btn-default" @click.prevent="addFileToCurrent"> {{"Add attachment to template"}} </button>
                             </div>
                         </div>
                         <div class="row ls-space margin top-15" v-if="hasAttachments">

diff --git a/assets/packages/filemanager/src/components/subcomponents/_uploadModal.vue b/assets/packages/filemanager/src/components/subcomponents/_uploadModal.vue
@@ -3,7 +3,7 @@
     <div class="panel panel-default ls-flex-column fill">
         <div class="panel-heading">
             <div class="pagetitle h3">{{'Upload a file' | translate}} </div>
-            <div> <b>{{'Allowed file formats' | translate}}</b>: </div>
+            <div> <b>{{'Allowed file extensions' | translate}}</b>: </div>
             <div> {{'File formats' | translate}}. </div>
         </div>
         <div class="panel-body ls-flex-column grow-1 fill">