aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2022-01-08 21:58:55 +0100
committerGravatar GitHub <noreply@github.com> 2022-01-08 21:58:55 +0100
commit1acd3ab09be1b65bfd6122ee351490c3b5527bb8 (patch)
treef11de558e7a09522a45d1c155d9707ecda6bf1eb /app/Controllers
parent916df412f5b6f7fb9bcfb705a3c8c23e35304410 (diff)
Use typographic quotes (#4133)
* Use typographic quotes * A few fixes * Fix * Fix not saved * Implement feedback * Detail * Revert spoken English fixes Left for a future dedicated discussion * More reverts * Final reverts * Final minor
Diffstat (limited to 'app/Controllers')
-rw-r--r--app/Controllers/authController.php2
-rwxr-xr-xapp/Controllers/feedController.php4
-rw-r--r--app/Controllers/importExportController.php10
-rw-r--r--app/Controllers/updateController.php2
-rw-r--r--app/Controllers/userController.php14
5 files changed, 16 insertions, 16 deletions
diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index c4258b8df..27a7b4ac8 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -221,7 +221,7 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
/**
* This action gives possibility to a user to create an account.
*
- * The user is redirected to the home if he's connected.
+ * The user is redirected to the home when logged in.
*
* A 403 is sent if max number of registrations is reached.
*/
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index de243501b..faca9416b 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -96,7 +96,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
$id = $feedDAO->addFeed($values);
if (!$id) {
- // There was an error in database... we cannot say what here.
+ // There was an error in database… we cannot say what here.
throw new FreshRSS_FeedNotAdded_Exception($url);
}
$feed->_id($id);
@@ -196,7 +196,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
Minz_Log::warning($e->getMessage());
return Minz_Request::bad(_t('feedback.sub.feed.internal_problem', _url('index', 'logs')), $url_redirect);
} catch (Minz_FileNotExistException $e) {
- // Cache directory doesn't exist!
+ // Cache directory doesn’t exist!
Minz_Log::error($e->getMessage());
return Minz_Request::bad(_t('feedback.sub.feed.internal_problem', _url('index', 'logs')), $url_redirect);
} catch (FreshRSS_AlreadySubscribed_Exception $e) {
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index d384afddb..dfe6f97cb 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -185,8 +185,8 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
/**
* This method tries to guess the file type based on its name.
*
- * Itis a *very* basic guess file type function. Only based on filename.
- * That's could be improved but should be enough for what we have to do.
+ * It is a *very* basic guess file type function. Only based on filename.
+ * That could be improved but should be enough for what we have to do.
*/
private static function guessFileType($filename) {
if (substr_compare($filename, '.zip', -4) === 0) {
@@ -594,7 +594,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
foreach ($export_feeds as $feed_id) {
$result = $export_service->generateFeedEntries($feed_id, $max_number_entries);
if (!$result) {
- // It means the actual feed_id doesn't correspond to any existing feed
+ // It means the actual feed_id doesn’t correspond to any existing feed
continue;
}
@@ -604,7 +604,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
$nb_files = count($exported_files);
if ($nb_files <= 0) {
- // There's nothing to do, there're no files to export
+ // There’s nothing to do, there’re no files to export
return Minz_Request::forward(
array('c' => 'importExport', 'a' => 'index'),
true
@@ -616,7 +616,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
$filename = key($exported_files);
$content = $exported_files[$filename];
} else {
- // More files? Let's compress them in a Zip archive
+ // More files? Let’s compress them in a Zip archive
if (!extension_loaded('zip')) {
// Oops, there is no ZIP extension!
return Minz_Request::bad(
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 0f67fe64c..a4a7fd086 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -137,7 +137,7 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController {
$this->view->_path('update/index.phtml');
if (file_exists(UPDATE_FILENAME)) {
- // There is already an update file to apply: we don't need to check
+ // There is already an update file to apply: we don’t need to check
// the webserver!
// Or if already check during the last hour, do nothing.
Minz_Request::forward(array('c' => 'update'), true);
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index c5e1b30ab..f5db8b93b 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -351,8 +351,8 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {
$_POST['new_user_passwordPlain'] = '';
invalidateHttpCache();
- // If the user has admin access, it means he's already logged in
- // and we don't want to login with the new account. Otherwise, the
+ // If the user has admin access, it means he’s already logged in
+ // and we don’t want to login with the new account. Otherwise, the
// user just created its account himself so he probably wants to
// get started immediately.
if ($ok && !FreshRSS_Auth::hasAccess('admin')) {
@@ -407,12 +407,12 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {
*
* This route works with GET requests since the URL is provided by email.
* The security risks (e.g. forged URL by an attacker) are not very high so
- * it's ok.
+ * it’s ok.
*
* It returns 404 error if `force_email_validation` is disabled or if the
- * user doesn't exist.
+ * user doesn’t exist.
*
- * It returns 403 if user isn't logged in and `username` param isn't passed.
+ * It returns 403 if user isn’t logged in and `username` param isn’t passed.
*/
public function validateEmailAction() {
if (!FreshRSS_Context::$system_conf->force_email_validation) {
@@ -470,7 +470,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {
/**
* This action resends a validation email to the current user.
*
- * It only acts on POST requests but doesn't require any param (except the
+ * It only acts on POST requests but doesn’t require any param (except the
* CSRF token).
*
* It returns 403 error if the user is not logged in or 404 if request is
@@ -537,7 +537,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {
if (Minz_Request::isPost()) {
$ok = true;
if ($self_deletion) {
- // We check the password if it's a self-destruction
+ // We check the password if it’s a self-destruction
$nonce = Minz_Session::param('nonce');
$challenge = Minz_Request::param('challenge', '');