Skip to content

Commit

Permalink
Dev Some grammatical touch-ups (#2585)
Browse files Browse the repository at this point in the history
  • Loading branch information
lorint committed Sep 1, 2022
1 parent 1fee5db commit 70777fa
Show file tree
Hide file tree
Showing 32 changed files with 239 additions and 239 deletions.
2 changes: 1 addition & 1 deletion application/config/config-defaults.php
Expand Up @@ -187,7 +187,7 @@
// unless a username mapping is used see auth_webserver_user_map below
//
// The user still needs to be defined in the limesurvey database in order to
// login and get his permissions (unless auth_webserver_autocreate_user is set to true)
// login and get their permissions (unless auth_webserver_autocreate_user is set to true)
$config['auth_webserver'] = false;

// auth_webserver_user_map
Expand Down
2 changes: 1 addition & 1 deletion application/core/LSYii_Validators.php
Expand Up @@ -50,7 +50,7 @@ public function __construct()
// Permission::model exist only after 172 DB version
return $this->xssfilter = ($this->xssfilter && Yii::app()->getConfig('filterxsshtml'));
}
// If run from console there his no user
// If run from console there is no user
$this->xssfilter = ($this->xssfilter && (($controller = Yii::app()->getController()) !== null && (get_class($controller) !== 'ConsoleApplication' )) && Yii::app()->user->isXssFiltered());
return;
}
Expand Down
2 changes: 1 addition & 1 deletion application/core/LsDefaultDataSets.php
Expand Up @@ -2935,7 +2935,7 @@ public static function getDefaultUserAdministrationSettings()
$template .= "<p>" . sprintf(gT("This is an automated email notification that a user has been created for you on the website %s."), "<strong>'{SITENAME}'</strong>") . "</p>";
$template .= "<p></p><p>" . gT("You can use now the following credentials to log in:") . "</p>";
$template .= "<p><strong>" . gT("Username") . "</strong>: {USERNAME}</p>";
//don't send password anymore, just send a link for the new admin to generate his own password
//don't send password anymore, just send a link for the new admin to generate their own password
//$template .= "<p><strong>" . gt("Password") . "</strong>: {PASSWORD}</p>";
$template .= '<p><a href="{LOGINURL}">' . gT("Click here to set your password") . '</a></p>';
$template .= "<p>" . gT("If you have any questions regarding this email, please do not hesitate to contact the site administrator at") . " {SITEADMINEMAIL}.</p><p> </p>";
Expand Down

0 comments on commit 70777fa

Please sign in to comment.