diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
24 files changed, 215 insertions, 114 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/parameters.yml b/src/Wallabag/CoreBundle/Resources/config/parameters.yml new file mode 100644 index 00000000..abd9ab68 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/config/parameters.yml | |||
@@ -0,0 +1,12 @@ | |||
1 | parameters: | ||
2 | addons_url: | ||
3 | firefox: https://addons.mozilla.org/firefox/addon/wallabag-v2/ | ||
4 | chrome: https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm | ||
5 | f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche | ||
6 | google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche | ||
7 | ios: https://itunes.apple.com/app/wallabag/id828331015?mt=8 | ||
8 | windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646 | ||
9 | socials_url: | ||
10 | twitter: https://twitter.com/wallabagapp | ||
11 | google_plus: https://plus.google.com/+WallabagOrg/posts | ||
12 | facebook: https://facebook.com/Wallabag | ||
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css index b203cbb8..605eb641 100644 --- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css | |||
@@ -64,7 +64,7 @@ pre { | |||
64 | max-width: 61.25em;/*980px*/ | 64 | max-width: 61.25em;/*980px*/ |
65 | } | 65 | } |
66 | 66 | ||
67 | table, img { | 67 | table, img, figure { |
68 | max-width: 100%; | 68 | max-width: 100%; |
69 | height :auto; | 69 | height :auto; |
70 | } | 70 | } |
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css index f0beab98..eb4eebd8 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css | |||
@@ -351,7 +351,8 @@ main ul.row { | |||
351 | max-width: 40em; | 351 | max-width: 40em; |
352 | } | 352 | } |
353 | 353 | ||
354 | #article img { | 354 | #article img, |
355 | #article figure { | ||
355 | max-width: 100%; | 356 | max-width: 100%; |
356 | height: auto; | 357 | height: auto; |
357 | } | 358 | } |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 8d392063..c066aaf7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'estimeret læsetid' | 144 | reading_time: 'estimeret læsetid' |
145 | reading_time_minutes: 'estimeret læsetid: %readingTime% min' | 145 | reading_time_minutes: 'estimeret læsetid: %readingTime% min' |
146 | reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'original' | 149 | original_article: 'original' |
148 | toogle_as_read: 'Marker som læst' | 150 | toogle_as_read: 'Marker som læst' |
149 | toogle_as_star: 'Skift favoritstatus' | 151 | toogle_as_star: 'Skift favoritstatus' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Status' | 156 | status_label: 'Status' |
155 | archived_label: 'Arkiveret' | 157 | archived_label: 'Arkiveret' |
156 | starred_label: 'Favorit' | 158 | starred_label: 'Favorit' |
159 | unread_label: 'Ulæst' | ||
157 | preview_picture_label: 'Har et vist billede' | 160 | preview_picture_label: 'Har et vist billede' |
158 | preview_picture_help: 'Forhåndsvis billede' | 161 | preview_picture_help: 'Forhåndsvis billede' |
159 | language_label: 'Sprog' | 162 | language_label: 'Sprog' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Tilbage' | 178 | back_to_homepage: 'Tilbage' |
176 | set_as_read: 'Marker som læst' | 179 | set_as_read: 'Marker som læst' |
177 | # set_as_unread: 'Mark as unread' | 180 | # set_as_unread: 'Mark as unread' |
178 | set_as_favorite: 'Marker som favorit' | 181 | set_as_starred: 'Marker som favorit' |
179 | view_original_article: 'Originalartikel' | 182 | view_original_article: 'Originalartikel' |
180 | # re_fetch_content: 'Re-fetch content' | 183 | # re_fetch_content: 'Re-fetch content' |
181 | delete: 'Slet' | 184 | delete: 'Slet' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Rediger titel' | 193 | edit_title: 'Rediger titel' |
191 | original_article: 'original' | 194 | original_article: 'original' |
192 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' | 195 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' |
196 | created_at: 'Oprettelsesdato' | ||
193 | new: | 197 | new: |
194 | page_title: 'Gem ny artikel' | 198 | page_title: 'Gem ny artikel' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -396,6 +400,7 @@ flashes: | |||
396 | notice: | 400 | notice: |
397 | # entry_already_saved: 'Entry already saved on %date%' | 401 | # entry_already_saved: 'Entry already saved on %date%' |
398 | # entry_saved: 'Entry saved' | 402 | # entry_saved: 'Entry saved' |
403 | # entry_saved_failed: 'Failed to save entry' | ||
399 | # entry_updated: 'Entry updated' | 404 | # entry_updated: 'Entry updated' |
400 | # entry_reloaded: 'Entry reloaded' | 405 | # entry_reloaded: 'Entry reloaded' |
401 | # entry_reload_failed: 'Failed to reload entry' | 406 | # entry_reload_failed: 'Failed to reload entry' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index c7a89492..28d826b6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'geschätzte Lesezeit' | 144 | reading_time: 'geschätzte Lesezeit' |
145 | reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min' | 145 | reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min' |
146 | reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'original' | 149 | original_article: 'original' |
148 | toogle_as_read: 'Gelesen-Status ändern' | 150 | toogle_as_read: 'Gelesen-Status ändern' |
149 | toogle_as_star: 'Favoriten-Status ändern' | 151 | toogle_as_star: 'Favoriten-Status ändern' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Status' | 156 | status_label: 'Status' |
155 | archived_label: 'Archiviert' | 157 | archived_label: 'Archiviert' |
156 | starred_label: 'Favorisiert' | 158 | starred_label: 'Favorisiert' |
159 | unread_label: 'Ungelesene' | ||
157 | preview_picture_label: 'Vorschaubild vorhanden' | 160 | preview_picture_label: 'Vorschaubild vorhanden' |
158 | preview_picture_help: 'Vorschaubild' | 161 | preview_picture_help: 'Vorschaubild' |
159 | language_label: 'Sprache' | 162 | language_label: 'Sprache' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Zurück' | 178 | back_to_homepage: 'Zurück' |
176 | set_as_read: 'Als gelesen markieren' | 179 | set_as_read: 'Als gelesen markieren' |
177 | set_as_unread: 'Als ungelesen markieren' | 180 | set_as_unread: 'Als ungelesen markieren' |
178 | set_as_favorite: 'Favorisieren' | 181 | set_as_starred: 'Favorisieren' |
179 | view_original_article: 'Original-Artikel' | 182 | view_original_article: 'Original-Artikel' |
180 | re_fetch_content: 'Inhalt neu laden' | 183 | re_fetch_content: 'Inhalt neu laden' |
181 | delete: 'Löschen' | 184 | delete: 'Löschen' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Titel ändern' | 193 | edit_title: 'Titel ändern' |
191 | original_article: 'original' | 194 | original_article: 'original' |
192 | annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen' | 195 | annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen' |
196 | created_at: 'Erstellungsdatum' | ||
193 | new: | 197 | new: |
194 | page_title: 'Neuen Artikel speichern' | 198 | page_title: 'Neuen Artikel speichern' |
195 | placeholder: 'https://website.de' | 199 | placeholder: 'https://website.de' |
@@ -395,7 +399,8 @@ flashes: | |||
395 | entry: | 399 | entry: |
396 | notice: | 400 | notice: |
397 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 401 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
398 | entry_saved: 'Eintag gespeichert' | 402 | entry_saved: 'Eintrag gespeichert' |
403 | # entry_saved_failed: 'Failed to save entry' | ||
399 | entry_updated: 'Eintrag aktualisiert' | 404 | entry_updated: 'Eintrag aktualisiert' |
400 | entry_reloaded: 'Eintrag neugeladen' | 405 | entry_reloaded: 'Eintrag neugeladen' |
401 | entry_reload_failed: 'Neuladen des Eintrags fehlgeschlagen' | 406 | entry_reload_failed: 'Neuladen des Eintrags fehlgeschlagen' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 1cc42404..c6633f5b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -81,7 +81,7 @@ config: | |||
81 | archive: 'archived' | 81 | archive: 'archived' |
82 | rss_limit: 'Number of items in the feed' | 82 | rss_limit: 'Number of items in the feed' |
83 | form_user: | 83 | form_user: |
84 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" | 84 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection." |
85 | name_label: 'Name' | 85 | name_label: 'Name' |
86 | email_label: 'Email' | 86 | email_label: 'Email' |
87 | twoFactorAuthentication_label: 'Two factor authentication' | 87 | twoFactorAuthentication_label: 'Two factor authentication' |
@@ -98,9 +98,9 @@ config: | |||
98 | faq: | 98 | faq: |
99 | title: 'FAQ' | 99 | title: 'FAQ' |
100 | tagging_rules_definition_title: 'What does « tagging rules » mean?' | 100 | tagging_rules_definition_title: 'What does « tagging rules » mean?' |
101 | tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.' | 101 | tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble of manually classifying your entries.' |
102 | how_to_use_them_title: 'How do I use them?' | 102 | how_to_use_them_title: 'How do I use them?' |
103 | how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime <= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime >= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »' | 103 | how_to_use_them_description: 'Let us assume you want to tag new entries as « <i>short reading</i> » when the reading time is under 3 minutes.<br />In that case, you should put « readingTime <= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them with a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime >= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »' |
104 | variables_available_title: 'Which variables and operators can I use to write rules?' | 104 | variables_available_title: 'Which variables and operators can I use to write rules?' |
105 | variables_available_description: 'The following variables and operators can be used to create tagging rules:' | 105 | variables_available_description: 'The following variables and operators can be used to create tagging rules:' |
106 | meaning: 'Meaning' | 106 | meaning: 'Meaning' |
@@ -140,13 +140,15 @@ entry: | |||
140 | archived: 'Archived entries' | 140 | archived: 'Archived entries' |
141 | filtered: 'Filtered entries' | 141 | filtered: 'Filtered entries' |
142 | list: | 142 | list: |
143 | number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' | 143 | number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' |
144 | reading_time: 'estimated reading time' | 144 | reading_time: 'estimated reading time' |
145 | reading_time_minutes: 'estimated reading time: %readingTime% min' | 145 | reading_time_minutes: 'estimated reading time: %readingTime% min' |
146 | reading_time_less_one_minute: 'estimated reading time: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'estimated reading time: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'original' | 149 | original_article: 'original' |
148 | toogle_as_read: 'Toggle mark as read' | 150 | toogle_as_read: 'Toggle mark as read' |
149 | toogle_as_star: 'Toggle favorite' | 151 | toogle_as_star: 'Toggle starred' |
150 | delete: 'Delete' | 152 | delete: 'Delete' |
151 | export_title: 'Export' | 153 | export_title: 'Export' |
152 | filters: | 154 | filters: |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Status' | 156 | status_label: 'Status' |
155 | archived_label: 'Archived' | 157 | archived_label: 'Archived' |
156 | starred_label: 'Starred' | 158 | starred_label: 'Starred' |
159 | unread_label: 'Unread' | ||
157 | preview_picture_label: 'Has a preview picture' | 160 | preview_picture_label: 'Has a preview picture' |
158 | preview_picture_help: 'Preview picture' | 161 | preview_picture_help: 'Preview picture' |
159 | language_label: 'Language' | 162 | language_label: 'Language' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Back' | 178 | back_to_homepage: 'Back' |
176 | set_as_read: 'Mark as read' | 179 | set_as_read: 'Mark as read' |
177 | set_as_unread: 'Mark as unread' | 180 | set_as_unread: 'Mark as unread' |
178 | set_as_favorite: 'Favorite' | 181 | set_as_starred: 'Toggle starred' |
179 | view_original_article: 'Original article' | 182 | view_original_article: 'Original article' |
180 | re_fetch_content: 'Re-fetch content' | 183 | re_fetch_content: 'Re-fetch content' |
181 | delete: 'Delete' | 184 | delete: 'Delete' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Edit title' | 193 | edit_title: 'Edit title' |
191 | original_article: 'original' | 194 | original_article: 'original' |
192 | annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' | 195 | annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' |
196 | created_at: 'Creation date' | ||
193 | new: | 197 | new: |
194 | page_title: 'Save new entry' | 198 | page_title: 'Save new entry' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -222,14 +226,14 @@ about: | |||
222 | bug_reports: 'Bug reports' | 226 | bug_reports: 'Bug reports' |
223 | support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>' | 227 | support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>' |
224 | helping: | 228 | helping: |
225 | description: 'wallabag is free and opensource. You can help us:' | 229 | description: 'wallabag is free and open source. You can help us:' |
226 | by_contributing: 'by contributing to the project:' | 230 | by_contributing: 'by contributing to the project:' |
227 | by_contributing_2: 'an issue lists all our needs' | 231 | by_contributing_2: 'an issue lists all our needs' |
228 | by_paypal: 'via Paypal' | 232 | by_paypal: 'via Paypal' |
229 | contributors: | 233 | contributors: |
230 | description: 'Thank you to contributors on wallabag web application' | 234 | description: 'Thank you to contributors on wallabag web application' |
231 | third_party: | 235 | third_party: |
232 | description: 'Here are the list of third-party libraries used in wallabag (with their licenses):' | 236 | description: 'Here is the list of third-party libraries used in wallabag (with their licenses):' |
233 | package: 'Package' | 237 | package: 'Package' |
234 | license: 'License' | 238 | license: 'License' |
235 | 239 | ||
@@ -258,7 +262,7 @@ quickstart: | |||
258 | page_title: 'Quickstart' | 262 | page_title: 'Quickstart' |
259 | intro: | 263 | intro: |
260 | title: 'Welcome to wallabag!' | 264 | title: 'Welcome to wallabag!' |
261 | paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you." | 265 | paragraph_1: "We'll accompany you on your visit to wallabag and show you some features that might interest you." |
262 | paragraph_2: 'Follow us!' | 266 | paragraph_2: 'Follow us!' |
263 | configure: | 267 | configure: |
264 | title: 'Configure the application' | 268 | title: 'Configure the application' |
@@ -290,7 +294,7 @@ quickstart: | |||
290 | title: 'Full documentation' | 294 | title: 'Full documentation' |
291 | annotate: 'Annotate your article' | 295 | annotate: 'Annotate your article' |
292 | export: 'Convert your articles into ePUB or PDF' | 296 | export: 'Convert your articles into ePUB or PDF' |
293 | search_filters: 'See how you can look for an article by using search engine and filters' | 297 | search_filters: 'See how you can look for an article by using the search engine and filters' |
294 | fetching_errors: 'What can I do if an article encounters errors during fetching?' | 298 | fetching_errors: 'What can I do if an article encounters errors during fetching?' |
295 | all_docs: 'And so many other articles!' | 299 | all_docs: 'And so many other articles!' |
296 | support: | 300 | support: |
@@ -303,11 +307,11 @@ quickstart: | |||
303 | tag: | 307 | tag: |
304 | page_title: 'Tags' | 308 | page_title: 'Tags' |
305 | list: | 309 | list: |
306 | number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' | 310 | number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.' |
307 | 311 | ||
308 | import: | 312 | import: |
309 | page_title: 'Import' | 313 | page_title: 'Import' |
310 | page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.' | 314 | page_description: 'Welcome to wallabag importer. Please select your previous service from which you want to migrate.' |
311 | action: | 315 | action: |
312 | import_contents: 'Import contents' | 316 | import_contents: 'Import contents' |
313 | form: | 317 | form: |
@@ -317,7 +321,7 @@ import: | |||
317 | save_label: 'Upload file' | 321 | save_label: 'Upload file' |
318 | pocket: | 322 | pocket: |
319 | page_title: 'Import > Pocket' | 323 | page_title: 'Import > Pocket' |
320 | description: "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag." | 324 | description: "This importer will import all of your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag." |
321 | config_missing: | 325 | config_missing: |
322 | description: "Pocket import isn't configured." | 326 | description: "Pocket import isn't configured." |
323 | admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.' | 327 | admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.' |
@@ -396,6 +400,7 @@ flashes: | |||
396 | notice: | 400 | notice: |
397 | entry_already_saved: 'Entry already saved on %date%' | 401 | entry_already_saved: 'Entry already saved on %date%' |
398 | entry_saved: 'Entry saved' | 402 | entry_saved: 'Entry saved' |
403 | entry_saved_failed: 'Failed to save entry' | ||
399 | entry_updated: 'Entry updated' | 404 | entry_updated: 'Entry updated' |
400 | entry_reloaded: 'Entry reloaded' | 405 | entry_reloaded: 'Entry reloaded' |
401 | entry_reload_failed: 'Failed to reload entry' | 406 | entry_reload_failed: 'Failed to reload entry' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index e8461247..266b4af5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -135,7 +135,7 @@ config: | |||
135 | 135 | ||
136 | entry: | 136 | entry: |
137 | page_titles: | 137 | page_titles: |
138 | unread: 'Artclos no leídos' | 138 | unread: 'Artculos no leídos' |
139 | starred: 'Artículos favoritos' | 139 | starred: 'Artículos favoritos' |
140 | archived: 'Artículos archivados' | 140 | archived: 'Artículos archivados' |
141 | filtered: 'Artículos filtrados' | 141 | filtered: 'Artículos filtrados' |
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'tiempo estimado de lectura' | 144 | reading_time: 'tiempo estimado de lectura' |
145 | reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min' | 145 | reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min' |
146 | reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'original' | 149 | original_article: 'original' |
148 | toogle_as_read: 'Marcar como leído/ no leído' | 150 | toogle_as_read: 'Marcar como leído/ no leído' |
149 | toogle_as_star: 'Marcar como favorito/ no favorito' | 151 | toogle_as_star: 'Marcar como favorito/ no favorito' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Estatus' | 156 | status_label: 'Estatus' |
155 | archived_label: 'Archivado' | 157 | archived_label: 'Archivado' |
156 | starred_label: 'Favorito' | 158 | starred_label: 'Favorito' |
159 | unread_label: 'Sin leer' | ||
157 | preview_picture_label: 'Hay una foto' | 160 | preview_picture_label: 'Hay una foto' |
158 | preview_picture_help: 'Foto de preview' | 161 | preview_picture_help: 'Foto de preview' |
159 | language_label: 'Idioma' | 162 | language_label: 'Idioma' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Regrese a la página principal' | 178 | back_to_homepage: 'Regrese a la página principal' |
176 | set_as_read: 'Marcar como leído' | 179 | set_as_read: 'Marcar como leído' |
177 | set_as_unread: 'Marcar como no leído' | 180 | set_as_unread: 'Marcar como no leído' |
178 | set_as_favorite: 'Marcar como favorito' | 181 | set_as_starred: 'Marcar como favorito' |
179 | view_original_article: 'Artículo original' | 182 | view_original_article: 'Artículo original' |
180 | re_fetch_content: 'Redescargar el contenido' | 183 | re_fetch_content: 'Redescargar el contenido' |
181 | delete: 'Suprimir' | 184 | delete: 'Suprimir' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Modificar el título' | 193 | edit_title: 'Modificar el título' |
191 | original_article: 'original' | 194 | original_article: 'original' |
192 | annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones' | 195 | annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones' |
196 | created_at: 'Fecha de creación' | ||
193 | new: | 197 | new: |
194 | page_title: 'Guardar un nuevo artículo' | 198 | page_title: 'Guardar un nuevo artículo' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -396,6 +400,7 @@ flashes: | |||
396 | notice: | 400 | notice: |
397 | entry_already_saved: 'Entrada ya guardada por %fecha%' | 401 | entry_already_saved: 'Entrada ya guardada por %fecha%' |
398 | entry_saved: 'Entrada guardada' | 402 | entry_saved: 'Entrada guardada' |
403 | # entry_saved_failed: 'Failed to save entry' | ||
399 | entry_updated: 'Entrada actualizada' | 404 | entry_updated: 'Entrada actualizada' |
400 | entry_reloaded: 'Entrada recargada' | 405 | entry_reloaded: 'Entrada recargada' |
401 | entry_reload_failed: 'Entrada recargada reprobada' | 406 | entry_reload_failed: 'Entrada recargada reprobada' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index d34ff8ff..c2350019 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -96,8 +96,8 @@ config: | |||
96 | rule_label: 'قانون' | 96 | rule_label: 'قانون' |
97 | tags_label: 'برچسبها' | 97 | tags_label: 'برچسبها' |
98 | faq: | 98 | faq: |
99 | title: 'پرسشهای متداول' | 99 | title: 'پرسشهای متداول' |
100 | tagging_rules_definition_title: 'برچسبگذاری خودکار یعنی چه؟' | 100 | tagging_rules_definition_title: 'برچسبگذاری خودکار یعنی چه؟' |
101 | # tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.' | 101 | # tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.' |
102 | # how_to_use_them_title: 'How do I use them?' | 102 | # how_to_use_them_title: 'How do I use them?' |
103 | # how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime <= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime >= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »' | 103 | # how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime <= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime >= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »' |
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'زمان تخمینی برای خواندن' | 144 | reading_time: 'زمان تخمینی برای خواندن' |
145 | reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min' | 145 | reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min' |
146 | reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'original' | 149 | original_article: 'original' |
148 | toogle_as_read: 'خواندهشده/خواندهنشده' | 150 | toogle_as_read: 'خواندهشده/خواندهنشده' |
149 | toogle_as_star: 'برگزیده/نابرگزیده' | 151 | toogle_as_star: 'برگزیده/نابرگزیده' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'وضعیت' | 156 | status_label: 'وضعیت' |
155 | archived_label: 'بایگانیشده' | 157 | archived_label: 'بایگانیشده' |
156 | starred_label: 'برگزیده' | 158 | starred_label: 'برگزیده' |
159 | unread_label: 'خواندهنشده' | ||
157 | preview_picture_label: 'دارای عکس پیشنمایش' | 160 | preview_picture_label: 'دارای عکس پیشنمایش' |
158 | preview_picture_help: 'پیشنمایش عکس' | 161 | preview_picture_help: 'پیشنمایش عکس' |
159 | language_label: 'زبان' | 162 | language_label: 'زبان' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'بازگشت' | 178 | back_to_homepage: 'بازگشت' |
176 | set_as_read: 'خواندهشده' | 179 | set_as_read: 'خواندهشده' |
177 | set_as_unread: 'به عنوان خواندهنشده علامت بزن' | 180 | set_as_unread: 'به عنوان خواندهنشده علامت بزن' |
178 | set_as_favorite: 'برگزیده' | 181 | set_as_starred: 'برگزیده' |
179 | view_original_article: 'مقالهٔ اصلی' | 182 | view_original_article: 'مقالهٔ اصلی' |
180 | re_fetch_content: 'مقالهها را دوباره دریافت کن' | 183 | re_fetch_content: 'مقالهها را دوباره دریافت کن' |
181 | delete: 'پاک کردن' | 184 | delete: 'پاک کردن' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'ویرایش عنوان' | 193 | edit_title: 'ویرایش عنوان' |
191 | original_article: 'اصلی' | 194 | original_article: 'اصلی' |
192 | annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' | 195 | annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' |
196 | created_at: 'زمان ساخت' | ||
193 | new: | 197 | new: |
194 | page_title: 'ذخیرهٔ مقالهٔ تازه' | 198 | page_title: 'ذخیرهٔ مقالهٔ تازه' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -383,30 +387,31 @@ developer: | |||
383 | flashes: | 387 | flashes: |
384 | config: | 388 | config: |
385 | notice: | 389 | notice: |
386 | config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال میشود.' | 390 | config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال میشود.' |
387 | password_updated: 'رمز بهروز شد' | 391 | password_updated: 'رمز بهروز شد' |
388 | password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید." | 392 | password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید." |
389 | user_updated: 'اطلاعات بهروز شد' | 393 | user_updated: 'اطلاعات بهروز شد' |
390 | rss_updated: 'اطلاعات آر-اس-اس بهروز شد' | 394 | rss_updated: 'اطلاعات آر-اس-اس بهروز شد' |
391 | tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد' | 395 | tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد' |
392 | tagging_rules_deleted: 'قانون برچسبگذاری پاک شد' | 396 | tagging_rules_deleted: 'قانون برچسبگذاری پاک شد' |
393 | user_added: 'کابر "%username%" افزوده شد' | 397 | user_added: 'کابر "%username%" افزوده شد' |
394 | rss_token_updated: 'کد آر-اس-اس بهروز شد' | 398 | rss_token_updated: 'کد آر-اس-اس بهروز شد' |
395 | entry: | 399 | entry: |
396 | notice: | 400 | notice: |
397 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' | 401 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' |
398 | entry_saved: 'مقاله ذخیره شد' | 402 | entry_saved: 'مقاله ذخیره شد' |
399 | entry_updated: 'مقاله بهروز شد' | 403 | # entry_saved_failed: 'Failed to save entry' |
400 | entry_reloaded: 'مقاله بهروز شد' | 404 | entry_updated: 'مقاله بهروز شد' |
401 | entry_reload_failed: 'بهروزرسانی مقاله شکست خورد' | 405 | entry_reloaded: 'مقاله بهروز شد' |
402 | entry_archived: 'مقاله بایگانی شد' | 406 | entry_reload_failed: 'بهروزرسانی مقاله شکست خورد' |
403 | entry_unarchived: 'مقاله از بایگانی درآمد' | 407 | entry_archived: 'مقاله بایگانی شد' |
404 | entry_starred: 'مقاله برگزیده شد' | 408 | entry_unarchived: 'مقاله از بایگانی درآمد' |
405 | entry_unstarred: 'مقاله نابرگزیده شد' | 409 | entry_starred: 'مقاله برگزیده شد' |
406 | entry_deleted: 'مقاله پاک شد' | 410 | entry_unstarred: 'مقاله نابرگزیده شد' |
411 | entry_deleted: 'مقاله پاک شد' | ||
407 | tag: | 412 | tag: |
408 | notice: | 413 | notice: |
409 | tag_added: 'برچسب افزوده شد' | 414 | tag_added: 'برچسب افزوده شد' |
410 | import: | 415 | import: |
411 | notice: | 416 | notice: |
412 | failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.' | 417 | failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 80ba0546..25d9ec59 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'durée de lecture' | 144 | reading_time: 'durée de lecture' |
145 | reading_time_minutes: 'durée de lecture: %readingTime% min' | 145 | reading_time_minutes: 'durée de lecture: %readingTime% min' |
146 | reading_time_less_one_minute: 'durée de lecture: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'durée de lecture: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'original' | 149 | original_article: 'original' |
148 | toogle_as_read: 'Marquer comme lu/non lu' | 150 | toogle_as_read: 'Marquer comme lu/non lu' |
149 | toogle_as_star: 'Marquer comme favori' | 151 | toogle_as_star: 'Marquer comme favori' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Status' | 156 | status_label: 'Status' |
155 | archived_label: 'Lus' | 157 | archived_label: 'Lus' |
156 | starred_label: 'Favoris' | 158 | starred_label: 'Favoris' |
159 | unread_label: 'Non lus' | ||
157 | preview_picture_label: 'A une photo' | 160 | preview_picture_label: 'A une photo' |
158 | preview_picture_help: 'Photo' | 161 | preview_picture_help: 'Photo' |
159 | language_label: 'Langue' | 162 | language_label: 'Langue' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Retour' | 178 | back_to_homepage: 'Retour' |
176 | set_as_read: 'Marquer comme lu' | 179 | set_as_read: 'Marquer comme lu' |
177 | set_as_unread: 'Marquer comme non lu' | 180 | set_as_unread: 'Marquer comme non lu' |
178 | set_as_favorite: 'Mettre en favori' | 181 | set_as_starred: 'Mettre en favori' |
179 | view_original_article: 'Article original' | 182 | view_original_article: 'Article original' |
180 | re_fetch_content: 'Recharger le contenu' | 183 | re_fetch_content: 'Recharger le contenu' |
181 | delete: 'Supprimer' | 184 | delete: 'Supprimer' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Modifier le titre' | 193 | edit_title: 'Modifier le titre' |
191 | original_article: 'original' | 194 | original_article: 'original' |
192 | annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations' | 195 | annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations' |
196 | created_at: 'Date de création' | ||
193 | new: | 197 | new: |
194 | page_title: 'Sauvegarder un nouvel article' | 198 | page_title: 'Sauvegarder un nouvel article' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -267,12 +271,12 @@ quickstart: | |||
267 | tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles' | 271 | tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles' |
268 | admin: | 272 | admin: |
269 | title: 'Administration' | 273 | title: 'Administration' |
270 | description: "En tant qu'adminitrasteur sur wallabag, vous avez des privilèges qui vous permette de :" | 274 | description: "En tant qu'administrateur sur wallabag, vous avez des privilèges qui vous permettent de :" |
271 | new_user: 'Créer un nouvel utilisateur' | 275 | new_user: 'Créer un nouvel utilisateur' |
272 | analytics: 'Configurer les statistiques' | 276 | analytics: 'Configurer les statistiques' |
273 | sharing: 'Activer des paramètres de partages' | 277 | sharing: 'Activer des paramètres de partages' |
274 | export: 'Configurer les export' | 278 | export: "Configurer les formats d'export" |
275 | import: 'Configurer les import' | 279 | import: "Configurer l'import" |
276 | first_steps: | 280 | first_steps: |
277 | title: 'Premiers pas' | 281 | title: 'Premiers pas' |
278 | new_article: 'Ajoutez votre premier article' | 282 | new_article: 'Ajoutez votre premier article' |
@@ -288,7 +292,7 @@ quickstart: | |||
288 | create_application: 'Créer votre application tierce' | 292 | create_application: 'Créer votre application tierce' |
289 | docs: | 293 | docs: |
290 | title: 'Documentation complète' | 294 | title: 'Documentation complète' |
291 | annotate: 'Annotater votre article' | 295 | annotate: 'Annoter votre article' |
292 | export: 'Convertissez vos articles en ePub ou en PDF' | 296 | export: 'Convertissez vos articles en ePub ou en PDF' |
293 | search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse" | 297 | search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse" |
294 | fetching_errors: "Que faire si mon article n'est pas correctement récupéré ?" | 298 | fetching_errors: "Que faire si mon article n'est pas correctement récupéré ?" |
@@ -396,6 +400,7 @@ flashes: | |||
396 | notice: | 400 | notice: |
397 | entry_already_saved: 'Article déjà sauvergardé le %date%' | 401 | entry_already_saved: 'Article déjà sauvergardé le %date%' |
398 | entry_saved: 'Article enregistré' | 402 | entry_saved: 'Article enregistré' |
403 | entry_saved_failed: "L'enregistrement a échoué" | ||
399 | entry_updated: 'Article mis à jour' | 404 | entry_updated: 'Article mis à jour' |
400 | entry_reloaded: 'Article rechargé' | 405 | entry_reloaded: 'Article rechargé' |
401 | entry_reload_failed: "Le rechargement de l'article a échoué" | 406 | entry_reload_failed: "Le rechargement de l'article a échoué" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 4f3ac090..231ba759 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'tempo di lettura stimato' | 144 | reading_time: 'tempo di lettura stimato' |
145 | reading_time_minutes: 'tempo di lettura stimato: %readingTime% min' | 145 | reading_time_minutes: 'tempo di lettura stimato: %readingTime% min' |
146 | reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'originale' | 149 | original_article: 'originale' |
148 | toogle_as_read: 'Segna come da leggere' | 150 | toogle_as_read: 'Segna come da leggere' |
149 | toogle_as_star: 'Segna come non preferito' | 151 | toogle_as_star: 'Segna come non preferito' |
@@ -175,7 +177,7 @@ entry: | |||
175 | back_to_homepage: 'Indietro' | 177 | back_to_homepage: 'Indietro' |
176 | set_as_read: 'Segna come già letto' | 178 | set_as_read: 'Segna come già letto' |
177 | set_as_unread: 'Segna come da leggere' | 179 | set_as_unread: 'Segna come da leggere' |
178 | set_as_favorite: 'Segna come preferito' | 180 | set_as_starred: 'Segna come preferito' |
179 | view_original_article: 'Contenuto originale' | 181 | view_original_article: 'Contenuto originale' |
180 | re_fetch_content: 'Ri-ottieni pagina' | 182 | re_fetch_content: 'Ri-ottieni pagina' |
181 | delete: 'Elimina' | 183 | delete: 'Elimina' |
@@ -190,6 +192,7 @@ entry: | |||
190 | edit_title: 'Modifica titolo' | 192 | edit_title: 'Modifica titolo' |
191 | original_article: 'originale' | 193 | original_article: 'originale' |
192 | annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni' | 194 | annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni' |
195 | created_at: 'Data di creazione' | ||
193 | new: | 196 | new: |
194 | page_title: 'Salva un nuovo contenuto' | 197 | page_title: 'Salva un nuovo contenuto' |
195 | placeholder: 'http://website.com' | 198 | placeholder: 'http://website.com' |
@@ -396,6 +399,7 @@ flashes: | |||
396 | notice: | 399 | notice: |
397 | entry_already_saved: 'Contenuto già salvato in data %date%' | 400 | entry_already_saved: 'Contenuto già salvato in data %date%' |
398 | entry_saved: 'Contenuto salvato' | 401 | entry_saved: 'Contenuto salvato' |
402 | # entry_saved_failed: 'Failed to save entry' | ||
399 | entry_updated: 'Contenuto aggiornato' | 403 | entry_updated: 'Contenuto aggiornato' |
400 | entry_reloaded: 'Contenuto ricaricato' | 404 | entry_reloaded: 'Contenuto ricaricato' |
401 | entry_reload_failed: 'Errore nel ricaricamento del contenuto' | 405 | entry_reload_failed: 'Errore nel ricaricamento del contenuto' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 46f58bbf..6e71b850 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'durada de lectura' | 144 | reading_time: 'durada de lectura' |
145 | reading_time_minutes: 'durada de lectura : %readingTime% min' | 145 | reading_time_minutes: 'durada de lectura : %readingTime% min' |
146 | reading_time_less_one_minute: 'durada de lectura : <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'durada de lectura : <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'original' | 149 | original_article: 'original' |
148 | toogle_as_read: 'Marcar coma legit/pas legit' | 150 | toogle_as_read: 'Marcar coma legit/pas legit' |
149 | toogle_as_star: 'Marcar coma favorit' | 151 | toogle_as_star: 'Marcar coma favorit' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Estatus' | 156 | status_label: 'Estatus' |
155 | archived_label: 'Legits' | 157 | archived_label: 'Legits' |
156 | starred_label: 'Favorits' | 158 | starred_label: 'Favorits' |
159 | unread_label: 'Pas legits' | ||
157 | preview_picture_label: 'A una fotò' | 160 | preview_picture_label: 'A una fotò' |
158 | preview_picture_help: 'Fotò' | 161 | preview_picture_help: 'Fotò' |
159 | language_label: 'Lenga' | 162 | language_label: 'Lenga' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Tornar' | 178 | back_to_homepage: 'Tornar' |
176 | set_as_read: 'Marcar coma legit' | 179 | set_as_read: 'Marcar coma legit' |
177 | set_as_unread: 'Marcar coma pas legit' | 180 | set_as_unread: 'Marcar coma pas legit' |
178 | set_as_favorite: 'Metre en favori' | 181 | set_as_starred: 'Metre en favori' |
179 | view_original_article: 'Article original' | 182 | view_original_article: 'Article original' |
180 | re_fetch_content: 'Tornar cargar lo contengut' | 183 | re_fetch_content: 'Tornar cargar lo contengut' |
181 | delete: 'Suprimir' | 184 | delete: 'Suprimir' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Modificar lo títol' | 193 | edit_title: 'Modificar lo títol' |
191 | original_article: 'original' | 194 | original_article: 'original' |
192 | annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions" | 195 | annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions" |
196 | created_at: 'Data de creacion' | ||
193 | new: | 197 | new: |
194 | page_title: 'Enregistrar un novèl article' | 198 | page_title: 'Enregistrar un novèl article' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -396,6 +400,7 @@ flashes: | |||
396 | notice: | 400 | notice: |
397 | entry_already_saved: 'Article ja salvargardat lo %date%' | 401 | entry_already_saved: 'Article ja salvargardat lo %date%' |
398 | entry_saved: 'Article enregistrat' | 402 | entry_saved: 'Article enregistrat' |
403 | # entry_saved_failed: 'Failed to save entry' | ||
399 | entry_updated: 'Article mes a jorn' | 404 | entry_updated: 'Article mes a jorn' |
400 | entry_reloaded: 'Article recargat' | 405 | entry_reloaded: 'Article recargat' |
401 | entry_reload_failed: "Fracàs de l'actualizacion de l'article" | 406 | entry_reload_failed: "Fracàs de l'actualizacion de l'article" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 292749ed..2db26cf1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'szacunkowy czas czytania' | 144 | reading_time: 'szacunkowy czas czytania' |
145 | reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min' | 145 | reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min' |
146 | reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'oryginał' | 149 | original_article: 'oryginał' |
148 | toogle_as_read: 'Oznacz jako przeczytane' | 150 | toogle_as_read: 'Oznacz jako przeczytane' |
149 | toogle_as_star: 'Oznacz jako ulubione' | 151 | toogle_as_star: 'Oznacz jako ulubione' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Status' | 156 | status_label: 'Status' |
155 | archived_label: 'Zarchiwizowane' | 157 | archived_label: 'Zarchiwizowane' |
156 | starred_label: 'Oznaczone gwiazdką' | 158 | starred_label: 'Oznaczone gwiazdką' |
159 | unread_label: 'Nieprzeczytane' | ||
157 | preview_picture_label: 'Posiada podgląd obrazu' | 160 | preview_picture_label: 'Posiada podgląd obrazu' |
158 | preview_picture_help: 'Podgląd obrazu' | 161 | preview_picture_help: 'Podgląd obrazu' |
159 | language_label: 'Język' | 162 | language_label: 'Język' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Cofnij' | 178 | back_to_homepage: 'Cofnij' |
176 | set_as_read: 'Oznacz jako przeczytane' | 179 | set_as_read: 'Oznacz jako przeczytane' |
177 | set_as_unread: 'Oznacz jako nieprzeczytane' | 180 | set_as_unread: 'Oznacz jako nieprzeczytane' |
178 | set_as_favorite: 'Ulubione' | 181 | set_as_starred: 'Ulubione' |
179 | view_original_article: 'Oryginalny artykuł' | 182 | view_original_article: 'Oryginalny artykuł' |
180 | re_fetch_content: 'Pobierz ponownie treść' | 183 | re_fetch_content: 'Pobierz ponownie treść' |
181 | delete: 'Usuń' | 184 | delete: 'Usuń' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Edytuj tytuł' | 193 | edit_title: 'Edytuj tytuł' |
191 | original_article: 'oryginalny' | 194 | original_article: 'oryginalny' |
192 | annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji' | 195 | annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji' |
196 | created_at: 'Czas stworzenia' | ||
193 | new: | 197 | new: |
194 | page_title: 'Zapisz nowy wpis' | 198 | page_title: 'Zapisz nowy wpis' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -396,6 +400,7 @@ flashes: | |||
396 | notice: | 400 | notice: |
397 | entry_already_saved: 'Wpis już został dodany %date%' | 401 | entry_already_saved: 'Wpis już został dodany %date%' |
398 | entry_saved: 'Wpis zapisany' | 402 | entry_saved: 'Wpis zapisany' |
403 | # entry_saved_failed: 'Failed to save entry' | ||
399 | entry_updated: 'Wpis zaktualizowany' | 404 | entry_updated: 'Wpis zaktualizowany' |
400 | entry_reloaded: 'Wpis ponownie załadowany' | 405 | entry_reloaded: 'Wpis ponownie załadowany' |
401 | entry_reload_failed: 'Błąd ponownego załadowania' | 406 | entry_reload_failed: 'Błąd ponownego załadowania' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 45040f35..d8f09bc9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'timp estimat de citire' | 144 | reading_time: 'timp estimat de citire' |
145 | reading_time_minutes: 'timp estimat de citire: %readingTime% min' | 145 | reading_time_minutes: 'timp estimat de citire: %readingTime% min' |
146 | reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'original' | 149 | original_article: 'original' |
148 | toogle_as_read: 'Comută marcat ca citit' | 150 | toogle_as_read: 'Comută marcat ca citit' |
149 | toogle_as_star: 'Comută marcat ca favorit' | 151 | toogle_as_star: 'Comută marcat ca favorit' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Status' | 156 | status_label: 'Status' |
155 | archived_label: 'Arhivat' | 157 | archived_label: 'Arhivat' |
156 | starred_label: 'Steluțe' | 158 | starred_label: 'Steluțe' |
159 | unread_label: 'Necitite' | ||
157 | preview_picture_label: 'Are o imagine de previzualizare' | 160 | preview_picture_label: 'Are o imagine de previzualizare' |
158 | preview_picture_help: 'Previzualizare imagine' | 161 | preview_picture_help: 'Previzualizare imagine' |
159 | language_label: 'Limbă' | 162 | language_label: 'Limbă' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Înapoi' | 178 | back_to_homepage: 'Înapoi' |
176 | set_as_read: 'Marchează ca citit' | 179 | set_as_read: 'Marchează ca citit' |
177 | # set_as_unread: 'Mark as unread' | 180 | # set_as_unread: 'Mark as unread' |
178 | set_as_favorite: 'Favorit' | 181 | set_as_starred: 'Favorit' |
179 | view_original_article: 'Articol original' | 182 | view_original_article: 'Articol original' |
180 | # re_fetch_content: 'Re-fetch content' | 183 | # re_fetch_content: 'Re-fetch content' |
181 | delete: 'Șterge' | 184 | delete: 'Șterge' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Editează titlul' | 193 | edit_title: 'Editează titlul' |
191 | original_article: 'original' | 194 | original_article: 'original' |
192 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' | 195 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' |
196 | created_at: 'Data creării' | ||
193 | new: | 197 | new: |
194 | page_title: 'Salvează un nou articol' | 198 | page_title: 'Salvează un nou articol' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -396,6 +400,7 @@ flashes: | |||
396 | notice: | 400 | notice: |
397 | # entry_already_saved: 'Entry already saved on %date%' | 401 | # entry_already_saved: 'Entry already saved on %date%' |
398 | # entry_saved: 'Entry saved' | 402 | # entry_saved: 'Entry saved' |
403 | # entry_saved_failed: 'Failed to save entry' | ||
399 | # entry_updated: 'Entry updated' | 404 | # entry_updated: 'Entry updated' |
400 | # entry_reloaded: 'Entry reloaded' | 405 | # entry_reloaded: 'Entry reloaded' |
401 | # entry_reload_failed: 'Failed to reload entry' | 406 | # entry_reload_failed: 'Failed to reload entry' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 8a095a5b..074d13e2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -144,6 +144,8 @@ entry: | |||
144 | reading_time: 'tahmini okuma süresi' | 144 | reading_time: 'tahmini okuma süresi' |
145 | reading_time_minutes: 'tahmini okuma süresi: %readingTime% min' | 145 | reading_time_minutes: 'tahmini okuma süresi: %readingTime% min' |
146 | reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur"><</small> 1 min' |
147 | reading_time_minutes_short: '%readingTime% min' | ||
148 | reading_time_less_one_minute_short: '<small class="inferieur"><</small> 1 min' | ||
147 | original_article: 'orijinal' | 149 | original_article: 'orijinal' |
148 | toogle_as_read: 'Okundu/okunmadı olarak işaretle' | 150 | toogle_as_read: 'Okundu/okunmadı olarak işaretle' |
149 | toogle_as_star: 'Favorilere ekle/çıkar' | 151 | toogle_as_star: 'Favorilere ekle/çıkar' |
@@ -154,6 +156,7 @@ entry: | |||
154 | status_label: 'Durum' | 156 | status_label: 'Durum' |
155 | archived_label: 'Arşiv' | 157 | archived_label: 'Arşiv' |
156 | starred_label: 'Favori' | 158 | starred_label: 'Favori' |
159 | unread_label: 'Okunmayan' | ||
157 | preview_picture_label: 'Resim önizlemesi varsa' | 160 | preview_picture_label: 'Resim önizlemesi varsa' |
158 | preview_picture_help: 'Resim önizlemesi' | 161 | preview_picture_help: 'Resim önizlemesi' |
159 | language_label: 'Dil' | 162 | language_label: 'Dil' |
@@ -175,7 +178,7 @@ entry: | |||
175 | back_to_homepage: 'Back' | 178 | back_to_homepage: 'Back' |
176 | set_as_read: 'Okundu olarak işaretle' | 179 | set_as_read: 'Okundu olarak işaretle' |
177 | set_as_unread: 'Okunmadı olarak işaretle' | 180 | set_as_unread: 'Okunmadı olarak işaretle' |
178 | set_as_favorite: 'Favorilere ekle/çıkar' | 181 | set_as_starred: 'Favorilere ekle/çıkar' |
179 | view_original_article: 'Orijinal makale' | 182 | view_original_article: 'Orijinal makale' |
180 | re_fetch_content: 'İçeriği yenile' | 183 | re_fetch_content: 'İçeriği yenile' |
181 | delete: 'Sil' | 184 | delete: 'Sil' |
@@ -190,6 +193,7 @@ entry: | |||
190 | edit_title: 'Başlığı düzenle' | 193 | edit_title: 'Başlığı düzenle' |
191 | original_article: 'orijinal' | 194 | original_article: 'orijinal' |
192 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' | 195 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' |
196 | created_at: 'Oluşturulma tarihi' | ||
193 | new: | 197 | new: |
194 | page_title: 'Yeni makaleyi kaydet' | 198 | page_title: 'Yeni makaleyi kaydet' |
195 | placeholder: 'http://website.com' | 199 | placeholder: 'http://website.com' |
@@ -396,6 +400,7 @@ flashes: | |||
396 | notice: | 400 | notice: |
397 | entry_already_saved: 'Entry already saved on %date%' | 401 | entry_already_saved: 'Entry already saved on %date%' |
398 | entry_saved: 'Makale kaydedildi' | 402 | entry_saved: 'Makale kaydedildi' |
403 | # entry_saved_failed: 'Failed to save entry' | ||
399 | # entry_updated: 'Entry updated' | 404 | # entry_updated: 'Entry updated' |
400 | entry_reloaded: 'Makale içeriği yenilendi' | 405 | entry_reloaded: 'Makale içeriği yenilendi' |
401 | # entry_reload_failed: 'Failed to reload entry' | 406 | # entry_reload_failed: 'Failed to reload entry' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index c51f90d2..a8abe8d3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -134,7 +134,8 @@ | |||
134 | </fieldset> | 134 | </fieldset> |
135 | {% endif %} | 135 | {% endif %} |
136 | 136 | ||
137 | {{ form_rest(form.user) }} | 137 | {{ form_widget(form.user._token) }} |
138 | {{ form_widget(form.user.save) }} | ||
138 | </form> | 139 | </form> |
139 | 140 | ||
140 | <h2>{{ 'config.tab_menu.password'|trans }}</h2> | 141 | <h2>{{ 'config.tab_menu.password'|trans }}</h2> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index a2caaebf..778625ae 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -54,6 +54,11 @@ | |||
54 | </div> | 54 | </div> |
55 | 55 | ||
56 | <div class="input-field"> | 56 | <div class="input-field"> |
57 | {{ form_widget(form.isUnread) }} | ||
58 | {{ form_label(form.isUnread) }} | ||
59 | </div> | ||
60 | |||
61 | <div class="input-field"> | ||
57 | {{ form_widget(form.previewPicture) }} | 62 | {{ form_widget(form.previewPicture) }} |
58 | {{ form_label(form.previewPicture) }} | 63 | {{ form_label(form.previewPicture) }} |
59 | </div> | 64 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 5a800332..d7374dc7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -14,7 +14,7 @@ | |||
14 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> | 14 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> |
15 | <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> | 15 | <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> |
16 | <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li> | 16 | <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li> |
17 | <li><a title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span></a></li> | 17 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> |
18 | <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> | 18 | <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> |
19 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> | 19 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> |
20 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} | 20 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} |
@@ -29,6 +29,19 @@ | |||
29 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li> | 29 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li> |
30 | </ul> | 30 | </ul> |
31 | </div> | 31 | </div> |
32 | <div class="link mdi-action-today"> | ||
33 | {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} | ||
34 | </div> | ||
35 | |||
36 | <div class="link mdi-action-query-builder"> | ||
37 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | ||
38 | {% if readingTime > 0 %} | ||
39 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }} | ||
40 | {% else %} | ||
41 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | ||
42 | {% endif %} | ||
43 | </div> | ||
44 | |||
32 | {% set nbAnnotations = entry.annotations | length %} | 45 | {% set nbAnnotations = entry.annotations | length %} |
33 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 46 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
34 | <aside class="tags"> | 47 | <aside class="tags"> |
@@ -72,7 +85,7 @@ | |||
72 | $("body").css("cursor", "auto"); | 85 | $("body").css("cursor", "auto"); |
73 | });*/ | 86 | });*/ |
74 | 87 | ||
75 | // toggle favorite property of current article | 88 | // toggle starred property of current article |
76 | /* $('#setFav').click(function(){ | 89 | /* $('#setFav').click(function(){ |
77 | $("body").css("cursor", "wait"); | 90 | $("body").css("cursor", "wait"); |
78 | $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done( | 91 | $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done( |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig index eab092c7..b529a0ac 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig | |||
@@ -11,14 +11,14 @@ | |||
11 | </ul> | 11 | </ul> |
12 | <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3> | 12 | <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3> |
13 | <ul> | 13 | <ul> |
14 | <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> | 14 | <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> |
15 | <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> | 15 | <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> |
16 | </ul> | 16 | </ul> |
17 | <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3> | 17 | <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3> |
18 | <ul> | 18 | <ul> |
19 | <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li> | 19 | <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li> |
20 | <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li> | 20 | <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li> |
21 | <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li> | 21 | <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li> |
22 | </ul> | 22 | </ul> |
23 | <h3>{{ 'howto.top_menu.bookmarklet'|trans }}</h3> | 23 | <h3>{{ 'howto.top_menu.bookmarklet'|trans }}</h3> |
24 | <p> | 24 | <p> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 5a90f227..afd5b499 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -158,7 +158,7 @@ | |||
158 | {% endif %} | 158 | {% endif %} |
159 | 159 | ||
160 | {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 160 | {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
161 | {{ form_rest(form.user) }} | 161 | {{ form_widget(form.user._token) }} |
162 | </form> | 162 | </form> |
163 | </div> | 163 | </div> |
164 | 164 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 5f49062f..2110b889 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -77,7 +77,7 @@ | |||
77 | <ul class="tools links right"> | 77 | <ul class="tools links right"> |
78 | <li> | 78 | <li> |
79 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> | 79 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> |
80 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> | 80 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> |
81 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> | 81 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> |
82 | </li> | 82 | </li> |
83 | </ul> | 83 | </ul> |
@@ -126,6 +126,11 @@ | |||
126 | {{ form_label(form.isStarred) }} | 126 | {{ form_label(form.isStarred) }} |
127 | </div> | 127 | </div> |
128 | 128 | ||
129 | <div class="input-field col s6 with-checkbox"> | ||
130 | {{ form_widget(form.isUnread) }} | ||
131 | {{ form_label(form.isUnread) }} | ||
132 | </div> | ||
133 | |||
129 | <div class="col s12"> | 134 | <div class="col s12"> |
130 | <label>{{ 'entry.filters.preview_picture_help'|trans }}</label> | 135 | <label>{{ 'entry.filters.preview_picture_help'|trans }}</label> |
131 | </div> | 136 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index e89aea3a..2ee615aa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -24,8 +24,8 @@ | |||
24 | </a> | 24 | </a> |
25 | </li> | 25 | </li> |
26 | <li> | 26 | <li> |
27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
28 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> | 28 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> |
29 | </a> | 29 | </a> |
30 | </li> | 30 | </li> |
31 | <li> | 31 | <li> |
@@ -70,9 +70,9 @@ | |||
70 | </li> | 70 | </li> |
71 | 71 | ||
72 | <li class="bold hide-on-med-and-down"> | 72 | <li class="bold hide-on-med-and-down"> |
73 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 73 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
74 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> | 74 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> |
75 | <span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span> | 75 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> |
76 | </a> | 76 | </a> |
77 | <div class="collapsible-body"></div> | 77 | <div class="collapsible-body"></div> |
78 | </li> | 78 | </li> |
@@ -193,6 +193,15 @@ | |||
193 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 193 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
194 | </header> | 194 | </header> |
195 | <aside> | 195 | <aside> |
196 | <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span> | ||
197 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | ||
198 | <span class="link mdi-action-query-builder"> | ||
199 | {% if readingTime > 0 %} | ||
200 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | ||
201 | {% else %} | ||
202 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | ||
203 | {% endif %} | ||
204 | </span> | ||
196 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> | 205 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> |
197 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 206 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
198 | <div id="list"> | 207 | <div id="list"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 4354a6b7..6a177d6b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig | |||
@@ -18,17 +18,17 @@ | |||
18 | <div class="col s12"> | 18 | <div class="col s12"> |
19 | <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5> | 19 | <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5> |
20 | <ul> | 20 | <ul> |
21 | <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> | 21 | <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> |
22 | <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> | 22 | <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> |
23 | </ul> | 23 | </ul> |
24 | </div> | 24 | </div> |
25 | 25 | ||
26 | <div class="col s12"> | 26 | <div class="col s12"> |
27 | <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5> | 27 | <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5> |
28 | <ul> | 28 | <ul> |
29 | <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li> | 29 | <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li> |
30 | <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li> | 30 | <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li> |
31 | <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li> | 31 | <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li> |
32 | </ul> | 32 | </ul> |
33 | </div> | 33 | </div> |
34 | 34 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig new file mode 100644 index 00000000..7cb19966 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig | |||
@@ -0,0 +1,41 @@ | |||
1 | <footer class="page-footer cyan darken-2"> | ||
2 | <div class="container"> | ||
3 | <div class="row"> | ||
4 | <div class="col l6 s12"> | ||
5 | <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5> | ||
6 | <p class="grey-text text-lighten-4"> | ||
7 | <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.google_play }}" title="Android"> | ||
8 | <span class="icon-android"></span> | ||
9 | </a> | ||
10 | <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.ios }}" title="iOS"> | ||
11 | <span class="icon-apple"></span> | ||
12 | </a> | ||
13 | <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.firefox }}" title="Firefox"> | ||
14 | <span class="icon-firefox"></span> | ||
15 | </a> | ||
16 | <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.chrome }}" title="Chrome"> | ||
17 | <span class="icon-chrome"></span> | ||
18 | </a> | ||
19 | </p> | ||
20 | </div> | ||
21 | <div class="col l4 offset-l2 s12"> | ||
22 | <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5> | ||
23 | <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.twitter }}" title="Twitter"> | ||
24 | <span class="icon-twitter"></span> | ||
25 | </a> | ||
26 | <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.google_plus }}" title="Google+"> | ||
27 | <span class="icon-google-plus2"></span> | ||
28 | </a> | ||
29 | <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.facebook }}" title="Facebook"> | ||
30 | <span class="icon-facebook2"></span> | ||
31 | </a> | ||
32 | </div> | ||
33 | </div> | ||
34 | </div> | ||
35 | <div class="footer-copyright"> | ||
36 | <div class="container"> | ||
37 | <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> | ||
38 | <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a> | ||
39 | </div> | ||
40 | </div> | ||
41 | </footer> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 630cbd66..0573e8e5 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -123,45 +123,5 @@ | |||
123 | {% endblock %} | 123 | {% endblock %} |
124 | 124 | ||
125 | {% block footer %} | 125 | {% block footer %} |
126 | <footer class="page-footer cyan darken-2"> | 126 | {{ render(controller("WallabagCoreBundle:Footer:index")) }} |
127 | <div class="container"> | ||
128 | <div class="row"> | ||
129 | <div class="col l6 s12"> | ||
130 | <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5> | ||
131 | <p class="grey-text text-lighten-4"> | ||
132 | <a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="Android"> | ||
133 | <span class="icon-android"></span> | ||
134 | </a> | ||
135 | <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS"> | ||
136 | <span class="icon-apple"></span> | ||
137 | </a> | ||
138 | <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/firefox/addon/wallabag/" title="Firefox"> | ||
139 | <span class="icon-firefox"></span> | ||
140 | </a> | ||
141 | <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome"> | ||
142 | <span class="icon-chrome"></span> | ||
143 | </a> | ||
144 | </p> | ||
145 | </div> | ||
146 | <div class="col l4 offset-l2 s12"> | ||
147 | <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5> | ||
148 | <a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp" title="Twitter"> | ||
149 | <span class="icon-twitter"></span> | ||
150 | </a> | ||
151 | <a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts" title="Google+"> | ||
152 | <span class="icon-google-plus2"></span> | ||
153 | </a> | ||
154 | <a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag" title="Facebook"> | ||
155 | <span class="icon-facebook2"></span> | ||
156 | </a> | ||
157 | </div> | ||
158 | </div> | ||
159 | </div> | ||
160 | <div class="footer-copyright"> | ||
161 | <div class="container"> | ||
162 | <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> | ||
163 | <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a> | ||
164 | </div> | ||
165 | </div> | ||
166 | </footer> | ||
167 | {% endblock %} | 127 | {% endblock %} |