From 1faaefc3dab3d475a6c609f278ae3de5f7ae2a6b Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Tue, 11 Feb 2020 20:45:36 +0100 Subject: [PATCH] Dev Translation fixes --- .../controllers/admin/LimeSurveyFileManager.php | 2 +- application/controllers/admin/emailtemplates.php | 4 ++-- application/controllers/admin/questionedit.php | 2 +- application/helpers/questionHelper.php | 2 +- .../ExtensionInstaller/ExtensionUpdater.php | 13 ++++++------- .../libraries/PluginManager/PluginManager.php | 2 +- .../emailtemplates/src/EmailTemplatesApp.vue | 2 +- .../src/components/subcomponents/_uploadModal.vue | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/application/controllers/admin/LimeSurveyFileManager.php b/application/controllers/admin/LimeSurveyFileManager.php index e4a580d38db..e3c039981e0 100644 --- 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 index 305860a2dec..8cc3a2f7175 100644 --- 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 index 6aae0fa63ce..f3c9d018f60 100644 --- 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 index 3b0cab2d562..f13042cadbe 100644 --- 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 index 0b94d4f7b50..782ec520a1d 100644 --- 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 security updates available for %s %s.', 'js'); + $message = ''.gT('There are security updates available for %s (type: %s).', 'js').''; } else { - $message = gT('There are updates available for %s %s.', '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 %s to download the update.', 'js'), - $latestVersion['manualUpdateUrl'], - $latestVersion['manualUpdateUrl'] + gT('Please visit %s to download the update.', 'js'), + ''.$latestVersion['manualUpdateUrl'].'' ); } diff --git a/application/libraries/PluginManager/PluginManager.php b/application/libraries/PluginManager/PluginManager.php index 8dd746d7573..9002434afc7 100644 --- 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 index d4f5be0606d..c26ca53a340 100644 --- a/assets/packages/emailtemplates/src/EmailTemplatesApp.vue +++ b/assets/packages/emailtemplates/src/EmailTemplatesApp.vue @@ -53,7 +53,7 @@
- +
diff --git a/assets/packages/filemanager/src/components/subcomponents/_uploadModal.vue b/assets/packages/filemanager/src/components/subcomponents/_uploadModal.vue index 963282fd4e0..04658305b9b 100644 --- a/assets/packages/filemanager/src/components/subcomponents/_uploadModal.vue +++ b/assets/packages/filemanager/src/components/subcomponents/_uploadModal.vue @@ -3,7 +3,7 @@
{{'Upload a file' | translate}}
-
{{'Allowed file formats' | translate}}:
+
{{'Allowed file extensions' | translate}}:
{{'File formats' | translate}}.