aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-07-17 13:13:26 +0200
committerArthurHoaro <arthur@hoa.ro>2018-07-17 13:16:50 +0200
commit7b4fea0e39be9e74e9aef13e73af9bbd2b1a6397 (patch)
treea9c5071ed1f6830adcbf10668a2f21e044276842
parentb302b3c584b84f22f0e6f187b072180ecbacdfab (diff)
downloadShaarli-7b4fea0e39be9e74e9aef13e73af9bbd2b1a6397.tar.gz
Shaarli-7b4fea0e39be9e74e9aef13e73af9bbd2b1a6397.tar.zst
Shaarli-7b4fea0e39be9e74e9aef13e73af9bbd2b1a6397.zip
Bunch of improvement for thumbnails integration:
- add a default thumb size value (125x90px) - improve private vertical bar visual, especially with thumbnails - translations - add a sync thumbs button in tool and empty picwall page - fixes WT download mode in JSON config
-rw-r--r--application/Updater.php2
-rw-r--r--application/config/ConfigManager.php3
-rw-r--r--assets/default/scss/shaarli.scss23
-rw-r--r--composer.lock10
-rw-r--r--inc/languages/fr/LC_MESSAGES/shaarli.po217
-rw-r--r--inc/web-thumbnailer.json4
-rw-r--r--index.php9
-rw-r--r--tests/Updater/UpdaterTest.php2
-rw-r--r--tpl/default/configure.html2
-rw-r--r--tpl/default/linklist.html2
-rw-r--r--tpl/default/picwall.html8
-rw-r--r--tpl/default/tools.html8
12 files changed, 178 insertions, 112 deletions
diff --git a/application/Updater.php b/application/Updater.php
index 2a4c807c..c2aa1568 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -511,7 +511,7 @@ class Updater
511 511
512 if ($thumbnailsEnabled) { 512 if ($thumbnailsEnabled) {
513 $this->session['warnings'][] = t( 513 $this->session['warnings'][] = t(
514 'You have enabled thumbnails. <a href="?do=thumbs_update">Please synchonize them</a>.' 514 'You have enabled or changed thumbnails mode. <a href="?do=thumbs_update">Please synchronize them</a>.'
515 ); 515 );
516 } 516 }
517 517
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index 96e2e912..32aaea48 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -384,6 +384,9 @@ class ConfigManager
384 $this->setEmpty('redirector.url', ''); 384 $this->setEmpty('redirector.url', '');
385 $this->setEmpty('redirector.encode_url', true); 385 $this->setEmpty('redirector.encode_url', true);
386 386
387 $this->setEmpty('thumbnails.width', '125');
388 $this->setEmpty('thumbnails.height', '90');
389
387 $this->setEmpty('translation.language', 'auto'); 390 $this->setEmpty('translation.language', 'auto');
388 $this->setEmpty('translation.mode', 'php'); 391 $this->setEmpty('translation.mode', 'php');
389 $this->setEmpty('translation.extensions', []); 392 $this->setEmpty('translation.extensions', []);
diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss
index 6a8a8bc7..6b286f1e 100644
--- a/assets/default/scss/shaarli.scss
+++ b/assets/default/scss/shaarli.scss
@@ -636,23 +636,22 @@ body,
636} 636}
637 637
638.linklist-item { 638.linklist-item {
639 position: relative;
639 margin: 0 0 10px; 640 margin: 0 0 10px;
640 box-shadow: 1px 1px 3px $light-grey; 641 box-shadow: 1px 1px 3px $light-grey;
641 background: $almost-white; 642 background: $almost-white;
642 643
643 &.private { 644 &.private {
644 .linklist-item-title { 645 &::before {
645 &::before { 646 display: block;
646 @extend %private-border; 647 position: absolute;
647 margin-top: 3px; 648 top: 0;
648 } 649 left: 0;
649 } 650 z-index: 1;
650 651 background: $orange;
651 .linklist-item-description { 652 width: 2px;
652 &::before { 653 height: 100%;
653 @extend %private-border; 654 content: '';
654 height: 100%;
655 }
656 } 655 }
657 } 656 }
658} 657}
diff --git a/composer.lock b/composer.lock
index 5ba4bdce..08e915cf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "arthurhoaro/web-thumbnailer", 10 "name": "arthurhoaro/web-thumbnailer",
11 "version": "v1.2.0", 11 "version": "v1.2.1",
12 "source": { 12 "source": {
13 "type": "git", 13 "type": "git",
14 "url": "https://github.com/ArthurHoaro/web-thumbnailer.git", 14 "url": "https://github.com/ArthurHoaro/web-thumbnailer.git",
15 "reference": "d6bc683c7081ee6a0bdedc317ad88a9d9cddc4d6" 15 "reference": "a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1"
16 }, 16 },
17 "dist": { 17 "dist": {
18 "type": "zip", 18 "type": "zip",
19 "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/d6bc683c7081ee6a0bdedc317ad88a9d9cddc4d6", 19 "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1",
20 "reference": "d6bc683c7081ee6a0bdedc317ad88a9d9cddc4d6", 20 "reference": "a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1",
21 "shasum": "" 21 "shasum": ""
22 }, 22 },
23 "require": { 23 "require": {
@@ -52,7 +52,7 @@
52 } 52 }
53 ], 53 ],
54 "description": "PHP library which will retrieve a thumbnail for any given URL", 54 "description": "PHP library which will retrieve a thumbnail for any given URL",
55 "time": "2018-06-30T12:12:07+00:00" 55 "time": "2018-07-17T10:21:14+00:00"
56 }, 56 },
57 { 57 {
58 "name": "container-interop/container-interop", 58 "name": "container-interop/container-interop",
diff --git a/inc/languages/fr/LC_MESSAGES/shaarli.po b/inc/languages/fr/LC_MESSAGES/shaarli.po
index f5189478..155eb52e 100644
--- a/inc/languages/fr/LC_MESSAGES/shaarli.po
+++ b/inc/languages/fr/LC_MESSAGES/shaarli.po
@@ -1,15 +1,15 @@
1msgid "" 1msgid ""
2msgstr "" 2msgstr ""
3"Project-Id-Version: Shaarli\n" 3"Project-Id-Version: Shaarli\n"
4"POT-Creation-Date: 2018-05-05 12:48+0200\n" 4"POT-Creation-Date: 2018-07-17 13:04+0200\n"
5"PO-Revision-Date: 2018-05-05 12:49+0200\n" 5"PO-Revision-Date: 2018-07-17 13:07+0200\n"
6"Last-Translator: \n" 6"Last-Translator: \n"
7"Language-Team: Shaarli\n" 7"Language-Team: Shaarli\n"
8"Language: fr_FR\n" 8"Language: fr_FR\n"
9"MIME-Version: 1.0\n" 9"MIME-Version: 1.0\n"
10"Content-Type: text/plain; charset=UTF-8\n" 10"Content-Type: text/plain; charset=UTF-8\n"
11"Content-Transfer-Encoding: 8bit\n" 11"Content-Transfer-Encoding: 8bit\n"
12"X-Generator: Poedit 2.0.6\n" 12"X-Generator: Poedit 2.0.9\n"
13"X-Poedit-Basepath: ../../../..\n" 13"X-Poedit-Basepath: ../../../..\n"
14"Plural-Forms: nplurals=2; plural=(n > 1);\n" 14"Plural-Forms: nplurals=2; plural=(n > 1);\n"
15"X-Poedit-SourceCharset: UTF-8\n" 15"X-Poedit-SourceCharset: UTF-8\n"
@@ -167,11 +167,11 @@ msgstr ""
167"a été importé avec succès en %d secondes : %d liens importés, %d liens " 167"a été importé avec succès en %d secondes : %d liens importés, %d liens "
168"écrasés, %d liens ignorés." 168"écrasés, %d liens ignorés."
169 169
170#: application/PageBuilder.php:173 170#: application/PageBuilder.php:200
171msgid "The page you are trying to reach does not exist or has been deleted." 171msgid "The page you are trying to reach does not exist or has been deleted."
172msgstr "La page que vous essayez de consulter n'existe pas ou a été supprimée." 172msgstr "La page que vous essayez de consulter n'existe pas ou a été supprimée."
173 173
174#: application/PageBuilder.php:175 174#: application/PageBuilder.php:202
175msgid "404 Not Found" 175msgid "404 Not Found"
176msgstr "404 Introuvable" 176msgstr "404 Introuvable"
177 177
@@ -180,7 +180,7 @@ msgstr "404 Introuvable"
180msgid "Plugin \"%s\" files not found." 180msgid "Plugin \"%s\" files not found."
181msgstr "Les fichiers de l'extension \"%s\" sont introuvables." 181msgstr "Les fichiers de l'extension \"%s\" sont introuvables."
182 182
183#: application/Thumbnailer.php:40 183#: application/Thumbnailer.php:61
184msgid "" 184msgid ""
185"php-gd extension must be loaded to use thumbnails. Thumbnails are now " 185"php-gd extension must be loaded to use thumbnails. Thumbnails are now "
186"disabled. Please reload the page." 186"disabled. Please reload the page."
@@ -188,21 +188,29 @@ msgstr ""
188"php-gd extension must be loaded to use thumbnails. Thumbnails are now " 188"php-gd extension must be loaded to use thumbnails. Thumbnails are now "
189"disabled. Please reload the page." 189"disabled. Please reload the page."
190 190
191#: application/Updater.php:76 191#: application/Updater.php:86
192msgid "Couldn't retrieve Updater class methods." 192msgid "Couldn't retrieve Updater class methods."
193msgstr "Impossible de récupérer les méthodes de la classe Updater." 193msgstr "Impossible de récupérer les méthodes de la classe Updater."
194 194
195#: application/Updater.php:544 195#: application/Updater.php:514 index.php:1023
196msgid ""
197"You have enabled or changed thumbnails mode. <a href=\"?do=thumbs_update"
198"\">Please synchronize them</a>."
199msgstr ""
200"Vous avez activé ou changé le mode de miniatures. <a href=\"?do=thumbs_update"
201"\">Merci de les synchroniser</a>."
202
203#: application/Updater.php:566
196msgid "An error occurred while running the update " 204msgid "An error occurred while running the update "
197msgstr "Une erreur s'est produite lors de l'exécution de la mise à jour " 205msgstr "Une erreur s'est produite lors de l'exécution de la mise à jour "
198 206
199#: application/Updater.php:584 207#: application/Updater.php:606
200msgid "Updates file path is not set, can't write updates." 208msgid "Updates file path is not set, can't write updates."
201msgstr "" 209msgstr ""
202"Le chemin vers le fichier de mise à jour n'est pas défini, impossible " 210"Le chemin vers le fichier de mise à jour n'est pas défini, impossible "
203"d'écrire les mises à jour." 211"d'écrire les mises à jour."
204 212
205#: application/Updater.php:589 213#: application/Updater.php:611
206msgid "Unable to write updates in " 214msgid "Unable to write updates in "
207msgstr "Impossible d'écrire les mises à jour dans " 215msgstr "Impossible d'écrire les mises à jour dans "
208 216
@@ -272,20 +280,20 @@ msgstr "Liens partagés sur "
272msgid "Insufficient permissions:" 280msgid "Insufficient permissions:"
273msgstr "Permissions insuffisantes :" 281msgstr "Permissions insuffisantes :"
274 282
275#: index.php:304 283#: index.php:201
276msgid "I said: NO. You are banned for the moment. Go away." 284msgid "I said: NO. You are banned for the moment. Go away."
277msgstr "NON. Vous êtes banni pour le moment. Revenez plus tard." 285msgstr "NON. Vous êtes banni pour le moment. Revenez plus tard."
278 286
279#: index.php:369 287#: index.php:273
280msgid "Wrong login/password." 288msgid "Wrong login/password."
281msgstr "Nom d'utilisateur ou mot de passe incorrects." 289msgstr "Nom d'utilisateur ou mot de passe incorrects."
282 290
283#: index.php:577 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:46 291#: index.php:483 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:46
284#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:46 292#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:46
285msgid "Daily" 293msgid "Daily"
286msgstr "Quotidien" 294msgstr "Quotidien"
287 295
288#: index.php:682 tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28 296#: index.php:589 tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28
289#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44 297#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44
290#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:75 298#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:75
291#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:99 299#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:99
@@ -294,103 +302,103 @@ msgstr "Quotidien"
294msgid "Login" 302msgid "Login"
295msgstr "Connexion" 303msgstr "Connexion"
296 304
297#: index.php:750 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41 305#: index.php:606 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41
298#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:41 306#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:41
299msgid "Picture wall" 307msgid "Picture wall"
300msgstr "Mur d'images" 308msgstr "Mur d'images"
301 309
302#: index.php:798 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36 310#: index.php:683 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
303#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:36 311#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:36
304#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19 312#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
305msgid "Tag cloud" 313msgid "Tag cloud"
306msgstr "Nuage de tags" 314msgstr "Nuage de tags"
307 315
308#: index.php:831 tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19 316#: index.php:716 tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
309msgid "Tag list" 317msgid "Tag list"
310msgstr "Liste des tags" 318msgstr "Liste des tags"
311 319
312#: index.php:1056 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31 320#: index.php:941 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31
313#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:31 321#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:31
314msgid "Tools" 322msgid "Tools"
315msgstr "Outils" 323msgstr "Outils"
316 324
317#: index.php:1065 325#: index.php:950
318msgid "You are not supposed to change a password on an Open Shaarli." 326msgid "You are not supposed to change a password on an Open Shaarli."
319msgstr "" 327msgstr ""
320"Vous n'êtes pas censé modifier le mot de passe d'un Shaarli en mode ouvert." 328"Vous n'êtes pas censé modifier le mot de passe d'un Shaarli en mode ouvert."
321 329
322#: index.php:1070 index.php:1112 index.php:1190 index.php:1221 index.php:1326 330#: index.php:955 index.php:997 index.php:1085 index.php:1116 index.php:1221
323msgid "Wrong token." 331msgid "Wrong token."
324msgstr "Jeton invalide." 332msgstr "Jeton invalide."
325 333
326#: index.php:1075 334#: index.php:960
327msgid "The old password is not correct." 335msgid "The old password is not correct."
328msgstr "L'ancien mot de passe est incorrect." 336msgstr "L'ancien mot de passe est incorrect."
329 337
330#: index.php:1095 338#: index.php:980
331msgid "Your password has been changed" 339msgid "Your password has been changed"
332msgstr "Votre mot de passe a été modifié" 340msgstr "Votre mot de passe a été modifié"
333 341
334#: index.php:1100 342#: index.php:985
335#: tmp/changepassword.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13 343#: tmp/changepassword.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
336#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:29 344#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:29
337msgid "Change password" 345msgid "Change password"
338msgstr "Modification du mot de passe" 346msgstr "Modification du mot de passe"
339 347
340#: index.php:1149 348#: index.php:1043
341msgid "Configuration was saved." 349msgid "Configuration was saved."
342msgstr "La configuration a été sauvegardé." 350msgstr "La configuration a été sauvegardé."
343 351
344#: index.php:1173 tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24 352#: index.php:1068 tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24
345msgid "Configure" 353msgid "Configure"
346msgstr "Configurer" 354msgstr "Configurer"
347 355
348#: index.php:1184 tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13 356#: index.php:1079 tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
349#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36 357#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
350msgid "Manage tags" 358msgid "Manage tags"
351msgstr "Gérer les tags" 359msgstr "Gérer les tags"
352 360
353#: index.php:1202 361#: index.php:1097
354#, php-format 362#, php-format
355msgid "The tag was removed from %d link." 363msgid "The tag was removed from %d link."
356msgid_plural "The tag was removed from %d links." 364msgid_plural "The tag was removed from %d links."
357msgstr[0] "Le tag a été supprimé de %d lien." 365msgstr[0] "Le tag a été supprimé de %d lien."
358msgstr[1] "Le tag a été supprimé de %d liens." 366msgstr[1] "Le tag a été supprimé de %d liens."
359 367
360#: index.php:1203 368#: index.php:1098
361#, php-format 369#, php-format
362msgid "The tag was renamed in %d link." 370msgid "The tag was renamed in %d link."
363msgid_plural "The tag was renamed in %d links." 371msgid_plural "The tag was renamed in %d links."
364msgstr[0] "Le tag a été renommé dans %d lien." 372msgstr[0] "Le tag a été renommé dans %d lien."
365msgstr[1] "Le tag a été renommé dans %d liens." 373msgstr[1] "Le tag a été renommé dans %d liens."
366 374
367#: index.php:1211 tmp/addlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13 375#: index.php:1106 tmp/addlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
368msgid "Shaare a new link" 376msgid "Shaare a new link"
369msgstr "Partager un nouveau lien" 377msgstr "Partager un nouveau lien"
370 378
371#: index.php:1386 tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169 379#: index.php:1281 tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169
372msgid "Edit" 380msgid "Edit"
373msgstr "Modifier" 381msgstr "Modifier"
374 382
375#: index.php:1386 index.php:1456 383#: index.php:1281 index.php:1351
376#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26 384#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26
377#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:26 385#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:26
378msgid "Shaare" 386msgid "Shaare"
379msgstr "Shaare" 387msgstr "Shaare"
380 388
381#: index.php:1425 389#: index.php:1320
382msgid "Note: " 390msgid "Note: "
383msgstr "Note : " 391msgstr "Note : "
384 392
385#: index.php:1465 tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:65 393#: index.php:1360 tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:65
386msgid "Export" 394msgid "Export"
387msgstr "Exporter" 395msgstr "Exporter"
388 396
389#: index.php:1527 tmp/import.b91ef64efc3688266305ea9b42e5017e.rtpl.php:83 397#: index.php:1422 tmp/import.b91ef64efc3688266305ea9b42e5017e.rtpl.php:83
390msgid "Import" 398msgid "Import"
391msgstr "Importer" 399msgstr "Importer"
392 400
393#: index.php:1537 401#: index.php:1432
394#, php-format 402#, php-format
395msgid "" 403msgid ""
396"The file you are trying to upload is probably bigger than what this " 404"The file you are trying to upload is probably bigger than what this "
@@ -400,16 +408,20 @@ msgstr ""
400"le serveur web peut accepter (%s). Merci de l'envoyer en parties plus " 408"le serveur web peut accepter (%s). Merci de l'envoyer en parties plus "
401"légères." 409"légères."
402 410
403#: index.php:1576 tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26 411#: index.php:1471 tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26
404#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:22 412#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:22
405msgid "Plugin administration" 413msgid "Plugin administration"
406msgstr "Administration des extensions" 414msgstr "Administration des extensions"
407 415
408#: index.php:1761 416#: index.php:1523 tmp/thumbnails.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
417msgid "Thumbnails update"
418msgstr "Mise à jour des miniatures"
419
420#: index.php:1695
409msgid "Search: " 421msgid "Search: "
410msgstr "Recherche : " 422msgstr "Recherche : "
411 423
412#: index.php:1800 424#: index.php:1735
413#, php-format 425#, php-format
414msgid "" 426msgid ""
415"<pre>Sessions do not seem to work correctly on your server.<br>Make sure the " 427"<pre>Sessions do not seem to work correctly on your server.<br>Make sure the "
@@ -428,7 +440,7 @@ msgstr ""
428"cookies. Nous vous recommandons d'accéder à votre serveur depuis son adresse " 440"cookies. Nous vous recommandons d'accéder à votre serveur depuis son adresse "
429"IP ou un <em>Fully Qualified Domain Name</em>.<br>" 441"IP ou un <em>Fully Qualified Domain Name</em>.<br>"
430 442
431#: index.php:1810 443#: index.php:1745
432msgid "Click to try again." 444msgid "Click to try again."
433msgstr "Cliquer ici pour réessayer." 445msgstr "Cliquer ici pour réessayer."
434 446
@@ -478,19 +490,19 @@ msgstr ""
478msgid "Isso server URL (without 'http://')" 490msgid "Isso server URL (without 'http://')"
479msgstr "URL du serveur Isso (sans 'http://')" 491msgstr "URL du serveur Isso (sans 'http://')"
480 492
481#: plugins/markdown/markdown.php:158 493#: plugins/markdown/markdown.php:161
482msgid "Description will be rendered with" 494msgid "Description will be rendered with"
483msgstr "La description sera générée avec" 495msgstr "La description sera générée avec"
484 496
485#: plugins/markdown/markdown.php:159 497#: plugins/markdown/markdown.php:162
486msgid "Markdown syntax documentation" 498msgid "Markdown syntax documentation"
487msgstr "Documentation sur la syntaxe Markdown" 499msgstr "Documentation sur la syntaxe Markdown"
488 500
489#: plugins/markdown/markdown.php:160 501#: plugins/markdown/markdown.php:163
490msgid "Markdown syntax" 502msgid "Markdown syntax"
491msgstr "la syntaxe Markdown" 503msgstr "la syntaxe Markdown"
492 504
493#: plugins/markdown/markdown.php:339 505#: plugins/markdown/markdown.php:347
494msgid "" 506msgid ""
495"Render shaare description with Markdown syntax.<br><strong>Warning</" 507"Render shaare description with Markdown syntax.<br><strong>Warning</"
496"strong>:\n" 508"strong>:\n"
@@ -751,30 +763,31 @@ msgstr "Clé d'API secrète"
751msgid "Enable thumbnails" 763msgid "Enable thumbnails"
752msgstr "Activer les miniatures" 764msgstr "Activer les miniatures"
753 765
754#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:279 766#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:281
755msgid "Warning: "
756msgstr "Attention : "
757
758#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:283
759msgid "It's recommended to visit the picture wall after enabling this feature."
760msgstr ""
761"Il est recommandé de visiter le Mur d'images après avoir activé cette "
762"fonctionnalité."
763
764#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:285
765msgid ""
766"If you have a large database, the first retrieval may take a few minutes."
767msgstr ""
768"Si vous avez beaucoup de liens, la première récupération peut prendre "
769"plusieurs minutes."
770
771#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:289
772msgid "You need to enable the extension <code>php-gd</code> to use thumbnails." 767msgid "You need to enable the extension <code>php-gd</code> to use thumbnails."
773msgstr "" 768msgstr ""
774"Vous devez activer l'extension <code>php-gd</code> pour utiliser les " 769"Vous devez activer l'extension <code>php-gd</code> pour utiliser les "
775"miniatures." 770"miniatures."
776 771
777#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:305 772#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:285
773#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:56
774msgid "Synchronize thumbnails"
775msgstr "Synchroniser les miniatures"
776
777#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:296
778#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31
779msgid "All"
780msgstr "Tous"
781
782#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:300
783msgid "Only common media hosts"
784msgstr "Seulement les hébergeurs de média connus"
785
786#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:304
787msgid "None"
788msgstr "Aucune"
789
790#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:312
778#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:72 791#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:72
779#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139 792#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139
780#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:199 793#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:199
@@ -851,10 +864,6 @@ msgstr "Exporter les données"
851msgid "Selection" 864msgid "Selection"
852msgstr "Choisir" 865msgstr "Choisir"
853 866
854#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31
855msgid "All"
856msgstr "Tous"
857
858#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41 867#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41
859msgid "Public" 868msgid "Public"
860msgstr "Publics" 869msgstr "Publics"
@@ -1122,11 +1131,23 @@ msgid "Picture wall unavailable (thumbnails are disabled)."
1122msgstr "" 1131msgstr ""
1123"Le mur d'images n'est pas disponible (les miniatures sont désactivées)." 1132"Le mur d'images n'est pas disponible (les miniatures sont désactivées)."
1124 1133
1125#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:25 1134#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24
1135#, fuzzy
1136#| msgid ""
1137#| "You don't have any cached thumbnail. Try to <a href=\"?do=thumbs_update"
1138#| "\">synchronize them</a>."
1139msgid ""
1140"There is no cached thumbnail. Try to <a href=\"?do=thumbs_update"
1141"\">synchronize them</a>."
1142msgstr ""
1143"Il n'y a aucune miniature en cache. Essayer de <a href=\"?do=thumbs_update"
1144"\">les synchroniser</a>."
1145
1146#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
1126msgid "Picture Wall" 1147msgid "Picture Wall"
1127msgstr "Mur d'images" 1148msgstr "Mur d'images"
1128 1149
1129#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:25 1150#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
1130msgid "pics" 1151msgid "pics"
1131msgstr "images" 1152msgstr "images"
1132 1153
@@ -1268,7 +1289,11 @@ msgstr ""
1268msgid "Export database" 1289msgid "Export database"
1269msgstr "Exporter les données" 1290msgstr "Exporter les données"
1270 1291
1271#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:71 1292#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:55
1293msgid "Synchronize all link thumbnails"
1294msgstr "Synchroniser toutes les miniatures"
1295
1296#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:81
1272msgid "" 1297msgid ""
1273"Drag one of these button to your bookmarks toolbar or right-click it and " 1298"Drag one of these button to your bookmarks toolbar or right-click it and "
1274"\"Bookmark This Link\"" 1299"\"Bookmark This Link\""
@@ -1276,13 +1301,13 @@ msgstr ""
1276"Glisser un de ces bouttons dans votre barre de favoris ou cliquer droit " 1301"Glisser un de ces bouttons dans votre barre de favoris ou cliquer droit "
1277"dessus et « Ajouter aux favoris »" 1302"dessus et « Ajouter aux favoris »"
1278 1303
1279#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:72 1304#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:82
1280msgid "then click on the bookmarklet in any page you want to share." 1305msgid "then click on the bookmarklet in any page you want to share."
1281msgstr "" 1306msgstr ""
1282"puis cliquer sur le marque page depuis un site que vous souhaitez partager." 1307"puis cliquer sur le marque page depuis un site que vous souhaitez partager."
1283 1308
1284#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:76 1309#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:86
1285#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:100 1310#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:110
1286msgid "" 1311msgid ""
1287"Drag this link to your bookmarks toolbar or right-click it and Bookmark This " 1312"Drag this link to your bookmarks toolbar or right-click it and Bookmark This "
1288"Link" 1313"Link"
@@ -1290,31 +1315,31 @@ msgstr ""
1290"Glisser ce lien dans votre barre de favoris ou cliquer droit dessus et « " 1315"Glisser ce lien dans votre barre de favoris ou cliquer droit dessus et « "
1291"Ajouter aux favoris »" 1316"Ajouter aux favoris »"
1292 1317
1293#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:77 1318#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:87
1294msgid "then click ✚Shaare link button in any page you want to share" 1319msgid "then click ✚Shaare link button in any page you want to share"
1295msgstr "puis cliquer sur ✚Shaare depuis un site que vous souhaitez partager" 1320msgstr "puis cliquer sur ✚Shaare depuis un site que vous souhaitez partager"
1296 1321
1297#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:86 1322#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:96
1298#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:108 1323#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:118
1299msgid "The selected text is too long, it will be truncated." 1324msgid "The selected text is too long, it will be truncated."
1300msgstr "Le texte sélectionné est trop long, il sera tronqué." 1325msgstr "Le texte sélectionné est trop long, il sera tronqué."
1301 1326
1302#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:96 1327#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:106
1303msgid "Shaare link" 1328msgid "Shaare link"
1304msgstr "Shaare" 1329msgstr "Shaare"
1305 1330
1306#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:101 1331#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:111
1307msgid "" 1332msgid ""
1308"Then click ✚Add Note button anytime to start composing a private Note (text " 1333"Then click ✚Add Note button anytime to start composing a private Note (text "
1309"post) to your Shaarli" 1334"post) to your Shaarli"
1310msgstr "" 1335msgstr ""
1311"Puis cliquer sur ✚Add Note pour commencer à rédiger une Note sur Shaarli" 1336"Puis cliquer sur ✚Add Note pour commencer à rédiger une Note sur Shaarli"
1312 1337
1313#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:117 1338#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:127
1314msgid "Add Note" 1339msgid "Add Note"
1315msgstr "Ajouter une Note" 1340msgstr "Ajouter une Note"
1316 1341
1317#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:129 1342#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139
1318msgid "" 1343msgid ""
1319"You need to browse your Shaarli over <strong>HTTPS</strong> to use this " 1344"You need to browse your Shaarli over <strong>HTTPS</strong> to use this "
1320"functionality." 1345"functionality."
@@ -1322,25 +1347,25 @@ msgstr ""
1322"Vous devez utiliser Shaarli en <strong>HTTPS</strong> pour utiliser cette " 1347"Vous devez utiliser Shaarli en <strong>HTTPS</strong> pour utiliser cette "
1323"fonctionalité." 1348"fonctionalité."
1324 1349
1325#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:134 1350#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:144
1326msgid "Add to" 1351msgid "Add to"
1327msgstr "Ajouter à" 1352msgstr "Ajouter à"
1328 1353
1329#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:145 1354#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:155
1330msgid "3rd party" 1355msgid "3rd party"
1331msgstr "Applications tierces" 1356msgstr "Applications tierces"
1332 1357
1333#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:147 1358#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:157
1334#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:153 1359#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:163
1335msgid "Plugin" 1360msgid "Plugin"
1336msgstr "Extension" 1361msgstr "Extension"
1337 1362
1338#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:148 1363#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:158
1339#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:154 1364#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:164
1340msgid "plugin" 1365msgid "plugin"
1341msgstr "extension" 1366msgstr "extension"
1342 1367
1343#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:175 1368#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:191
1344msgid "" 1369msgid ""
1345"Drag this link to your bookmarks toolbar, or right-click it and choose " 1370"Drag this link to your bookmarks toolbar, or right-click it and choose "
1346"Bookmark This Link" 1371"Bookmark This Link"
@@ -1349,6 +1374,26 @@ msgstr ""
1349"Ajouter aux favoris »" 1374"Ajouter aux favoris »"
1350 1375
1351#, fuzzy 1376#, fuzzy
1377#~| msgid "Enable thumbnails"
1378#~ msgid "Synchonize thumbnails"
1379#~ msgstr "Activer les miniatures"
1380
1381#~ msgid "Warning: "
1382#~ msgstr "Attention : "
1383
1384#~ msgid ""
1385#~ "It's recommended to visit the picture wall after enabling this feature."
1386#~ msgstr ""
1387#~ "Il est recommandé de visiter le Mur d'images après avoir activé cette "
1388#~ "fonctionnalité."
1389
1390#~ msgid ""
1391#~ "If you have a large database, the first retrieval may take a few minutes."
1392#~ msgstr ""
1393#~ "Si vous avez beaucoup de liens, la première récupération peut prendre "
1394#~ "plusieurs minutes."
1395
1396#, fuzzy
1352#~| msgid "Change" 1397#~| msgid "Change"
1353#~ msgid "range" 1398#~ msgid "range"
1354#~ msgstr "Changer" 1399#~ msgstr "Changer"
diff --git a/inc/web-thumbnailer.json b/inc/web-thumbnailer.json
index b8db561e..dcaa149e 100644
--- a/inc/web-thumbnailer.json
+++ b/inc/web-thumbnailer.json
@@ -1,7 +1,7 @@
1{ 1{
2 "settings": { 2 "settings": {
3 "default": { 3 "default": {
4 "download_mode": "HOTLINK", 4 "download_mode": "DOWNLOAD",
5 "_comment": "infinite cache", 5 "_comment": "infinite cache",
6 "cache_duration": -1, 6 "cache_duration": -1,
7 "timeout": 10 7 "timeout": 10
@@ -10,4 +10,4 @@
10 "cache": "cache/" 10 "cache": "cache/"
11 } 11 }
12 } 12 }
13} \ No newline at end of file 13}
diff --git a/index.php b/index.php
index 299d6d9b..ac0baf7d 100644
--- a/index.php
+++ b/index.php
@@ -632,6 +632,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
632 $PAGE->assign($key, $value); 632 $PAGE->assign($key, $value);
633 } 633 }
634 634
635
635 $PAGE->renderPage('picwall'); 636 $PAGE->renderPage('picwall');
636 exit; 637 exit;
637 } 638 }
@@ -1015,9 +1016,11 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
1015 $conf->set('translation.language', escape($_POST['language'])); 1016 $conf->set('translation.language', escape($_POST['language']));
1016 1017
1017 $thumbnailsMode = extension_loaded('gd') ? $_POST['enableThumbnails'] : Thumbnailer::MODE_NONE; 1018 $thumbnailsMode = extension_loaded('gd') ? $_POST['enableThumbnails'] : Thumbnailer::MODE_NONE;
1018 if ($conf->get('thumbnails.enabled', Thumbnailer::MODE_NONE) !== Thumbnailer::MODE_NONE) { 1019 if ($thumbnailsMode !== Thumbnailer::MODE_NONE
1020 && $thumbnailsMode !== $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)
1021 ) {
1019 $_SESSION['warnings'][] = t( 1022 $_SESSION['warnings'][] = t(
1020 'You have enabled or changed thumbnails mode. <a href="?do=thumbs_update">Please synchonize them</a>.' 1023 'You have enabled or changed thumbnails mode. <a href="?do=thumbs_update">Please synchronize them</a>.'
1021 ); 1024 );
1022 } 1025 }
1023 $conf->set('thumbnails.mode', $thumbnailsMode); 1026 $conf->set('thumbnails.mode', $thumbnailsMode);
@@ -1517,7 +1520,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
1517 $ids[] = $link['id']; 1520 $ids[] = $link['id'];
1518 } 1521 }
1519 $PAGE->assign('ids', $ids); 1522 $PAGE->assign('ids', $ids);
1520 $PAGE->assign('pagetitle', t('Thumbnail update') .' - '. $conf->get('general.title', 'Shaarli')); 1523 $PAGE->assign('pagetitle', t('Thumbnails update') .' - '. $conf->get('general.title', 'Shaarli'));
1521 $PAGE->renderPage('thumbnails'); 1524 $PAGE->renderPage('thumbnails');
1522 exit; 1525 exit;
1523 } 1526 }
diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php
index 05f4b8e1..cacee2d2 100644
--- a/tests/Updater/UpdaterTest.php
+++ b/tests/Updater/UpdaterTest.php
@@ -700,7 +700,7 @@ $GLOBALS[\'privateLinkByDefault\'] = true;';
700 $this->assertEquals(\Shaarli\Thumbnailer::MODE_ALL, $this->conf->get('thumbnails.mode')); 700 $this->assertEquals(\Shaarli\Thumbnailer::MODE_ALL, $this->conf->get('thumbnails.mode'));
701 $this->assertEquals(125, $this->conf->get('thumbnails.width')); 701 $this->assertEquals(125, $this->conf->get('thumbnails.width'));
702 $this->assertEquals(90, $this->conf->get('thumbnails.height')); 702 $this->assertEquals(90, $this->conf->get('thumbnails.height'));
703 $this->assertContains('You have enabled thumbnails', $_SESSION['warnings'][0]); 703 $this->assertContains('You have enabled or changed thumbnails', $_SESSION['warnings'][0]);
704 } 704 }
705 705
706 /** 706 /**
diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 9711d151..42e32230 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -251,7 +251,7 @@
251 {if="! $gd_enabled"} 251 {if="! $gd_enabled"}
252 {'You need to enable the extension <code>php-gd</code> to use thumbnails.'|t} 252 {'You need to enable the extension <code>php-gd</code> to use thumbnails.'|t}
253 {elseif="$thumbnails_enabled"} 253 {elseif="$thumbnails_enabled"}
254 <a href="?do=thumbs_update">{'Synchonize thumbnails'|t}</a> 254 <a href="?do=thumbs_update">{'Synchronize thumbnails'|t}</a>
255 {/if} 255 {/if}
256 </span> 256 </span>
257 </label> 257 </label>
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index bf88e161..8ea2ce66 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -132,7 +132,7 @@
132 <div class="linklist-item linklist-item{if="$value.class"} {$value.class}{/if}" data-id="{$value.id}"> 132 <div class="linklist-item linklist-item{if="$value.class"} {$value.class}{/if}" data-id="{$value.id}">
133 <div class="linklist-item-title"> 133 <div class="linklist-item-title">
134 {if="$thumbnails_enabled && !empty($value.thumbnail)"} 134 {if="$thumbnails_enabled && !empty($value.thumbnail)"}
135 <div class="linklist-item-thumbnail"> 135 <div class="linklist-item-thumbnail" style="width:{$thumbnails_width}px;height:{$thumbnails_height}px;">
136 <div class="thumbnail"> 136 <div class="thumbnail">
137 <a href="{$value.real_url}"> 137 <a href="{$value.real_url}">
138 {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} 138 {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html
index 1b8bf3b9..9a0b10dc 100644
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -12,6 +12,14 @@
12 </div> 12 </div>
13</div> 13</div>
14{else} 14{else}
15 {if="count($linksToDisplay)===0 && $is_logged_in"}
16 <div class="pure-g pure-alert pure-alert-warning page-single-alert">
17 <div class="pure-u-1 center">
18 {'There is no cached thumbnail. Try to <a href="?do=thumbs_update">synchronize them</a>.'|t}
19 </div>
20 </div>
21 {/if}
22
15 <div class="pure-g"> 23 <div class="pure-g">
16 <div class="pure-u-lg-1-6 pure-u-1-24"></div> 24 <div class="pure-u-lg-1-6 pure-u-1-24"></div>
17 <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor"> 25 <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">
diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index ece66884..20060994 100644
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -45,6 +45,14 @@
45 </a> 45 </a>
46 </div> 46 </div>
47 47
48 {if="$thumbnails_enabled"}
49 <div class="tools-item">
50 <a href="?do=thumbs_update" title="{'Synchronize all link thumbnails'|t}">
51 <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Synchronize thumbnails'|t}</span>
52 </a>
53 </div>
54 {/if}
55
48 {loop="$tools_plugin"} 56 {loop="$tools_plugin"}
49 <div class="tools-item"> 57 <div class="tools-item">
50 {$value} 58 {$value}