diff --git a/application/controllers/admin/questionedit.php b/application/controllers/admin/questionedit.php index fa8f03a6f8d..6e5101526aa 100644 --- a/application/controllers/admin/questionedit.php +++ b/application/controllers/admin/questionedit.php @@ -158,9 +158,9 @@ public function view($surveyid, $gid = null, $qid = null, $landOnSideMenuTab = ' "noCodeWarning" => gT("Please put in a valid code. Only letters and numbers are allowed and it has to start with a letter. For example [Question1]"), "alreadyTaken" => - gT("This code is already taken. Duplicate codes are not allowed."), + gT("This code is already used - duplicate codes are not allowed."), "codeTooLong" => - gT("Question code cannot be longer than 20 digits."), + gT("A question code cannot be longer than 20 characters."), "Question cannot be stored. Please check the subquestion codes for duplicates or empty codes." => gT("Question cannot be stored. Please check the subquestion codes for duplicates or empty codes."), "Question cannot be stored. Please check the answer option for duplicates or empty titles." => diff --git a/application/core/plugins/statFunctions/statFunctions.php b/application/core/plugins/statFunctions/statFunctions.php index a4d500fdc00..ed44d60752d 100644 --- a/application/core/plugins/statFunctions/statFunctions.php +++ b/application/core/plugins/statFunctions/statFunctions.php @@ -20,7 +20,7 @@ */ class statFunctions extends PluginBase { - protected static $description = 'Add some function in expression manager to get count from other responses'; + protected static $description = 'Add some function in Expression Manager to get count from other responses'; protected static $name = 'statCountFunctions'; public function init() @@ -35,7 +35,7 @@ public function newValidFunctions() 'statCountIf' => array( '\statFunctions\countFunctions::statCountIf', null, // No javascript function : set as static function - $this->gT("Count the response done with value equal to a specific value"), // Description for admin + $this->gT("Count the number of complete responses with a value equal to a specific value"), // Description for admin 'integer statCountIf(QuestionCode.sgqa, value[, submitted = true])', // Extra description 'https://www.limesurvey.org', // Help url 2, // Number of argument unsure it work here … , minimum 2, allow 3 @@ -44,7 +44,7 @@ public function newValidFunctions() 'statCount' => array( '\statFunctions\countFunctions::statCount', null, // No javascript function : set as static function - $this->gT("Count previous response done not empty"), // Description for admin + $this->gT("Count the number of complete responses which are not empty"), // Description for admin 'integer statCount(QuestionCode.sgqa[, submitted = true])', // Extra description 'https://www.limesurvey.org', // Help url 1, // Number of argument (time to make a good description of EM …) minimum 1, allow 2 diff --git a/application/models/QuestionTheme.php b/application/models/QuestionTheme.php index 14a3ee0a93f..d1e787fe129 100644 --- a/application/models/QuestionTheme.php +++ b/application/models/QuestionTheme.php @@ -820,16 +820,17 @@ static public function getQuestionXMLPathForBaseType($type) public static function convertLS3toLS4($sXMLDirectoryPath) { $sXMLDirectoryPath = str_replace('\\', '/', $sXMLDirectoryPath); + $sConfigPath = $sXMLDirectoryPath . DIRECTORY_SEPARATOR . 'config.xml'; $bOldEntityLoaderState = libxml_disable_entity_loader(true); - $sQuestionConfigFilePath = App()->getConfig('rootdir') . DIRECTORY_SEPARATOR . $sXMLDirectoryPath . DIRECTORY_SEPARATOR . 'config.xml'; + $sQuestionConfigFilePath = App()->getConfig('rootdir') . DIRECTORY_SEPARATOR . $sConfigPath; $sQuestionConfigFile = file_get_contents($sQuestionConfigFilePath); // @see: Now that entity loader is disabled, we can't use simplexml_load_file; so we must read the file with file_get_contents and convert it as a string if (!$sQuestionConfigFile) { libxml_disable_entity_loader($bOldEntityLoaderState); return $aSuccess = [ 'message' => sprintf( - gT('No Configuration could be found for %s/config.xml'), - $sXMLDirectoryPath + gT('Configuration file %s could not be found or read.'), + $sConfigPath ), 'success' => false ]; diff --git a/application/models/User.php b/application/models/User.php index 1f036809d6d..f6f77cb6c2d 100644 --- a/application/models/User.php +++ b/application/models/User.php @@ -109,14 +109,14 @@ public function attributeLabels() { 'users_name' => gT('Username'), 'password' => gT('Password'), 'full_name' => gT('Full name'), - 'parent_id' => gT('Parent User'), + 'parent_id' => gT('Parent user'), 'lang' => gT('Language'), 'email' => gT('Email'), - 'htmleditormode' => gT('Editormode'), + 'htmleditormode' => gT('Editor mode'), 'templateeditormode' => gT('Template editor mode'), 'questionselectormode' => gT('Question selector mode'), - 'one_time_pw' => gT('One time password'), - 'dateformat' => gT('Dateformat'), + 'one_time_pw' => gT('One-time password'), + 'dateformat' => gT('Date format'), 'created' => gT('Created at'), 'modified' => gT('Modified at'), 'lastLogin' => gT('Last recorded login'), diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php index 3555e1cec7f..cfb71233acd 100644 --- a/application/views/admin/survey/Question/editQuestion_view.php +++ b/application/views/admin/survey/Question/editQuestion_view.php @@ -75,7 +75,7 @@ 'groupStructureArray' => $aQuestionTypeGroups, 'value' => $oQuestion->type, 'debug' => YII_DEBUG, - 'currentSelected' => $selectedQuestion['title'] ?? gT('Invalid Question'), + 'currentSelected' => $selectedQuestion['title'] ?? gT('Invalid question'), 'optionArray' => [ 'selectedClass' => $selectedQuestion['settings']->class ?? 'invalid_question', 'onUpdate' => [ @@ -250,7 +250,7 @@
+ " role="button"> diff --git a/application/views/admin/survey/topbar/question_topbar.php b/application/views/admin/survey/topbar/question_topbar.php index e64c02363d5..1c825386499 100644 --- a/application/views/admin/survey/topbar/question_topbar.php +++ b/application/views/admin/survey/topbar/question_topbar.php @@ -414,7 +414,7 @@ 'class' => 'btn-default', 'id' => 'import-button', 'icon' => 'icon-import', - 'name' => gT('Import Question'), + 'name' => gT('Import question'), ]; } else { // survey active @@ -423,7 +423,7 @@ 'class' => 'btn-default readonly', 'id' => 'import-button', 'icon' => 'icon-import', - 'name' => gT('Import Question'), + 'name' => gT('Import question'), ]; } array_push($topbar['alignment']['left']['buttons'], $buttons['import']); diff --git a/application/views/admin/tutorialentries/index.php b/application/views/admin/tutorialentries/index.php index d6f132e227a..f6b3f59496b 100644 --- a/application/views/admin/tutorialentries/index.php +++ b/application/views/admin/tutorialentries/index.php @@ -8,7 +8,7 @@
- +
diff --git a/application/views/admin/user/personalsettings.php b/application/views/admin/user/personalsettings.php index 42e20941c36..51443f65fc7 100644 --- a/application/views/admin/user/personalsettings.php +++ b/application/views/admin/user/personalsettings.php @@ -60,7 +60,7 @@ 'groupStructureArray' => $aQuestionTypeGroups, 'value' => $currentPreselectedQuestiontype, 'debug' => YII_DEBUG, - 'currentSelected' => $selectedQuestion['title'] ?? gT('Invalid Question'), + 'currentSelected' => $selectedQuestion['title'] ?? gT('Invalid question'), 'buttonClasses' => ['btn-primary'], 'optionArray' => [ 'selectedClass' => $selectedQuestion['settings']->class ?? 'invalid_question', diff --git a/application/views/installer/dbconfig_view.php b/application/views/installer/dbconfig_view.php index e47136d4a4b..72de1dc9d57 100644 --- a/application/views/installer/dbconfig_view.php +++ b/application/views/installer/dbconfig_view.php @@ -63,7 +63,7 @@ function checkDbEngine(){
dbEngines, array('prompt'=>gT("Select"), 'autocomplete'=>'off', 'class' => 'form-control')); ?> -
+