Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1652 from ArthurHoaro/fix/failing-mutex

Browse source 
Fix: soft fail if the mutex is not working
This commit is contained in:
ArthurHoaro 2020-12-16 16:01:32 +01:00 committed by GitHub
parent 3d5f05052f 8a6b7e96b7
commit b1d78519a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 145 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
application/bookmark/BookmarkIO.php
View file

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Shaarli\Bookmark; namespace Shaarli\Bookmark;
use malkusch\lock\exception\LockAcquireException;
use malkusch\lock\mutex\Mutex; use malkusch\lock\mutex\Mutex;
use malkusch\lock\mutex\NoMutex; use malkusch\lock\mutex\NoMutex;
use Shaarli\Bookmark\Exception\DatastoreNotInitializedException; use Shaarli\Bookmark\Exception\DatastoreNotInitializedException;
@ -80,7 +81,7 @@ class BookmarkIO
} }
$content = null; $content = null;
$this->mutex->synchronized(function () use (&$content) { $this->synchronized(function () use (&$content) {
$content = file_get_contents($this->datastore); $content = file_get_contents($this->datastore);
}); });
@ -119,11 +120,28 @@ class BookmarkIO
$data = self::$phpPrefix . base64_encode(gzdeflate(serialize($links))) . self::$phpSuffix; $data = self::$phpPrefix . base64_encode(gzdeflate(serialize($links))) . self::$phpSuffix;
$this->mutex->synchronized(function () use ($data) { $this->synchronized(function () use ($data) {
file_put_contents( file_put_contents(
$this->datastore, $this->datastore,
$data $data
); );
}); });
} }
/**
* Wrapper applying mutex to provided function.
* If the lock can't be acquired (e.g. some shared hosting provider), we execute the function without mutex.
*
* @see https://github.com/shaarli/Shaarli/issues/1650
*
* @param callable $function
*/
protected function synchronized(callable $function): void
{
try {
$this->mutex->synchronized($function);
} catch (LockAcquireException $exception) {
$function();
}
}
} }

7
application/front/controller/admin/ServerController.php
View file

@ -39,11 +39,16 @@ class ServerController extends ShaarliAdminController
$currentVersion = $currentVersion === 'dev' ? $currentVersion : 'v' . $currentVersion; $currentVersion = $currentVersion === 'dev' ? $currentVersion : 'v' . $currentVersion;
$phpEol = new \DateTimeImmutable(ApplicationUtils::getPhpEol(PHP_VERSION)); $phpEol = new \DateTimeImmutable(ApplicationUtils::getPhpEol(PHP_VERSION));
$permissions = array_merge(
ApplicationUtils::checkResourcePermissions($this->container->conf),
ApplicationUtils::checkDatastoreMutex()
);
$this->assignView('php_version', PHP_VERSION); $this->assignView('php_version', PHP_VERSION);
$this->assignView('php_eol', format_date($phpEol, false)); $this->assignView('php_eol', format_date($phpEol, false));
$this->assignView('php_has_reached_eol', $phpEol < new \DateTimeImmutable()); $this->assignView('php_has_reached_eol', $phpEol < new \DateTimeImmutable());
$this->assignView('php_extensions', ApplicationUtils::getPhpExtensionsRequirement()); $this->assignView('php_extensions', ApplicationUtils::getPhpExtensionsRequirement());
$this->assignView('permissions', ApplicationUtils::checkResourcePermissions($this->container->conf)); $this->assignView('permissions', $permissions);
$this->assignView('release_url', $releaseUrl); $this->assignView('release_url', $releaseUrl);
$this->assignView('latest_version', $latestVersion); $this->assignView('latest_version', $latestVersion);
$this->assignView('current_version', $currentVersion); $this->assignView('current_version', $currentVersion);

7
application/front/controller/visitor/InstallController.php
View file

@ -56,11 +56,16 @@ class InstallController extends ShaarliVisitorController
$phpEol = new \DateTimeImmutable(ApplicationUtils::getPhpEol(PHP_VERSION)); $phpEol = new \DateTimeImmutable(ApplicationUtils::getPhpEol(PHP_VERSION));
$permissions = array_merge(
ApplicationUtils::checkResourcePermissions($this->container->conf),
ApplicationUtils::checkDatastoreMutex()
);
$this->assignView('php_version', PHP_VERSION); $this->assignView('php_version', PHP_VERSION);
$this->assignView('php_eol', format_date($phpEol, false)); $this->assignView('php_eol', format_date($phpEol, false));
$this->assignView('php_has_reached_eol', $phpEol < new \DateTimeImmutable()); $this->assignView('php_has_reached_eol', $phpEol < new \DateTimeImmutable());
$this->assignView('php_extensions', ApplicationUtils::getPhpExtensionsRequirement()); $this->assignView('php_extensions', ApplicationUtils::getPhpExtensionsRequirement());
$this->assignView('permissions', ApplicationUtils::checkResourcePermissions($this->container->conf)); $this->assignView('permissions', $permissions);
$this->assignView('pagetitle', t('Install Shaarli')); $this->assignView('pagetitle', t('Install Shaarli'));

16
application/helper/ApplicationUtils.php
View file

@ -3,6 +3,8 @@
namespace Shaarli\Helper; namespace Shaarli\Helper;
use Exception; use Exception;
use malkusch\lock\exception\LockAcquireException;
use malkusch\lock\mutex\FlockMutex;
use Shaarli\Config\ConfigManager; use Shaarli\Config\ConfigManager;
/** /**
@ -252,6 +254,20 @@ class ApplicationUtils
return $errors; return $errors;
} }
public static function checkDatastoreMutex(): array
{
$mutex = new FlockMutex(fopen(SHAARLI_MUTEX_FILE, 'r'), 2);
try {
$mutex->synchronized(function () {
return true;
});
} catch (LockAcquireException $e) {
$errors[] = t('Lock can not be acquired on the datastore. You might encounter concurrent access issues.');
}
return $errors ?? [];
}
/** /**
* Returns a salted hash representing the current Shaarli version. * Returns a salted hash representing the current Shaarli version.
* *

186
inc/languages/fr/LC_MESSAGES/shaarli.po
View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Shaarli\n" "Project-Id-Version: Shaarli\n"
"POT-Creation-Date: 2020-11-09 14:39+0100\n" "POT-Creation-Date: 2020-11-24 13:13+0100\n"
"PO-Revision-Date: 2020-11-09 14:42+0100\n" "PO-Revision-Date: 2020-11-24 13:14+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: Shaarli\n" "Language-Team: Shaarli\n"
"Language: fr_FR\n" "Language: fr_FR\n"
@ -20,31 +20,31 @@ msgstr ""
"X-Poedit-SearchPath-3: init.php\n" "X-Poedit-SearchPath-3: init.php\n"
"X-Poedit-SearchPath-4: plugins\n" "X-Poedit-SearchPath-4: plugins\n"
#: application/History.php:180 #: application/History.php:181
msgid "History file isn't readable or writable" msgid "History file isn't readable or writable"
msgstr "Le fichier d'historique n'est pas accessible en lecture ou en écriture" msgstr "Le fichier d'historique n'est pas accessible en lecture ou en écriture"
#: application/History.php:191 #: application/History.php:192
msgid "Could not parse history file" msgid "Could not parse history file"
msgstr "Format incorrect pour le fichier d'historique" msgstr "Format incorrect pour le fichier d'historique"
#: application/Languages.php:181 #: application/Languages.php:184
msgid "Automatic" msgid "Automatic"
msgstr "Automatique" msgstr "Automatique"
#: application/Languages.php:182 #: application/Languages.php:185
msgid "German" msgid "German"
msgstr "Allemand" msgstr "Allemand"
#: application/Languages.php:183 #: application/Languages.php:186
msgid "English" msgid "English"
msgstr "Anglais" msgstr "Anglais"
#: application/Languages.php:184 #: application/Languages.php:187
msgid "French" msgid "French"
msgstr "Français" msgstr "Français"
#: application/Languages.php:185 #: application/Languages.php:188
msgid "Japanese" msgid "Japanese"
msgstr "Japonais" msgstr "Japonais"
@ -56,46 +56,46 @@ msgstr ""
"l'extension php-gd doit être chargée pour utiliser les miniatures. Les " "l'extension php-gd doit être chargée pour utiliser les miniatures. Les "
"miniatures sont désormais désactivées. Rechargez la page." "miniatures sont désormais désactivées. Rechargez la page."
#: application/Utils.php:402 #: application/Utils.php:405
msgid "Setting not set" msgid "Setting not set"
msgstr "Paramètre non défini" msgstr "Paramètre non défini"
#: application/Utils.php:409 #: application/Utils.php:412
msgid "Unlimited" msgid "Unlimited"
msgstr "Illimité" msgstr "Illimité"
#: application/Utils.php:412 #: application/Utils.php:415
msgid "B" msgid "B"
msgstr "o" msgstr "o"
#: application/Utils.php:412 #: application/Utils.php:415
msgid "kiB" msgid "kiB"
msgstr "ko" msgstr "ko"
#: application/Utils.php:412 #: application/Utils.php:415
msgid "MiB" msgid "MiB"
msgstr "Mo" msgstr "Mo"
#: application/Utils.php:412 #: application/Utils.php:415
msgid "GiB" msgid "GiB"
msgstr "Go" msgstr "Go"
#: application/bookmark/BookmarkFileService.php:183 #: application/bookmark/BookmarkFileService.php:185
#: application/bookmark/BookmarkFileService.php:205 #: application/bookmark/BookmarkFileService.php:207
#: application/bookmark/BookmarkFileService.php:227 #: application/bookmark/BookmarkFileService.php:229
#: application/bookmark/BookmarkFileService.php:241 #: application/bookmark/BookmarkFileService.php:243
msgid "You're not authorized to alter the datastore" msgid "You're not authorized to alter the datastore"
msgstr "Vous n'êtes pas autorisé à modifier les données" msgstr "Vous n'êtes pas autorisé à modifier les données"
#: application/bookmark/BookmarkFileService.php:208 #: application/bookmark/BookmarkFileService.php:210
msgid "This bookmarks already exists" msgid "This bookmarks already exists"
msgstr "Ce marque-page existe déjà" msgstr "Ce marque-page existe déjà"
#: application/bookmark/BookmarkInitializer.php:39 #: application/bookmark/BookmarkInitializer.php:42
msgid "(private bookmark with thumbnail demo)" msgid "(private bookmark with thumbnail demo)"
msgstr "(marque page privé avec une miniature)" msgstr "(marque page privé avec une miniature)"
#: application/bookmark/BookmarkInitializer.php:42 #: application/bookmark/BookmarkInitializer.php:45
msgid "" msgid ""
"Shaarli will automatically pick up the thumbnail for links to a variety of " "Shaarli will automatically pick up the thumbnail for links to a variety of "
"websites.\n" "websites.\n"
@ -118,11 +118,11 @@ msgstr ""
"\n" "\n"
"Maintenant, vous pouvez modifier ou supprimer les shaares créés par défaut.\n" "Maintenant, vous pouvez modifier ou supprimer les shaares créés par défaut.\n"
#: application/bookmark/BookmarkInitializer.php:55 #: application/bookmark/BookmarkInitializer.php:58
msgid "Note: Shaare descriptions" msgid "Note: Shaare descriptions"
msgstr "Note : Description des Shaares" msgstr "Note : Description des Shaares"
#: application/bookmark/BookmarkInitializer.php:57 #: application/bookmark/BookmarkInitializer.php:60
msgid "" msgid ""
"Adding a shaare without entering a URL creates a text-only \"note\" post " "Adding a shaare without entering a URL creates a text-only \"note\" post "
"such as this one.\n" "such as this one.\n"
@ -186,7 +186,7 @@ msgstr ""
"| Citron | Fruit | Jaune | 30 |\n" "| Citron | Fruit | Jaune | 30 |\n"
"| Carotte | Légume | Orange | 14 |\n" "| Carotte | Légume | Orange | 14 |\n"
#: application/bookmark/BookmarkInitializer.php:91 #: application/bookmark/BookmarkInitializer.php:94
#: application/legacy/LegacyLinkDB.php:246 #: application/legacy/LegacyLinkDB.php:246
#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15 #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15
#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48 #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48
@ -198,7 +198,7 @@ msgstr ""
"Le gestionnaire de marque-pages personnel, minimaliste, et sans base de " "Le gestionnaire de marque-pages personnel, minimaliste, et sans base de "
"données" "données"
#: application/bookmark/BookmarkInitializer.php:94 #: application/bookmark/BookmarkInitializer.php:97
msgid "" msgid ""
"Welcome to Shaarli!\n" "Welcome to Shaarli!\n"
"\n" "\n"
@ -247,11 +247,11 @@ msgstr ""
"issues) si vous avez une suggestion ou si vous rencontrez un problème.\n" "issues) si vous avez une suggestion ou si vous rencontrez un problème.\n"
" \n" " \n"
#: application/bookmark/exception/BookmarkNotFoundException.php:13 #: application/bookmark/exception/BookmarkNotFoundException.php:14
msgid "The link you are trying to reach does not exist or has been deleted." msgid "The link you are trying to reach does not exist or has been deleted."
msgstr "Le lien que vous essayez de consulter n'existe pas ou a été supprimé." msgstr "Le lien que vous essayez de consulter n'existe pas ou a été supprimé."
#: application/config/ConfigJson.php:52 application/config/ConfigPhp.php:129 #: application/config/ConfigJson.php:52 application/config/ConfigPhp.php:131
msgid "" msgid ""
"Shaarli could not create the config file. Please make sure Shaarli has the " "Shaarli could not create the config file. Please make sure Shaarli has the "
"right to write in the folder is it installed in." "right to write in the folder is it installed in."
@ -259,12 +259,12 @@ msgstr ""
"Shaarli n'a pas pu créer le fichier de configuration. Merci de vérifier que " "Shaarli n'a pas pu créer le fichier de configuration. Merci de vérifier que "
"Shaarli a les droits d'écriture dans le dossier dans lequel il est installé." "Shaarli a les droits d'écriture dans le dossier dans lequel il est installé."
#: application/config/ConfigManager.php:136 #: application/config/ConfigManager.php:137
#: application/config/ConfigManager.php:163 #: application/config/ConfigManager.php:164
msgid "Invalid setting key parameter. String expected, got: " msgid "Invalid setting key parameter. String expected, got: "
msgstr "Clé de paramétrage invalide. Chaîne de caractères obtenue, attendu : " msgstr "Clé de paramétrage invalide. Chaîne de caractères obtenue, attendu : "
#: application/config/exception/MissingFieldConfigException.php:21 #: application/config/exception/MissingFieldConfigException.php:20
#, php-format #, php-format
msgid "Configuration value is required for %s" msgid "Configuration value is required for %s"
msgstr "Le paramètre %s est obligatoire" msgstr "Le paramètre %s est obligatoire"
@ -274,48 +274,48 @@ msgid "An error occurred while trying to save plugins loading order."
msgstr "" msgstr ""
"Une erreur s'est produite lors de la sauvegarde de l'ordre des extensions." "Une erreur s'est produite lors de la sauvegarde de l'ordre des extensions."
#: application/config/exception/UnauthorizedConfigException.php:16 #: application/config/exception/UnauthorizedConfigException.php:15
msgid "You are not authorized to alter config." msgid "You are not authorized to alter config."
msgstr "Vous n'êtes pas autorisé à modifier la configuration." msgstr "Vous n'êtes pas autorisé à modifier la configuration."
#: application/exceptions/IOException.php:22 #: application/exceptions/IOException.php:23
msgid "Error accessing" msgid "Error accessing"
msgstr "Une erreur s'est produite en accédant à" msgstr "Une erreur s'est produite en accédant à"
#: application/feed/FeedBuilder.php:179 #: application/feed/FeedBuilder.php:180
msgid "Direct link" msgid "Direct link"
msgstr "Liens directs" msgstr "Liens directs"
#: application/feed/FeedBuilder.php:181 #: application/feed/FeedBuilder.php:182
#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:103 #: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:103
#: tmp/dailyrss.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26 #: tmp/dailyrss.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:179 #: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:179
msgid "Permalink" msgid "Permalink"
msgstr "Permalien" msgstr "Permalien"
#: application/front/controller/admin/ConfigureController.php:54 #: application/front/controller/admin/ConfigureController.php:56
#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24 #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24
msgid "Configure" msgid "Configure"
msgstr "Configurer" msgstr "Configurer"
#: application/front/controller/admin/ConfigureController.php:102 #: application/front/controller/admin/ConfigureController.php:106
#: application/legacy/LegacyUpdater.php:537 #: application/legacy/LegacyUpdater.php:539
msgid "You have enabled or changed thumbnails mode." msgid "You have enabled or changed thumbnails mode."
msgstr "Vous avez activé ou changé le mode de miniatures." msgstr "Vous avez activé ou changé le mode de miniatures."
#: application/front/controller/admin/ConfigureController.php:103 #: application/front/controller/admin/ConfigureController.php:108
#: application/front/controller/admin/ServerController.php:75 #: application/front/controller/admin/ServerController.php:76
#: application/legacy/LegacyUpdater.php:538 #: application/legacy/LegacyUpdater.php:540
msgid "Please synchronize them." msgid "Please synchronize them."
msgstr "Merci de les synchroniser." msgstr "Merci de les synchroniser."
#: application/front/controller/admin/ConfigureController.php:113 #: application/front/controller/admin/ConfigureController.php:119
#: application/front/controller/visitor/InstallController.php:146 #: application/front/controller/visitor/InstallController.php:149
msgid "Error while writing config file after configuration update." msgid "Error while writing config file after configuration update."
msgstr "" msgstr ""
"Une erreur s'est produite lors de la sauvegarde du fichier de configuration." "Une erreur s'est produite lors de la sauvegarde du fichier de configuration."
#: application/front/controller/admin/ConfigureController.php:122 #: application/front/controller/admin/ConfigureController.php:128
msgid "Configuration was saved." msgid "Configuration was saved."
msgstr "La configuration a été sauvegardée." msgstr "La configuration a été sauvegardée."
@ -433,7 +433,7 @@ msgstr "Administration serveur"
msgid "Thumbnails cache has been cleared." msgid "Thumbnails cache has been cleared."
msgstr "Le cache des miniatures a été vidé." msgstr "Le cache des miniatures a été vidé."
#: application/front/controller/admin/ServerController.php:83 #: application/front/controller/admin/ServerController.php:85
msgid "Shaarli's cache folder has been cleared!" msgid "Shaarli's cache folder has been cleared!"
msgstr "Le dossier de cache de Shaarli a été vidé !" msgstr "Le dossier de cache de Shaarli a été vidé !"
@ -459,18 +459,18 @@ msgstr "Le lien avec l'identifiant %s n'a pas pu être trouvé."
msgid "Invalid visibility provided." msgid "Invalid visibility provided."
msgstr "Visibilité du lien non valide." msgstr "Visibilité du lien non valide."
#: application/front/controller/admin/ShaarePublishController.php:171 #: application/front/controller/admin/ShaarePublishController.php:173
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:171 #: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:171
msgid "Edit" msgid "Edit"
msgstr "Modifier" msgstr "Modifier"
#: application/front/controller/admin/ShaarePublishController.php:174 #: application/front/controller/admin/ShaarePublishController.php:176
#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28
#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:28 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:28
msgid "Shaare" msgid "Shaare"
msgstr "Shaare" msgstr "Shaare"
#: application/front/controller/admin/ShaarePublishController.php:205 #: application/front/controller/admin/ShaarePublishController.php:208
msgid "Note: " msgid "Note: "
msgstr "Note : " msgstr "Note : "
@ -485,7 +485,7 @@ msgstr "Mise à jour des miniatures"
msgid "Tools" msgid "Tools"
msgstr "Outils" msgstr "Outils"
#: application/front/controller/visitor/BookmarkListController.php:120 #: application/front/controller/visitor/BookmarkListController.php:121
msgid "Search: " msgid "Search: "
msgstr "Recherche : " msgstr "Recherche : "
@ -535,12 +535,12 @@ msgstr "Une erreur inattendue s'est produite."
msgid "Requested page could not be found." msgid "Requested page could not be found."
msgstr "La page demandée n'a pas pu être trouvée." msgstr "La page demandée n'a pas pu être trouvée."
#: application/front/controller/visitor/InstallController.php:64 #: application/front/controller/visitor/InstallController.php:65
#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:22 #: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:22
msgid "Install Shaarli" msgid "Install Shaarli"
msgstr "Installation de Shaarli" msgstr "Installation de Shaarli"
#: application/front/controller/visitor/InstallController.php:83 #: application/front/controller/visitor/InstallController.php:85
#, php-format #, php-format
msgid "" msgid ""
"<pre>Sessions do not seem to work correctly on your server.<br>Make sure the " "<pre>Sessions do not seem to work correctly on your server.<br>Make sure the "
@ -559,14 +559,14 @@ msgstr ""
"des cookies. Nous vous recommandons d'accéder à votre serveur depuis son " "des cookies. Nous vous recommandons d'accéder à votre serveur depuis son "
"adresse IP ou un <em>Fully Qualified Domain Name</em>.<br>" "adresse IP ou un <em>Fully Qualified Domain Name</em>.<br>"
#: application/front/controller/visitor/InstallController.php:154 #: application/front/controller/visitor/InstallController.php:157
msgid "" msgid ""
"Shaarli is now configured. Please login and start shaaring your bookmarks!" "Shaarli is now configured. Please login and start shaaring your bookmarks!"
msgstr "" msgstr ""
"Shaarli est maintenant configuré. Vous pouvez vous connecter et commencez à " "Shaarli est maintenant configuré. Vous pouvez vous connecter et commencez à "
"shaare vos liens !" "shaare vos liens !"
#: application/front/controller/visitor/InstallController.php:168 #: application/front/controller/visitor/InstallController.php:171
msgid "Insufficient permissions:" msgid "Insufficient permissions:"
msgstr "Permissions insuffisantes :" msgstr "Permissions insuffisantes :"
@ -580,7 +580,7 @@ msgstr "Permissions insuffisantes :"
msgid "Login" msgid "Login"
msgstr "Connexion" msgstr "Connexion"
#: application/front/controller/visitor/LoginController.php:77 #: application/front/controller/visitor/LoginController.php:78
msgid "Wrong login/password." msgid "Wrong login/password."
msgstr "Nom d'utilisateur ou mot de passe incorrect(s)." msgstr "Nom d'utilisateur ou mot de passe incorrect(s)."
@ -620,7 +620,7 @@ msgstr ""
msgid "Wrong token." msgid "Wrong token."
msgstr "Jeton invalide." msgstr "Jeton invalide."
#: application/helper/ApplicationUtils.php:162 #: application/helper/ApplicationUtils.php:165
#, php-format #, php-format
msgid "" msgid ""
"Your PHP version is obsolete! Shaarli requires at least PHP %s, and thus " "Your PHP version is obsolete! Shaarli requires at least PHP %s, and thus "
@ -631,52 +631,60 @@ msgstr ""
"peut donc pas fonctionner. Votre version de PHP a des failles de sécurités " "peut donc pas fonctionner. Votre version de PHP a des failles de sécurités "
"connues et devrait être mise à jour au plus tôt." "connues et devrait être mise à jour au plus tôt."
#: application/helper/ApplicationUtils.php:195 #: application/helper/ApplicationUtils.php:200
#: application/helper/ApplicationUtils.php:215 #: application/helper/ApplicationUtils.php:220
msgid "directory is not readable" msgid "directory is not readable"
msgstr "le répertoire n'est pas accessible en lecture" msgstr "le répertoire n'est pas accessible en lecture"
#: application/helper/ApplicationUtils.php:218 #: application/helper/ApplicationUtils.php:223
msgid "directory is not writable" msgid "directory is not writable"
msgstr "le répertoire n'est pas accessible en écriture" msgstr "le répertoire n'est pas accessible en écriture"
#: application/helper/ApplicationUtils.php:240 #: application/helper/ApplicationUtils.php:247
msgid "file is not readable" msgid "file is not readable"
msgstr "le fichier n'est pas accessible en lecture" msgstr "le fichier n'est pas accessible en lecture"
#: application/helper/ApplicationUtils.php:243 #: application/helper/ApplicationUtils.php:250
msgid "file is not writable" msgid "file is not writable"
msgstr "le fichier n'est pas accessible en écriture" msgstr "le fichier n'est pas accessible en écriture"
#: application/helper/ApplicationUtils.php:277 #: application/helper/ApplicationUtils.php:260
msgid ""
"Lock can not be acquired on the datastore. You might encounter concurrent "
"access issues."
msgstr ""
"Le fichier datastore ne peut pas être verrouillé. Vous pourriez rencontrer "
"des problèmes d'accès concurrents."
#: application/helper/ApplicationUtils.php:293
msgid "Configuration parsing" msgid "Configuration parsing"
msgstr "Chargement de la configuration" msgstr "Chargement de la configuration"
#: application/helper/ApplicationUtils.php:278 #: application/helper/ApplicationUtils.php:294
msgid "Slim Framework (routing, etc.)" msgid "Slim Framework (routing, etc.)"
msgstr "Slim Framwork (routage, etc.)" msgstr "Slim Framwork (routage, etc.)"
#: application/helper/ApplicationUtils.php:279 #: application/helper/ApplicationUtils.php:295
msgid "Multibyte (Unicode) string support" msgid "Multibyte (Unicode) string support"
msgstr "Support des chaînes de caractère multibytes (Unicode)" msgstr "Support des chaînes de caractère multibytes (Unicode)"
#: application/helper/ApplicationUtils.php:280 #: application/helper/ApplicationUtils.php:296
msgid "Required to use thumbnails" msgid "Required to use thumbnails"
msgstr "Obligatoire pour utiliser les miniatures" msgstr "Obligatoire pour utiliser les miniatures"
#: application/helper/ApplicationUtils.php:281 #: application/helper/ApplicationUtils.php:297
msgid "Localized text sorting (e.g. e->è->f)" msgid "Localized text sorting (e.g. e->è->f)"
msgstr "Tri des textes traduits (ex : e->è->f)" msgstr "Tri des textes traduits (ex : e->è->f)"
#: application/helper/ApplicationUtils.php:282 #: application/helper/ApplicationUtils.php:298
msgid "Better retrieval of bookmark metadata and thumbnail" msgid "Better retrieval of bookmark metadata and thumbnail"
msgstr "Meilleure récupération des meta-données des marque-pages et minatures" msgstr "Meilleure récupération des meta-données des marque-pages et minatures"
#: application/helper/ApplicationUtils.php:283 #: application/helper/ApplicationUtils.php:299
msgid "Use the translation system in gettext mode" msgid "Use the translation system in gettext mode"
msgstr "Utiliser le système de traduction en mode gettext" msgstr "Utiliser le système de traduction en mode gettext"
#: application/helper/ApplicationUtils.php:284 #: application/helper/ApplicationUtils.php:300
msgid "Login using LDAP server" msgid "Login using LDAP server"
msgstr "Authentification via un serveur LDAP" msgstr "Authentification via un serveur LDAP"
@ -750,7 +758,7 @@ msgstr ""
msgid "Couldn't retrieve updater class methods." msgid "Couldn't retrieve updater class methods."
msgstr "Impossible de récupérer les méthodes de la classe Updater." msgstr "Impossible de récupérer les méthodes de la classe Updater."
#: application/legacy/LegacyUpdater.php:538 #: application/legacy/LegacyUpdater.php:540
msgid "<a href=\"./admin/thumbnails\">" msgid "<a href=\"./admin/thumbnails\">"
msgstr "<a href=\"./admin/thumbnails\">" msgstr "<a href=\"./admin/thumbnails\">"
@ -776,11 +784,11 @@ msgstr ""
"a été importé avec succès en %d secondes : %d liens importés, %d liens " "a été importé avec succès en %d secondes : %d liens importés, %d liens "
"écrasés, %d liens ignorés." "écrasés, %d liens ignorés."
#: application/plugin/PluginManager.php:124 #: application/plugin/PluginManager.php:125
msgid " [plugin incompatibility]: " msgid " [plugin incompatibility]: "
msgstr " [incompatibilité de l'extension] : " msgstr " [incompatibilité de l'extension] : "
#: application/plugin/exception/PluginFileNotFoundException.php:21 #: application/plugin/exception/PluginFileNotFoundException.php:22
#, php-format #, php-format
msgid "Plugin \"%s\" files not found." msgid "Plugin \"%s\" files not found."
msgstr "Les fichiers de l'extension \"%s\" sont introuvables." msgstr "Les fichiers de l'extension \"%s\" sont introuvables."
@ -794,7 +802,7 @@ msgstr "Impossible de purger %s : le répertoire n'existe pas"
msgid "An error occurred while running the update " msgid "An error occurred while running the update "
msgstr "Une erreur s'est produite lors de l'exécution de la mise à jour " msgstr "Une erreur s'est produite lors de l'exécution de la mise à jour "
#: index.php:80 #: index.php:81
msgid "Shared bookmarks on " msgid "Shared bookmarks on "
msgstr "Liens partagés sur " msgstr "Liens partagés sur "
@ -811,11 +819,11 @@ msgstr "Shaare"
msgid "Adds the addlink input on the linklist page." msgid "Adds the addlink input on the linklist page."
msgstr "Ajoute le formulaire d'ajout de liens sur la page principale." msgstr "Ajoute le formulaire d'ajout de liens sur la page principale."
#: plugins/archiveorg/archiveorg.php:28 #: plugins/archiveorg/archiveorg.php:29
msgid "View on archive.org" msgid "View on archive.org"
msgstr "Voir sur archive.org" msgstr "Voir sur archive.org"
#: plugins/archiveorg/archiveorg.php:41 #: plugins/archiveorg/archiveorg.php:42
msgid "For each link, add an Archive.org icon." msgid "For each link, add an Archive.org icon."
msgstr "Pour chaque lien, ajoute une icône pour Archive.org." msgstr "Pour chaque lien, ajoute une icône pour Archive.org."
@ -845,7 +853,7 @@ msgstr "Couleur de fond (gris léger)"
msgid "Dark main color (e.g. visited links)" msgid "Dark main color (e.g. visited links)"
msgstr "Couleur principale sombre (ex : les liens visités)" msgstr "Couleur principale sombre (ex : les liens visités)"
#: plugins/demo_plugin/demo_plugin.php:477 #: plugins/demo_plugin/demo_plugin.php:478
msgid "" msgid ""
"A demo plugin covering all use cases for template designers and plugin " "A demo plugin covering all use cases for template designers and plugin "
"developers." "developers."
@ -853,11 +861,11 @@ msgstr ""
"Une extension de démonstration couvrant tous les cas d'utilisation pour les " "Une extension de démonstration couvrant tous les cas d'utilisation pour les "
"designers de thèmes et les développeurs d'extensions." "designers de thèmes et les développeurs d'extensions."
#: plugins/demo_plugin/demo_plugin.php:478 #: plugins/demo_plugin/demo_plugin.php:479
msgid "This is a parameter dedicated to the demo plugin. It'll be suffixed." msgid "This is a parameter dedicated to the demo plugin. It'll be suffixed."
msgstr "Ceci est un paramètre dédié au plugin de démo. Il sera suffixé." msgstr "Ceci est un paramètre dédié au plugin de démo. Il sera suffixé."
#: plugins/demo_plugin/demo_plugin.php:479 #: plugins/demo_plugin/demo_plugin.php:480
msgid "Other demo parameter" msgid "Other demo parameter"
msgstr "Un autre paramètre de démo" msgstr "Un autre paramètre de démo"
@ -879,7 +887,7 @@ msgstr ""
msgid "Isso server URL (without 'http://')" msgid "Isso server URL (without 'http://')"
msgstr "URL du serveur Isso (sans 'http://')" msgstr "URL du serveur Isso (sans 'http://')"
#: plugins/piwik/piwik.php:23 #: plugins/piwik/piwik.php:24
msgid "" msgid ""
"Piwik plugin error: Please define PIWIK_URL and PIWIK_SITEID in the plugin " "Piwik plugin error: Please define PIWIK_URL and PIWIK_SITEID in the plugin "
"administration page." "administration page."
@ -887,27 +895,27 @@ msgstr ""
"Erreur de l'extension Piwik : Merci de définir les paramètres PIWIK_URL et " "Erreur de l'extension Piwik : Merci de définir les paramètres PIWIK_URL et "
"PIWIK_SITEID dans la page d'administration des extensions." "PIWIK_SITEID dans la page d'administration des extensions."
#: plugins/piwik/piwik.php:72 #: plugins/piwik/piwik.php:73
msgid "A plugin that adds Piwik tracking code to Shaarli pages." msgid "A plugin that adds Piwik tracking code to Shaarli pages."
msgstr "Ajoute le code de traçage de Piwik sur les pages de Shaarli." msgstr "Ajoute le code de traçage de Piwik sur les pages de Shaarli."
#: plugins/piwik/piwik.php:73 #: plugins/piwik/piwik.php:74
msgid "Piwik URL" msgid "Piwik URL"
msgstr "URL de Piwik" msgstr "URL de Piwik"
#: plugins/piwik/piwik.php:74 #: plugins/piwik/piwik.php:75
msgid "Piwik site ID" msgid "Piwik site ID"
msgstr "Site ID de Piwik" msgstr "Site ID de Piwik"
#: plugins/playvideos/playvideos.php:25 #: plugins/playvideos/playvideos.php:26
msgid "Video player" msgid "Video player"
msgstr "Lecteur vidéo" msgstr "Lecteur vidéo"
#: plugins/playvideos/playvideos.php:28 #: plugins/playvideos/playvideos.php:29
msgid "Play Videos" msgid "Play Videos"
msgstr "Jouer les vidéos" msgstr "Jouer les vidéos"
#: plugins/playvideos/playvideos.php:59 #: plugins/playvideos/playvideos.php:60
msgid "Add a button in the toolbar allowing to watch all videos." msgid "Add a button in the toolbar allowing to watch all videos."
msgstr "" msgstr ""
"Ajoute un bouton dans la barre de menu pour regarder toutes les vidéos." "Ajoute un bouton dans la barre de menu pour regarder toutes les vidéos."
@ -935,11 +943,11 @@ msgstr "Mauvaise réponse du hub %s"
msgid "Enable PubSubHubbub feed publishing." msgid "Enable PubSubHubbub feed publishing."
msgstr "Active la publication de flux vers PubSubHubbub." msgstr "Active la publication de flux vers PubSubHubbub."
#: plugins/qrcode/qrcode.php:73 plugins/wallabag/wallabag.php:71 #: plugins/qrcode/qrcode.php:74 plugins/wallabag/wallabag.php:72
msgid "For each link, add a QRCode icon." msgid "For each link, add a QRCode icon."
msgstr "Pour chaque lien, ajouter une icône de QRCode." msgstr "Pour chaque lien, ajouter une icône de QRCode."
#: plugins/wallabag/wallabag.php:21 #: plugins/wallabag/wallabag.php:22
msgid "" msgid ""
"Wallabag plugin error: Please define the \"WALLABAG_URL\" setting in the " "Wallabag plugin error: Please define the \"WALLABAG_URL\" setting in the "
"plugin administration page." "plugin administration page."
@ -947,15 +955,15 @@ msgstr ""
"Erreur de l'extension Wallabag : Merci de définir le paramètre « " "Erreur de l'extension Wallabag : Merci de définir le paramètre « "
"WALLABAG_URL » dans la page d'administration des extensions." "WALLABAG_URL » dans la page d'administration des extensions."
#: plugins/wallabag/wallabag.php:48 #: plugins/wallabag/wallabag.php:49
msgid "Save to wallabag" msgid "Save to wallabag"
msgstr "Sauvegarder dans Wallabag" msgstr "Sauvegarder dans Wallabag"
#: plugins/wallabag/wallabag.php:72 #: plugins/wallabag/wallabag.php:73
msgid "Wallabag API URL" msgid "Wallabag API URL"
msgstr "URL de l'API Wallabag" msgstr "URL de l'API Wallabag"
#: plugins/wallabag/wallabag.php:73 #: plugins/wallabag/wallabag.php:74
msgid "Wallabag API version (1 or 2)" msgid "Wallabag API version (1 or 2)"
msgstr "Version de l'API Wallabag (1 ou 2)" msgstr "Version de l'API Wallabag (1 ou 2)"