diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-09-06 13:42:45 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-09-10 16:29:17 +0200 |
commit | da7acb98302b99ec729bcde3e3c9f4bb164a1b34 (patch) | |
tree | a3ec650e23a3d83d21013a4e68d9e25853f1303f | |
parent | 21163a3329ef19dc6ebadb75d6452ac02fd59ab3 (diff) | |
download | Shaarli-da7acb98302b99ec729bcde3e3c9f4bb164a1b34.tar.gz Shaarli-da7acb98302b99ec729bcde3e3c9f4bb164a1b34.tar.zst Shaarli-da7acb98302b99ec729bcde3e3c9f4bb164a1b34.zip |
Improve default bookmarks after install
Used @nodiscc suggestion in #1148 (slightly edited).
It provides a description of what Shaarli does, Markdown rendering demo, and a thumbnail link.
Fixes #1148
-rw-r--r-- | application/bookmark/BookmarkInitializer.php | 74 | ||||
-rw-r--r-- | inc/languages/fr/LC_MESSAGES/shaarli.po | 269 | ||||
-rw-r--r-- | tests/bookmark/BookmarkFileServiceTest.php | 18 | ||||
-rw-r--r-- | tests/bookmark/BookmarkInitializerTest.php | 70 |
4 files changed, 325 insertions, 106 deletions
diff --git a/application/bookmark/BookmarkInitializer.php b/application/bookmark/BookmarkInitializer.php index cd2d1724..815047e3 100644 --- a/application/bookmark/BookmarkInitializer.php +++ b/application/bookmark/BookmarkInitializer.php | |||
@@ -34,25 +34,77 @@ class BookmarkInitializer | |||
34 | public function initialize() | 34 | public function initialize() |
35 | { | 35 | { |
36 | $bookmark = new Bookmark(); | 36 | $bookmark = new Bookmark(); |
37 | $bookmark->setTitle(t('My secret stuff... - Pastebin.com')); | 37 | $bookmark->setTitle('quicksilver (loop) on Vimeo ' . t('(private bookmark with thumbnail demo)')); |
38 | $bookmark->setUrl('http://sebsauvage.net/paste/?8434b27936c09649#bR7XsXhoTiLcqCpQbmOpBi3rq2zzQUC5hBI7ZT1O3x8='); | 38 | $bookmark->setUrl('https://vimeo.com/153493904'); |
39 | $bookmark->setDescription(t('Shhhh! I\'m a private link only YOU can see. You can delete me too.')); | 39 | $bookmark->setDescription(t( |
40 | $bookmark->setTagsString('secretstuff'); | 40 | 'Shaarli will automatically pick up the thumbnail for links to a variety of websites. |
41 | |||
42 | Explore your new Shaarli instance by trying out controls and menus. | ||
43 | Visit the project on [Github](https://github.com/shaarli/Shaarli) or [the documentation](https://shaarli.readthedocs.io/en/master/) to learn more about Shaarli. | ||
44 | |||
45 | Now you can edit or delete the default shaares. | ||
46 | ' | ||
47 | )); | ||
48 | $bookmark->setTagsString('shaarli help thumbnail'); | ||
49 | $bookmark->setPrivate(true); | ||
50 | $this->bookmarkService->add($bookmark, false); | ||
51 | |||
52 | $bookmark = new Bookmark(); | ||
53 | $bookmark->setTitle(t('Note: Shaare descriptions')); | ||
54 | $bookmark->setDescription(t( | ||
55 | 'Adding a shaare without entering a URL creates a text-only "note" post such as this one. | ||
56 | This note is private, so you are the only one able to see it while logged in. | ||
57 | |||
58 | You can use this to keep notes, post articles, code snippets, and much more. | ||
59 | |||
60 | The Markdown formatting setting allows you to format your notes and bookmark description: | ||
61 | |||
62 | ### Title headings | ||
63 | |||
64 | #### Multiple headings levels | ||
65 | * bullet lists | ||
66 | * _italic_ text | ||
67 | * **bold** text | ||
68 | * ~~strike through~~ text | ||
69 | * `code` blocks | ||
70 | * images | ||
71 | * [links](https://en.wikipedia.org/wiki/Markdown) | ||
72 | |||
73 | Markdown also supports tables: | ||
74 | |||
75 | | Name | Type | Color | Qty | | ||
76 | | ------- | --------- | ------ | ----- | | ||
77 | | Orange | Fruit | Orange | 126 | | ||
78 | | Apple | Fruit | Any | 62 | | ||
79 | | Lemon | Fruit | Yellow | 30 | | ||
80 | | Carrot | Vegetable | Red | 14 | | ||
81 | ' | ||
82 | )); | ||
83 | $bookmark->setTagsString('shaarli help'); | ||
41 | $bookmark->setPrivate(true); | 84 | $bookmark->setPrivate(true); |
42 | $this->bookmarkService->add($bookmark, false); | 85 | $this->bookmarkService->add($bookmark, false); |
43 | 86 | ||
44 | $bookmark = new Bookmark(); | 87 | $bookmark = new Bookmark(); |
45 | $bookmark->setTitle(t('The personal, minimalist, super-fast, database free, bookmarking service')); | 88 | $bookmark->setTitle( |
46 | $bookmark->setUrl('https://shaarli.readthedocs.io', []); | 89 | 'Shaarli - ' . t('The personal, minimalist, super-fast, database free, bookmarking service') |
90 | ); | ||
47 | $bookmark->setDescription(t( | 91 | $bookmark->setDescription(t( |
48 | 'Welcome to Shaarli! This is your first public bookmark. ' | 92 | 'Welcome to Shaarli! |
49 | . 'To edit or delete me, you must first login. | 93 | |
94 | Shaarli allows you to bookmark your favorite pages, and share them with others or store them privately. | ||
95 | You can add a description to your bookmarks, such as this one, and tag them. | ||
96 | |||
97 | Create a new shaare by clicking the `+Shaare` button, or using any of the recommended tools (browser extension, mobile app, bookmarklet, REST API, etc.). | ||
50 | 98 | ||
51 | To learn how to use Shaarli, consult the link "Documentation" at the bottom of this page. | 99 | You can easily retrieve your links, even with thousands of them, using the internal search engine, or search through tags (e.g. this Shaare is tagged with `shaarli` and `help`). |
100 | Hashtags such as #shaarli #help are also supported. | ||
101 | You can also filter the available [RSS feed](/feed/atom) and picture wall by tag or plaintext search. | ||
52 | 102 | ||
53 | You use the community supported version of the original Shaarli project, by Sebastien Sauvage.' | 103 | We hope that you will enjoy using Shaarli, maintained with ❤️ by the community! |
104 | Feel free to open [an issue](https://github.com/shaarli/Shaarli/issues) if you have a suggestion or encounter an issue. | ||
105 | ' | ||
54 | )); | 106 | )); |
55 | $bookmark->setTagsString('opensource software'); | 107 | $bookmark->setTagsString('shaarli help'); |
56 | $this->bookmarkService->add($bookmark, false); | 108 | $this->bookmarkService->add($bookmark, false); |
57 | } | 109 | } |
58 | } | 110 | } |
diff --git a/inc/languages/fr/LC_MESSAGES/shaarli.po b/inc/languages/fr/LC_MESSAGES/shaarli.po index fbb2fe64..9a6e3958 100644 --- a/inc/languages/fr/LC_MESSAGES/shaarli.po +++ b/inc/languages/fr/LC_MESSAGES/shaarli.po | |||
@@ -1,8 +1,8 @@ | |||
1 | msgid "" | 1 | msgid "" |
2 | msgstr "" | 2 | msgstr "" |
3 | "Project-Id-Version: Shaarli\n" | 3 | "Project-Id-Version: Shaarli\n" |
4 | "POT-Creation-Date: 2020-08-27 12:01+0200\n" | 4 | "POT-Creation-Date: 2020-09-10 16:06+0200\n" |
5 | "PO-Revision-Date: 2020-08-27 12:02+0200\n" | 5 | "PO-Revision-Date: 2020-09-10 16: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" |
@@ -60,16 +60,20 @@ msgid "Automatic" | |||
60 | msgstr "Automatique" | 60 | msgstr "Automatique" |
61 | 61 | ||
62 | #: application/Languages.php:182 | 62 | #: application/Languages.php:182 |
63 | msgid "German" | ||
64 | msgstr "Allemand" | ||
65 | |||
66 | #: application/Languages.php:183 | ||
63 | msgid "English" | 67 | msgid "English" |
64 | msgstr "Anglais" | 68 | msgstr "Anglais" |
65 | 69 | ||
66 | #: application/Languages.php:183 | 70 | #: application/Languages.php:184 |
67 | msgid "French" | 71 | msgid "French" |
68 | msgstr "Français" | 72 | msgstr "Français" |
69 | 73 | ||
70 | #: application/Languages.php:184 | 74 | #: application/Languages.php:185 |
71 | msgid "German" | 75 | msgid "Japanese" |
72 | msgstr "Allemand" | 76 | msgstr "Japonais" |
73 | 77 | ||
74 | #: application/Thumbnailer.php:62 | 78 | #: application/Thumbnailer.php:62 |
75 | msgid "" | 79 | msgid "" |
@@ -103,36 +107,119 @@ msgstr "Mo" | |||
103 | msgid "GiB" | 107 | msgid "GiB" |
104 | msgstr "Go" | 108 | msgstr "Go" |
105 | 109 | ||
106 | #: application/bookmark/BookmarkFileService.php:165 | 110 | #: application/bookmark/BookmarkFileService.php:174 |
107 | #: application/bookmark/BookmarkFileService.php:190 | 111 | #: application/bookmark/BookmarkFileService.php:199 |
108 | #: application/bookmark/BookmarkFileService.php:215 | 112 | #: application/bookmark/BookmarkFileService.php:224 |
109 | #: application/bookmark/BookmarkFileService.php:232 | 113 | #: application/bookmark/BookmarkFileService.php:241 |
110 | msgid "You're not authorized to alter the datastore" | 114 | msgid "You're not authorized to alter the datastore" |
111 | msgstr "Vous n'êtes pas autorisé à modifier les données" | 115 | msgstr "Vous n'êtes pas autorisé à modifier les données" |
112 | 116 | ||
113 | #: application/bookmark/BookmarkFileService.php:168 | 117 | #: application/bookmark/BookmarkFileService.php:177 |
114 | #: application/bookmark/BookmarkFileService.php:193 | 118 | #: application/bookmark/BookmarkFileService.php:202 |
115 | #: application/bookmark/BookmarkFileService.php:235 | 119 | #: application/bookmark/BookmarkFileService.php:244 |
116 | msgid "Provided data is invalid" | 120 | msgid "Provided data is invalid" |
117 | msgstr "Les informations fournies ne sont pas valides" | 121 | msgstr "Les informations fournies ne sont pas valides" |
118 | 122 | ||
119 | #: application/bookmark/BookmarkFileService.php:196 | 123 | #: application/bookmark/BookmarkFileService.php:205 |
120 | msgid "This bookmarks already exists" | 124 | msgid "This bookmarks already exists" |
121 | msgstr "Ce marque-page existe déjà." | 125 | msgstr "Ce marque-page existe déjà." |
122 | 126 | ||
123 | #: application/bookmark/BookmarkInitializer.php:37 | 127 | #: application/bookmark/BookmarkInitializer.php:37 |
124 | #: application/legacy/LegacyLinkDB.php:266 | 128 | msgid "(private bookmark with thumbnail demo)" |
125 | msgid "My secret stuff... - Pastebin.com" | 129 | msgstr "(marque page privé avec une miniature)" |
126 | msgstr "Mes trucs secrets... - Pastebin.com" | ||
127 | 130 | ||
128 | #: application/bookmark/BookmarkInitializer.php:39 | 131 | #: application/bookmark/BookmarkInitializer.php:40 |
129 | #: application/legacy/LegacyLinkDB.php:268 | 132 | msgid "" |
130 | msgid "Shhhh! I'm a private link only YOU can see. You can delete me too." | 133 | "Shaarli will automatically pick up the thumbnail for links to a variety of " |
134 | "websites.\n" | ||
135 | "\n" | ||
136 | "Explore your new Shaarli instance by trying out controls and menus.\n" | ||
137 | "Visit the project on [Github](https://github.com/shaarli/Shaarli) or [the " | ||
138 | "documentation](https://shaarli.readthedocs.io/en/master/) to learn more " | ||
139 | "about Shaarli.\n" | ||
140 | "\n" | ||
141 | "Now you can edit or delete the default shaares.\n" | ||
131 | msgstr "" | 142 | msgstr "" |
132 | "Pssst ! Je suis un lien privé que VOUS êtes le seul à voir. Vous pouvez me " | 143 | "Shaarli récupérera automatiquement la miniature associée au liens pour de " |
133 | "supprimer aussi." | 144 | "nombreux sites web.\n" |
145 | "\n" | ||
146 | "Explorez votre nouvelle instance de Shaarli en essayant les différents " | ||
147 | "contrôles et menus.\n" | ||
148 | "Visitez le projet sur [Github](https://github.com/shaarli/Shaarli) ou [la " | ||
149 | "documentation](https://shaarli.readthedocs.io/en/master/) pour en apprendre " | ||
150 | "plus sur Shaarli.\n" | ||
151 | "\n" | ||
152 | "Maintenant, vous pouvez modifier ou supprimer les shaares créés par défaut.\n" | ||
153 | |||
154 | #: application/bookmark/BookmarkInitializer.php:53 | ||
155 | msgid "Note: Shaare descriptions" | ||
156 | msgstr "Note : Description des Shaares" | ||
134 | 157 | ||
135 | #: application/bookmark/BookmarkInitializer.php:45 | 158 | #: application/bookmark/BookmarkInitializer.php:55 |
159 | msgid "" | ||
160 | "Adding a shaare without entering a URL creates a text-only \"note\" post " | ||
161 | "such as this one.\n" | ||
162 | "This note is private, so you are the only one able to see it while logged " | ||
163 | "in.\n" | ||
164 | "\n" | ||
165 | "You can use this to keep notes, post articles, code snippets, and much " | ||
166 | "more.\n" | ||
167 | "\n" | ||
168 | "The Markdown formatting setting allows you to format your notes and bookmark " | ||
169 | "description:\n" | ||
170 | "\n" | ||
171 | "### Title headings\n" | ||
172 | "\n" | ||
173 | "#### Multiple headings levels\n" | ||
174 | " * bullet lists\n" | ||
175 | " * _italic_ text\n" | ||
176 | " * **bold** text\n" | ||
177 | " * ~~strike through~~ text\n" | ||
178 | " * `code` blocks\n" | ||
179 | " * images\n" | ||
180 | " * [links](https://en.wikipedia.org/wiki/Markdown)\n" | ||
181 | "\n" | ||
182 | "Markdown also supports tables:\n" | ||
183 | "\n" | ||
184 | "| Name | Type | Color | Qty |\n" | ||
185 | "| ------- | --------- | ------ | ----- |\n" | ||
186 | "| Orange | Fruit | Orange | 126 |\n" | ||
187 | "| Apple | Fruit | Any | 62 |\n" | ||
188 | "| Lemon | Fruit | Yellow | 30 |\n" | ||
189 | "| Carrot | Vegetable | Red | 14 |\n" | ||
190 | msgstr "" | ||
191 | "Ajouter un shaare sans préciser d'URL créé une « note » textuelle, telle que " | ||
192 | "celle-ci.\n" | ||
193 | "Cette note est privée, donc vous êtes seul à pouvoir la voir lorsque vous " | ||
194 | "êtes connecté.\n" | ||
195 | "\n" | ||
196 | "Vous pouvez utiliser cette fonctionnalité pour prendre des notes, publier " | ||
197 | "des articles, des extraits de code, et bien plus.\n" | ||
198 | "\n" | ||
199 | "L'option du formatage par Markdown vous permet de formater vos description " | ||
200 | "de notes et marque-pages :\n" | ||
201 | "\n" | ||
202 | "### Titre d'en-tête\n" | ||
203 | "\n" | ||
204 | "#### Sur plusieurs niveaux\n" | ||
205 | " * liste à puce\n" | ||
206 | " * texte en _italique_\n" | ||
207 | " * texte en **gras**\n" | ||
208 | " * texte ~~barré~~\n" | ||
209 | " * blocs de `code`\n" | ||
210 | " * images\n" | ||
211 | " * [liens](https://en.wikipedia.org/wiki/Markdown)\n" | ||
212 | "\n" | ||
213 | "Markdown supporte aussi les tableaux :\n" | ||
214 | "\n" | ||
215 | "| Nom | Type | Couleur | Qte |\n" | ||
216 | "| ------- | --------- | ------ | ----- |\n" | ||
217 | "| Orange | Fruit | Orange | 126 |\n" | ||
218 | "| Pomme | Fruit | Multiple | 62 |\n" | ||
219 | "| Citron | Fruit | Jaune | 30 |\n" | ||
220 | "| Carotte | Légume | Orange | 14 |\n" | ||
221 | |||
222 | #: application/bookmark/BookmarkInitializer.php:89 | ||
136 | #: application/legacy/LegacyLinkDB.php:246 | 223 | #: application/legacy/LegacyLinkDB.php:246 |
137 | #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15 | 224 | #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15 |
138 | #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:49 | 225 | #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:49 |
@@ -144,26 +231,54 @@ msgstr "" | |||
144 | "Le gestionnaire de marque-pages personnel, minimaliste, et sans base de " | 231 | "Le gestionnaire de marque-pages personnel, minimaliste, et sans base de " |
145 | "données" | 232 | "données" |
146 | 233 | ||
147 | #: application/bookmark/BookmarkInitializer.php:48 | 234 | #: application/bookmark/BookmarkInitializer.php:92 |
148 | #: application/legacy/LegacyLinkDB.php:249 | ||
149 | msgid "" | 235 | msgid "" |
150 | "Welcome to Shaarli! This is your first public bookmark. To edit or delete " | 236 | "Welcome to Shaarli!\n" |
151 | "me, you must first login.\n" | ||
152 | "\n" | 237 | "\n" |
153 | "To learn how to use Shaarli, consult the link \"Documentation\" at the " | 238 | "Shaarli allows you to bookmark your favorite pages, and share them with " |
154 | "bottom of this page.\n" | 239 | "others or store them privately.\n" |
240 | "You can add a description to your bookmarks, such as this one, and tag " | ||
241 | "them.\n" | ||
155 | "\n" | 242 | "\n" |
156 | "You use the community supported version of the original Shaarli project, by " | 243 | "Create a new shaare by clicking the `+Shaare` button, or using any of the " |
157 | "Sebastien Sauvage." | 244 | "recommended tools (browser extension, mobile app, bookmarklet, REST API, " |
245 | "etc.).\n" | ||
246 | "\n" | ||
247 | "You can easily retrieve your links, even with thousands of them, using the " | ||
248 | "internal search engine, or search through tags (e.g. this Shaare is tagged " | ||
249 | "with `shaarli` and `help`).\n" | ||
250 | "Hashtags such as #shaarli #help are also supported.\n" | ||
251 | "You can also filter the available [RSS feed](/feed/atom) and picture wall by " | ||
252 | "tag or plaintext search.\n" | ||
253 | "\n" | ||
254 | "We hope that you will enjoy using Shaarli, maintained with ❤️ by the " | ||
255 | "community!\n" | ||
256 | "Feel free to open [an issue](https://github.com/shaarli/Shaarli/issues) if " | ||
257 | "you have a suggestion or encounter an issue.\n" | ||
158 | msgstr "" | 258 | msgstr "" |
159 | "Bienvenue sur Shaarli ! Ceci est votre premier marque-page public. Pour me " | 259 | "Bienvenue sur Shaarli !\n" |
160 | "modifier ou me supprimer, vous devez d'abord vous connecter.\n" | ||
161 | "\n" | 260 | "\n" |
162 | "Pour apprendre à utiliser Shaarli, consultez le lien « Documentation » en " | 261 | "Shaarli vous permet de sauvegarder des marque-pages de vos pages favorites, " |
163 | "bas de page.\n" | 262 | "et de les partager avec d'autres, ou de les enregistrer en privé.\n" |
263 | "Vous pouvez ajouter une description à vos marque-pages, comme celle-ci, et y " | ||
264 | "ajouter des tags.\n" | ||
164 | "\n" | 265 | "\n" |
165 | "Vous utilisez la version supportée par la communauté du projet original " | 266 | "Créez un nouveau shaare en cliquant sur le bouton `+Shaare`, ou en utilisant " |
166 | "Shaarli de Sébastien Sauvage." | 267 | "l'un des outils recommandés (extension de navigateur, application mobile, " |
268 | "bookmarklet, REST API, etc.).\n" | ||
269 | "\n" | ||
270 | "Vous pouvez facilement retrouver vos liens, même parmi des milliers, en " | ||
271 | "utilisant le moteur de recherche interne, ou en filtrant par tags (par " | ||
272 | "exemple ce Shaare est taggé avec `shaarli` et `help`).\n" | ||
273 | "Les hashtags comme #shaarli #help sont aussi supportés.\n" | ||
274 | "Vous pouvez aussi filtrer les [flux RSS](/feed/atom) et [mur d'images]() par " | ||
275 | "tag ou par texte brut.\n" | ||
276 | "\n" | ||
277 | "Nous espérons que vous apprécierez utiliser Shaarli, maintenu avec ❤️ par la " | ||
278 | "communauté !\n" | ||
279 | "N'hésitez pas à ouvrir [un ticket (en)](https://github.com/shaarli/Shaarli/" | ||
280 | "issues) si vous avez une suggestion ou si vous rencontrez un problème.\n" | ||
281 | " \n" | ||
167 | 282 | ||
168 | #: application/bookmark/exception/BookmarkNotFoundException.php:13 | 283 | #: application/bookmark/exception/BookmarkNotFoundException.php:13 |
169 | msgid "The link you are trying to reach does not exist or has been deleted." | 284 | msgid "The link you are trying to reach does not exist or has been deleted." |
@@ -489,6 +604,36 @@ msgstr "Vous devez utiliser un entier comme clé." | |||
489 | msgid "Array offset and link ID must be equal." | 604 | msgid "Array offset and link ID must be equal." |
490 | msgstr "La clé du tableau et l'ID du lien doivent être identiques." | 605 | msgstr "La clé du tableau et l'ID du lien doivent être identiques." |
491 | 606 | ||
607 | #: application/legacy/LegacyLinkDB.php:249 | ||
608 | msgid "" | ||
609 | "Welcome to Shaarli! This is your first public bookmark. To edit or delete " | ||
610 | "me, you must first login.\n" | ||
611 | "\n" | ||
612 | "To learn how to use Shaarli, consult the link \"Documentation\" at the " | ||
613 | "bottom of this page.\n" | ||
614 | "\n" | ||
615 | "You use the community supported version of the original Shaarli project, by " | ||
616 | "Sebastien Sauvage." | ||
617 | msgstr "" | ||
618 | "Bienvenue sur Shaarli ! Ceci est votre premier marque-page public. Pour me " | ||
619 | "modifier ou me supprimer, vous devez d'abord vous connecter.\n" | ||
620 | "\n" | ||
621 | "Pour apprendre à utiliser Shaarli, consultez le lien « Documentation » en " | ||
622 | "bas de page.\n" | ||
623 | "\n" | ||
624 | "Vous utilisez la version supportée par la communauté du projet original " | ||
625 | "Shaarli de Sébastien Sauvage." | ||
626 | |||
627 | #: application/legacy/LegacyLinkDB.php:266 | ||
628 | msgid "My secret stuff... - Pastebin.com" | ||
629 | msgstr "Mes trucs secrets... - Pastebin.com" | ||
630 | |||
631 | #: application/legacy/LegacyLinkDB.php:268 | ||
632 | msgid "Shhhh! I'm a private link only YOU can see. You can delete me too." | ||
633 | msgstr "" | ||
634 | "Pssst ! Je suis un lien privé que VOUS êtes le seul à voir. Vous pouvez me " | ||
635 | "supprimer aussi." | ||
636 | |||
492 | #: application/legacy/LegacyUpdater.php:104 | 637 | #: application/legacy/LegacyUpdater.php:104 |
493 | msgid "Couldn't retrieve updater class methods." | 638 | msgid "Couldn't retrieve updater class methods." |
494 | msgstr "Impossible de récupérer les méthodes de la classe Updater." | 639 | msgstr "Impossible de récupérer les méthodes de la classe Updater." |
@@ -562,7 +707,7 @@ msgstr "Voir sur archive.org" | |||
562 | msgid "For each link, add an Archive.org icon." | 707 | msgid "For each link, add an Archive.org icon." |
563 | msgstr "Pour chaque lien, ajoute une icône pour Archive.org." | 708 | msgstr "Pour chaque lien, ajoute une icône pour Archive.org." |
564 | 709 | ||
565 | #: plugins/default_colors/default_colors.php:33 | 710 | #: plugins/default_colors/default_colors.php:38 |
566 | msgid "" | 711 | msgid "" |
567 | "Default colors plugin error: This plugin is active and no custom color is " | 712 | "Default colors plugin error: This plugin is active and no custom color is " |
568 | "configured." | 713 | "configured." |
@@ -570,21 +715,21 @@ msgstr "" | |||
570 | "Erreur du plugin default colors : ce plugin est actif et aucune couleur " | 715 | "Erreur du plugin default colors : ce plugin est actif et aucune couleur " |
571 | "n'est configurée." | 716 | "n'est configurée." |
572 | 717 | ||
573 | #: plugins/default_colors/default_colors.php:107 | 718 | #: plugins/default_colors/default_colors.php:113 |
574 | msgid "Override default theme colors. Use any CSS valid color." | 719 | msgid "Override default theme colors. Use any CSS valid color." |
575 | msgstr "" | 720 | msgstr "" |
576 | "Remplacer les couleurs du thème par défaut. Utiliser n'importe quelle " | 721 | "Remplacer les couleurs du thème par défaut. Utiliser n'importe quelle " |
577 | "couleur CSS valide." | 722 | "couleur CSS valide." |
578 | 723 | ||
579 | #: plugins/default_colors/default_colors.php:108 | 724 | #: plugins/default_colors/default_colors.php:114 |
580 | msgid "Main color (navbar green)" | 725 | msgid "Main color (navbar green)" |
581 | msgstr "Couleur principale (vert de la barre de navigation)" | 726 | msgstr "Couleur principale (vert de la barre de navigation)" |
582 | 727 | ||
583 | #: plugins/default_colors/default_colors.php:109 | 728 | #: plugins/default_colors/default_colors.php:115 |
584 | msgid "Background color (light grey)" | 729 | msgid "Background color (light grey)" |
585 | msgstr "Couleur de fond (gris léger)" | 730 | msgstr "Couleur de fond (gris léger)" |
586 | 731 | ||
587 | #: plugins/default_colors/default_colors.php:110 | 732 | #: plugins/default_colors/default_colors.php:116 |
588 | msgid "Dark main color (e.g. visited links)" | 733 | msgid "Dark main color (e.g. visited links)" |
589 | msgstr "Couleur principale sombre (ex : les liens visités)" | 734 | msgstr "Couleur principale sombre (ex : les liens visités)" |
590 | 735 | ||
@@ -1168,23 +1313,23 @@ msgstr "Changer statut épinglé" | |||
1168 | msgid "Sticky" | 1313 | msgid "Sticky" |
1169 | msgstr "Épinglé" | 1314 | msgstr "Épinglé" |
1170 | 1315 | ||
1171 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:7 | 1316 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:5 |
1172 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:7 | 1317 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:5 |
1173 | msgid "Filters" | 1318 | msgid "Filters" |
1174 | msgstr "Filtres" | 1319 | msgstr "Filtres" |
1175 | 1320 | ||
1176 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:12 | 1321 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:10 |
1177 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:12 | 1322 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:10 |
1178 | msgid "Only display private links" | 1323 | msgid "Only display private links" |
1179 | msgstr "Afficher uniquement les liens privés" | 1324 | msgstr "Afficher uniquement les liens privés" |
1180 | 1325 | ||
1181 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15 | 1326 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13 |
1182 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:15 | 1327 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:13 |
1183 | msgid "Only display public links" | 1328 | msgid "Only display public links" |
1184 | msgstr "Afficher uniquement les liens publics" | 1329 | msgstr "Afficher uniquement les liens publics" |
1185 | 1330 | ||
1186 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:20 | 1331 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:18 |
1187 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:20 | 1332 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:18 |
1188 | msgid "Filter untagged links" | 1333 | msgid "Filter untagged links" |
1189 | msgstr "Filtrer par liens privés" | 1334 | msgstr "Filtrer par liens privés" |
1190 | 1335 | ||
@@ -1193,17 +1338,17 @@ msgstr "Filtrer par liens privés" | |||
1193 | msgid "Select all" | 1338 | msgid "Select all" |
1194 | msgstr "Tout sélectionner" | 1339 | msgstr "Tout sélectionner" |
1195 | 1340 | ||
1196 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:27 | 1341 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:29 |
1197 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:79 | 1342 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:89 |
1198 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:27 | 1343 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:29 |
1199 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:79 | 1344 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:89 |
1200 | #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44 | 1345 | #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44 |
1201 | #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:44 | 1346 | #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:44 |
1202 | msgid "Fold all" | 1347 | msgid "Fold all" |
1203 | msgstr "Replier tout" | 1348 | msgstr "Replier tout" |
1204 | 1349 | ||
1205 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:72 | 1350 | #: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:76 |
1206 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:72 | 1351 | #: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:76 |
1207 | msgid "Links per page" | 1352 | msgid "Links per page" |
1208 | msgstr "Liens par page" | 1353 | msgstr "Liens par page" |
1209 | 1354 | ||
@@ -1429,32 +1574,24 @@ msgid "Rename or delete a tag in all links" | |||
1429 | msgstr "Renommer ou supprimer un tag dans tous les liens" | 1574 | msgstr "Renommer ou supprimer un tag dans tous les liens" |
1430 | 1575 | ||
1431 | #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41 | 1576 | #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41 |
1432 | #, fuzzy | ||
1433 | #| msgid "" | ||
1434 | #| "Import Netscape HTML bookmarks (as exported from Firefox, Chrome, Opera, " | ||
1435 | #| "delicious…)" | ||
1436 | msgid "" | 1577 | msgid "" |
1437 | "Import Netscape HTML bookmarks (as exported from Firefox, Chrome, Opera, " | 1578 | "Import Netscape HTML bookmarks (as exported from Firefox, Chrome, Opera, " |
1438 | "delicious...)" | 1579 | "delicious...)" |
1439 | msgstr "" | 1580 | msgstr "" |
1440 | "Importer des marques pages au format Netscape HTML (comme exportés depuis " | 1581 | "Importer des marques pages au format Netscape HTML (comme exportés depuis " |
1441 | "Firefox, Chrome, Opera, delicious…)" | 1582 | "Firefox, Chrome, Opera, delicious...)" |
1442 | 1583 | ||
1443 | #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:42 | 1584 | #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:42 |
1444 | msgid "Import links" | 1585 | msgid "Import links" |
1445 | msgstr "Importer des liens" | 1586 | msgstr "Importer des liens" |
1446 | 1587 | ||
1447 | #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:47 | 1588 | #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:47 |
1448 | #, fuzzy | ||
1449 | #| msgid "" | ||
1450 | #| "Export Netscape HTML bookmarks (which can be imported in Firefox, Chrome, " | ||
1451 | #| "Opera, delicious…)" | ||
1452 | msgid "" | 1589 | msgid "" |
1453 | "Export Netscape HTML bookmarks (which can be imported in Firefox, Chrome, " | 1590 | "Export Netscape HTML bookmarks (which can be imported in Firefox, Chrome, " |
1454 | "Opera, delicious...)" | 1591 | "Opera, delicious...)" |
1455 | msgstr "" | 1592 | msgstr "" |
1456 | "Exporter les marques pages au format Netscape HTML (comme exportés depuis " | 1593 | "Exporter les marques pages au format Netscape HTML (comme exportés depuis " |
1457 | "Firefox, Chrome, Opera, delicious…)" | 1594 | "Firefox, Chrome, Opera, delicious...)" |
1458 | 1595 | ||
1459 | #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48 | 1596 | #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48 |
1460 | msgid "Export database" | 1597 | msgid "Export database" |
diff --git a/tests/bookmark/BookmarkFileServiceTest.php b/tests/bookmark/BookmarkFileServiceTest.php index 7b1906d3..a91f374f 100644 --- a/tests/bookmark/BookmarkFileServiceTest.php +++ b/tests/bookmark/BookmarkFileServiceTest.php | |||
@@ -615,14 +615,18 @@ class BookmarkFileServiceTest extends TestCase | |||
615 | { | 615 | { |
616 | $dbSize = $this->privateLinkDB->count(); | 616 | $dbSize = $this->privateLinkDB->count(); |
617 | $this->privateLinkDB->initialize(); | 617 | $this->privateLinkDB->initialize(); |
618 | $this->assertEquals($dbSize + 2, $this->privateLinkDB->count()); | 618 | $this->assertEquals($dbSize + 3, $this->privateLinkDB->count()); |
619 | $this->assertEquals( | 619 | $this->assertStringStartsWith( |
620 | 'My secret stuff... - Pastebin.com', | 620 | 'Shaarli will automatically pick up the thumbnail for links to a variety of websites.', |
621 | $this->privateLinkDB->get(43)->getTitle() | 621 | $this->privateLinkDB->get(43)->getDescription() |
622 | ); | 622 | ); |
623 | $this->assertEquals( | 623 | $this->assertStringStartsWith( |
624 | 'The personal, minimalist, super-fast, database free, bookmarking service', | 624 | 'Adding a shaare without entering a URL creates a text-only "note" post such as this one.', |
625 | $this->privateLinkDB->get(44)->getTitle() | 625 | $this->privateLinkDB->get(44)->getDescription() |
626 | ); | ||
627 | $this->assertStringStartsWith( | ||
628 | 'Welcome to Shaarli!', | ||
629 | $this->privateLinkDB->get(45)->getDescription() | ||
626 | ); | 630 | ); |
627 | } | 631 | } |
628 | 632 | ||
diff --git a/tests/bookmark/BookmarkInitializerTest.php b/tests/bookmark/BookmarkInitializerTest.php index 3906cc7f..454269bb 100644 --- a/tests/bookmark/BookmarkInitializerTest.php +++ b/tests/bookmark/BookmarkInitializerTest.php | |||
@@ -37,7 +37,7 @@ class BookmarkInitializerTest extends TestCase | |||
37 | /** | 37 | /** |
38 | * Initialize an empty BookmarkFileService | 38 | * Initialize an empty BookmarkFileService |
39 | */ | 39 | */ |
40 | public function setUp() | 40 | public function setUp(): void |
41 | { | 41 | { |
42 | if (file_exists(self::$testDatastore)) { | 42 | if (file_exists(self::$testDatastore)) { |
43 | unlink(self::$testDatastore); | 43 | unlink(self::$testDatastore); |
@@ -64,17 +64,26 @@ class BookmarkInitializerTest extends TestCase | |||
64 | 64 | ||
65 | $this->initializer->initialize(); | 65 | $this->initializer->initialize(); |
66 | 66 | ||
67 | $this->assertEquals($refDB->countLinks() + 2, $this->bookmarkService->count()); | 67 | $this->assertEquals($refDB->countLinks() + 3, $this->bookmarkService->count()); |
68 | |||
68 | $bookmark = $this->bookmarkService->get(43); | 69 | $bookmark = $this->bookmarkService->get(43); |
69 | $this->assertEquals(43, $bookmark->getId()); | 70 | $this->assertStringStartsWith( |
70 | $this->assertEquals('My secret stuff... - Pastebin.com', $bookmark->getTitle()); | 71 | 'Shaarli will automatically pick up the thumbnail for links to a variety of websites.', |
72 | $bookmark->getDescription() | ||
73 | ); | ||
71 | $this->assertTrue($bookmark->isPrivate()); | 74 | $this->assertTrue($bookmark->isPrivate()); |
72 | 75 | ||
73 | $bookmark = $this->bookmarkService->get(44); | 76 | $bookmark = $this->bookmarkService->get(44); |
74 | $this->assertEquals(44, $bookmark->getId()); | 77 | $this->assertStringStartsWith( |
75 | $this->assertEquals( | 78 | 'Adding a shaare without entering a URL creates a text-only "note" post such as this one.', |
76 | 'The personal, minimalist, super-fast, database free, bookmarking service', | 79 | $bookmark->getDescription() |
77 | $bookmark->getTitle() | 80 | ); |
81 | $this->assertTrue($bookmark->isPrivate()); | ||
82 | |||
83 | $bookmark = $this->bookmarkService->get(45); | ||
84 | $this->assertStringStartsWith( | ||
85 | 'Welcome to Shaarli!', | ||
86 | $bookmark->getDescription() | ||
78 | ); | 87 | ); |
79 | $this->assertFalse($bookmark->isPrivate()); | 88 | $this->assertFalse($bookmark->isPrivate()); |
80 | 89 | ||
@@ -82,17 +91,26 @@ class BookmarkInitializerTest extends TestCase | |||
82 | 91 | ||
83 | // Reload from file | 92 | // Reload from file |
84 | $this->bookmarkService = new BookmarkFileService($this->conf, $this->history, true); | 93 | $this->bookmarkService = new BookmarkFileService($this->conf, $this->history, true); |
85 | $this->assertEquals($refDB->countLinks() + 2, $this->bookmarkService->count()); | 94 | $this->assertEquals($refDB->countLinks() + 3, $this->bookmarkService->count()); |
95 | |||
86 | $bookmark = $this->bookmarkService->get(43); | 96 | $bookmark = $this->bookmarkService->get(43); |
87 | $this->assertEquals(43, $bookmark->getId()); | 97 | $this->assertStringStartsWith( |
88 | $this->assertEquals('My secret stuff... - Pastebin.com', $bookmark->getTitle()); | 98 | 'Shaarli will automatically pick up the thumbnail for links to a variety of websites.', |
99 | $bookmark->getDescription() | ||
100 | ); | ||
89 | $this->assertTrue($bookmark->isPrivate()); | 101 | $this->assertTrue($bookmark->isPrivate()); |
90 | 102 | ||
91 | $bookmark = $this->bookmarkService->get(44); | 103 | $bookmark = $this->bookmarkService->get(44); |
92 | $this->assertEquals(44, $bookmark->getId()); | 104 | $this->assertStringStartsWith( |
93 | $this->assertEquals( | 105 | 'Adding a shaare without entering a URL creates a text-only "note" post such as this one.', |
94 | 'The personal, minimalist, super-fast, database free, bookmarking service', | 106 | $bookmark->getDescription() |
95 | $bookmark->getTitle() | 107 | ); |
108 | $this->assertTrue($bookmark->isPrivate()); | ||
109 | |||
110 | $bookmark = $this->bookmarkService->get(45); | ||
111 | $this->assertStringStartsWith( | ||
112 | 'Welcome to Shaarli!', | ||
113 | $bookmark->getDescription() | ||
96 | ); | 114 | ); |
97 | $this->assertFalse($bookmark->isPrivate()); | 115 | $this->assertFalse($bookmark->isPrivate()); |
98 | } | 116 | } |
@@ -107,17 +125,25 @@ class BookmarkInitializerTest extends TestCase | |||
107 | 125 | ||
108 | $this->initializer->initialize(); | 126 | $this->initializer->initialize(); |
109 | 127 | ||
110 | $this->assertEquals(2, $this->bookmarkService->count()); | 128 | $this->assertEquals(3, $this->bookmarkService->count()); |
111 | $bookmark = $this->bookmarkService->get(0); | 129 | $bookmark = $this->bookmarkService->get(0); |
112 | $this->assertEquals(0, $bookmark->getId()); | 130 | $this->assertStringStartsWith( |
113 | $this->assertEquals('My secret stuff... - Pastebin.com', $bookmark->getTitle()); | 131 | 'Shaarli will automatically pick up the thumbnail for links to a variety of websites.', |
132 | $bookmark->getDescription() | ||
133 | ); | ||
114 | $this->assertTrue($bookmark->isPrivate()); | 134 | $this->assertTrue($bookmark->isPrivate()); |
115 | 135 | ||
116 | $bookmark = $this->bookmarkService->get(1); | 136 | $bookmark = $this->bookmarkService->get(1); |
117 | $this->assertEquals(1, $bookmark->getId()); | 137 | $this->assertStringStartsWith( |
118 | $this->assertEquals( | 138 | 'Adding a shaare without entering a URL creates a text-only "note" post such as this one.', |
119 | 'The personal, minimalist, super-fast, database free, bookmarking service', | 139 | $bookmark->getDescription() |
120 | $bookmark->getTitle() | 140 | ); |
141 | $this->assertTrue($bookmark->isPrivate()); | ||
142 | |||
143 | $bookmark = $this->bookmarkService->get(2); | ||
144 | $this->assertStringStartsWith( | ||
145 | 'Welcome to Shaarli!', | ||
146 | $bookmark->getDescription() | ||
121 | ); | 147 | ); |
122 | $this->assertFalse($bookmark->isPrivate()); | 148 | $this->assertFalse($bookmark->isPrivate()); |
123 | } | 149 | } |