From: Jeremy Benoist Date: Fri, 19 May 2017 09:25:19 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into 2.3 X-Git-Tag: 2.3.0~31^2~91 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=4ab0d25f652bdfe184046be6d50afd594709e1a9;hp=-c Merge remote-tracking branch 'origin/master' into 2.3 --- 4ab0d25f652bdfe184046be6d50afd594709e1a9 diff --combined app/config/config.yml index 28abe734,584b0da2..73bf0a0d --- a/app/config/config.yml +++ b/app/config/config.yml @@@ -3,11 -3,6 +3,11 @@@ imports - { resource: security.yml } - { resource: services.yml } +parameters: + # Allows to use the live reload feature for changes in assets + use_webpack_dev_server: false + craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter + framework: #esi: ~ translator: @@@ -35,7 -30,7 +35,7 @@@ assets: ~ wallabag_core: - version: 2.2.2 + version: 2.2.3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' @@@ -57,10 -52,9 +57,10 @@@ reading_speed: 1 cache_lifetime: 10 action_mark_as_read: 1 - list_mode: 1 + list_mode: 0 fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. + api_limit_mass_actions: 10 wallabag_user: registration_enabled: "%fosuser_registration%" diff --combined composer.json index 02a79853,9336e801..1c58516e --- a/composer.json +++ b/composer.json @@@ -28,7 -28,7 +28,7 @@@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=5.5.9", + "php": ">=5.6.0", "ext-pcre": "*", "ext-dom": "*", "ext-curl": "*", @@@ -65,7 -65,7 +65,7 @@@ "liip/theme-bundle": "~1.1", "lexik/form-filter-bundle": "~5.0", "j0k3r/graby": "~1.0", - "friendsofsymfony/user-bundle": "2.0.x-dev", + "friendsofsymfony/user-bundle": "^2.0", "friendsofsymfony/oauth-server-bundle": "^1.5", "stof/doctrine-extensions-bundle": "^1.2", "scheb/two-factor-bundle": "~2.0", @@@ -75,7 -75,7 +75,7 @@@ "guzzlehttp/guzzle": "^5.3.1", "doctrine/doctrine-migrations-bundle": "^1.0", "paragonie/random_compat": "~1.0", - "craue/config-bundle": "~1.4", + "craue/config-bundle": "~2.0", "mnapoli/piwik-twig-extension": "^1.0", "ocramius/proxy-manager": "1.*", "white-october/pagerfanta-bundle": "^1.0", @@@ -84,7 -84,7 +84,7 @@@ "javibravo/simpleue": "^1.0", "symfony/dom-crawler": "^3.1", "friendsofsymfony/jsrouting-bundle": "^1.6", - "bdunogier/guzzle-site-authenticator": "dev-master" + "bdunogier/guzzle-site-authenticator": "1.0.0-beta1" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", @@@ -130,7 -130,7 +130,7 @@@ "config": { "bin-dir": "bin", "platform": { - "php": "5.5.9" + "php": "5.6.0" } }, "minimum-stability": "dev", diff --combined src/Wallabag/ApiBundle/Controller/EntryRestController.php index 632b16d9,54c1747c..4801811d --- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php +++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php @@@ -5,7 -5,6 +5,7 @@@ namespace Wallabag\ApiBundle\Controller use Hateoas\Configuration\Route; use Hateoas\Representation\Factory\PagerfantaFactory; use Nelmio\ApiDocBundle\Annotation\ApiDoc; +use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@@ -42,10 -41,12 +42,10 @@@ class EntryRestController extends Walla ->getRepository('WallabagCoreBundle:Entry') ->findByUrlAndUserId($url, $this->getUser()->getId()); - $results[$url] = false === $res ? false : true; + $results[$url] = $res instanceof Entry ? $res->getId() : false; } - $json = $this->get('serializer')->serialize($results, 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($results); } // let's see if it is a simple url? @@@ -59,9 -60,11 +59,9 @@@ ->getRepository('WallabagCoreBundle:Entry') ->findByUrlAndUserId($url, $this->getUser()->getId()); - $exists = false === $res ? false : true; - - $json = $this->get('serializer')->serialize(['exists' => $exists], 'json'); + $exists = $res instanceof Entry ? $res->getId() : false; - return (new JsonResponse())->setJson($json); + return $this->sendResponse(['exists' => $exists]); } /** @@@ -122,7 -125,9 +122,7 @@@ ) ); - $json = $this->get('serializer')->serialize($paginatedCollection, 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($paginatedCollection); } /** @@@ -141,7 -146,9 +141,7 @@@ $this->validateAuthentication(); $this->validateUserAccess($entry->getUser()->getId()); - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($entry); } /** @@@ -166,110 -173,6 +166,110 @@@ ->exportAs($request->attributes->get('_format')); } + /** + * Handles an entries list and delete URL. + * + * @ApiDoc( + * parameters={ + * {"name"="urls", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...'}, {'url': 'http://...'}]", "description"="Urls (as an array) to delete."} + * } + * ) + * + * @return JsonResponse + */ + public function deleteEntriesListAction(Request $request) + { + $this->validateAuthentication(); + + $urls = json_decode($request->query->get('urls', [])); + + if (empty($urls)) { + return $this->sendResponse([]); + } + + $results = []; + + // handle multiple urls + foreach ($urls as $key => $url) { + $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId( + $url, + $this->getUser()->getId() + ); + + $results[$key]['url'] = $url; + + if (false !== $entry) { + $em = $this->getDoctrine()->getManager(); + $em->remove($entry); + $em->flush(); + + // entry deleted, dispatch event about it! + $this->get('event_dispatcher')->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry)); + } + + $results[$key]['entry'] = $entry instanceof Entry ? true : false; + } + + return $this->sendResponse($results); + } + + /** + * Handles an entries list and create URL. + * + * @ApiDoc( + * parameters={ + * {"name"="urls", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...'}, {'url': 'http://...'}]", "description"="Urls (as an array) to create."} + * } + * ) + * + * @return JsonResponse + * + * @throws HttpException When limit is reached + */ + public function postEntriesListAction(Request $request) + { + $this->validateAuthentication(); + + $urls = json_decode($request->query->get('urls', [])); + $results = []; + + $limit = $this->container->getParameter('wallabag_core.api_limit_mass_actions'); + + if (count($urls) > $limit) { + throw new HttpException(400, 'API limit reached'); + } + + // handle multiple urls + if (!empty($urls)) { + foreach ($urls as $key => $url) { + $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId( + $url, + $this->getUser()->getId() + ); + + $results[$key]['url'] = $url; + + if (false === $entry) { + $entry = $this->get('wallabag_core.content_proxy')->updateEntry( + new Entry($this->getUser()), + $url + ); + } + + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + + $results[$key]['entry'] = $entry instanceof Entry ? $entry->getId() : false; + + // entry saved, dispatch event about it! + $this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry)); + } + } + + return $this->sendResponse($results); + } + /** * Create an entry. * @@@ -297,10 -200,19 +297,19 @@@ $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId()); if (false === $entry) { - $entry = $this->get('wallabag_core.content_proxy')->updateEntry( - new Entry($this->getUser()), - $url - ); + $entry = new Entry($this->getUser()); + try { + $entry = $this->get('wallabag_core.content_proxy')->updateEntry( + $entry, + $url + ); + } catch (\Exception $e) { + $this->get('logger')->error('Error while saving an entry', [ + 'exception' => $e, + 'entry' => $entry, + ]); + $entry->setUrl($url); + } } if (!is_null($title)) { @@@ -327,7 -239,9 +336,7 @@@ // entry saved, dispatch event about it! $this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry)); - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($entry); } /** @@@ -376,7 -290,9 +385,7 @@@ $em = $this->getDoctrine()->getManager(); $em->flush(); - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($entry); } /** @@@ -419,7 -335,9 +428,7 @@@ // entry saved, dispatch event about it! $this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry)); - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($entry); } /** @@@ -445,7 -363,9 +454,7 @@@ // entry deleted, dispatch event about it! $this->get('event_dispatcher')->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry)); - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($entry); } /** @@@ -464,7 -384,9 +473,7 @@@ $this->validateAuthentication(); $this->validateUserAccess($entry->getUser()->getId()); - $json = $this->get('serializer')->serialize($entry->getTags(), 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($entry->getTags()); } /** @@@ -495,7 -417,9 +504,7 @@@ $em->persist($entry); $em->flush(); - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); + return $this->sendResponse($entry); } /** @@@ -520,124 -444,7 +529,124 @@@ $em->persist($entry); $em->flush(); - $json = $this->get('serializer')->serialize($entry, 'json'); + return $this->sendResponse($entry); + } + + /** + * Handles an entries list delete tags from them. + * + * @ApiDoc( + * parameters={ + * {"name"="list", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...','tags': 'tag1, tag2'}, {'url': 'http://...','tags': 'tag1, tag2'}]", "description"="Urls (as an array) to handle."} + * } + * ) + * + * @return JsonResponse + */ + public function deleteEntriesTagsListAction(Request $request) + { + $this->validateAuthentication(); + + $list = json_decode($request->query->get('list', [])); + + if (empty($list)) { + return $this->sendResponse([]); + } + + // handle multiple urls + $results = []; + + foreach ($list as $key => $element) { + $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId( + $element->url, + $this->getUser()->getId() + ); + + $results[$key]['url'] = $element->url; + $results[$key]['entry'] = $entry instanceof Entry ? $entry->getId() : false; + + $tags = $element->tags; + + if (false !== $entry && !(empty($tags))) { + $tags = explode(',', $tags); + foreach ($tags as $label) { + $label = trim($label); + + $tag = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Tag') + ->findOneByLabel($label); + + if (false !== $tag) { + $entry->removeTag($tag); + } + } + + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + } + } + + return $this->sendResponse($results); + } + + /** + * Handles an entries list and add tags to them. + * + * @ApiDoc( + * parameters={ + * {"name"="list", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...','tags': 'tag1, tag2'}, {'url': 'http://...','tags': 'tag1, tag2'}]", "description"="Urls (as an array) to handle."} + * } + * ) + * + * @return JsonResponse + */ + public function postEntriesTagsListAction(Request $request) + { + $this->validateAuthentication(); + + $list = json_decode($request->query->get('list', [])); + + if (empty($list)) { + return $this->sendResponse([]); + } + + $results = []; + + // handle multiple urls + foreach ($list as $key => $element) { + $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId( + $element->url, + $this->getUser()->getId() + ); + + $results[$key]['url'] = $element->url; + $results[$key]['entry'] = $entry instanceof Entry ? $entry->getId() : false; + + $tags = $element->tags; + + if (false !== $entry && !(empty($tags))) { + $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags); + + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + } + } + + return $this->sendResponse($results); + } + + /** + * Shortcut to send data serialized in json. + * + * @param mixed $data + * + * @return JsonResponse + */ + private function sendResponse($data) + { + $json = $this->get('serializer')->serialize($data, 'json'); return (new JsonResponse())->setJson($json); } diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 57319af7,67421942..1bd0b8fd --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@@ -110,7 -110,6 +110,7 @@@ config # annotations: Remove ALL annotations # tags: Remove ALL tags # entries: Remove ALL entries + # archived: Remove ALL archived entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: # description: "You can change your password here. Your new password should by at least 8 characters long." @@@ -155,7 -154,7 +155,7 @@@ # or: 'One rule OR another' # and: 'One rule AND another' # matches: 'Tests that a subject is matches a search (case-insensitive).
Example: title matches "football"' - + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: # unread: 'Unread entries' @@@ -215,7 -214,7 +215,7 @@@ # share_email_label: 'Email' # public_link: 'public link' # delete_public_link: 'delete public link' - download: 'Download' + # export: 'Export' # print: 'Print' problem: label: 'Problemer?' @@@ -224,8 -223,6 +224,8 @@@ original_article: 'original' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' created_at: 'Oprettelsesdato' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'Gem ny artikel' placeholder: 'http://website.com' @@@ -237,6 -234,7 +237,6 @@@ # page_title: 'Edit an entry' # title_label: 'Title' url_label: 'Url' - # is_public_label: 'Public' save_label: 'Gem' public: # shared_by_wallabag: "This article has been shared by wallabag" @@@ -512,8 -510,6 +512,8 @@@ user # delete: Delete # delete_confirm: Are you sure? # back_to_list: Back to list + search: + # placeholder: Filter by username or email error: # page_title: An error occurred @@@ -532,7 -528,6 +532,7 @@@ flashes # annotations_reset: Annotations reset # tags_reset: Tags reset # entries_reset: Entries reset + # archived_reset: Archived entries deleted entry: notice: # entry_already_saved: 'Entry already saved on %date%' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index a7bcecc6,35cb4b5b..94bb3295 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@@ -110,7 -110,6 +110,7 @@@ config annotations: Entferne ALLE Annotationen tags: Entferne ALLE Tags entries: Entferne ALLE Einträge + # archived: Remove ALL archived entries confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) form_password: description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten." @@@ -155,7 -154,6 +155,7 @@@ or: 'Eine Regel ODER die andere' and: 'Eine Regel UND eine andere' matches: 'Testet, ob eine Variable auf eine Suche zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).
Beispiel: title matches "Fußball"' + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'E-Mail' public_link: 'Öffentlicher Link' delete_public_link: 'Lösche öffentlichen Link' - download: 'Herunterladen' + export: 'Exportieren' print: 'Drucken' problem: label: 'Probleme?' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'original' annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen' created_at: 'Erstellungsdatum' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'Neuen Artikel speichern' placeholder: 'https://website.de' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'Eintrag bearbeiten' title_label: 'Titel' url_label: 'URL' - is_public_label: 'Öffentlich' save_label: 'Speichern' public: shared_by_wallabag: "Dieser Artikel wurde mittels wallabag geteilt" @@@ -513,8 -510,6 +513,8 @@@ user delete: Löschen delete_confirm: Bist du sicher? back_to_list: Zurück zur Liste + search: + # placeholder: Filter by username or email error: page_title: Ein Fehler ist aufgetreten @@@ -533,7 -528,6 +533,7 @@@ flashes annotations_reset: Anmerkungen zurücksetzen tags_reset: Tags zurücksetzen entries_reset: Einträge zurücksetzen + # archived_reset: Archived entries deleted entry: notice: entry_already_saved: 'Eintrag bereits am %date% gespeichert' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 1ef2874d,e0ef3212..3a006a0e --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@@ -110,7 -110,6 +110,7 @@@ config annotations: Remove ALL annotations tags: Remove ALL tags entries: Remove ALL entries + archived: Remove ALL archived entries confirm: Are you really sure? (THIS CAN'T BE UNDONE) form_password: description: "You can change your password here. Your new password should by at least 8 characters long." @@@ -155,7 -154,6 +155,7 @@@ or: 'One rule OR another' and: 'One rule AND another' matches: 'Tests that a subject is matches a search (case-insensitive).
Example: title matches "football"' + notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'Email' public_link: 'public link' delete_public_link: 'delete public link' - download: 'Download' + export: 'Export' print: 'Print' problem: label: 'Problems?' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'original' annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' created_at: 'Creation date' + published_at: 'Publication date' + published_by: 'Published by' new: page_title: 'Save new entry' placeholder: 'http://website.com' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'Edit an entry' title_label: 'Title' url_label: 'Url' - is_public_label: 'Public' save_label: 'Save' public: shared_by_wallabag: "This article has been shared by wallabag" @@@ -513,8 -510,6 +513,8 @@@ user delete: Delete delete_confirm: Are you sure? back_to_list: Back to list + search: + placeholder: Filter by username or email error: page_title: An error occurred @@@ -533,7 -528,6 +533,7 @@@ flashes annotations_reset: Annotations reset tags_reset: Tags reset entries_reset: Entries reset + archived_reset: Archived entries deleted entry: notice: entry_already_saved: 'Entry already saved on %date%' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 6cd079b0,2f769b7e..ca5d9b2c --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@@ -110,7 -110,6 +110,7 @@@ config annotations: Eliminar TODAS las anotaciones tags: Eliminar TODAS las etiquetas entries: Eliminar TODOS los artículos + # archived: Remove ALL archived entries confirm: ¿Estás completamente seguro? (NO SE PUEDE DESHACER) form_password: description: "Puedes cambiar la contraseña aquí. Tu nueva contraseña debe tener al menos 8 caracteres." @@@ -155,7 -154,6 +155,7 @@@ or: 'Una regla U otra' and: 'Una regla Y la otra' matches: 'Prueba si un sujeto corresponde a una búsqueda (insensible a mayusculas).
Ejemplo : title matches "fútbol"' + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'e-mail' public_link: 'enlace público' delete_public_link: 'eliminar enlace público' - download: 'Descargar' + export: 'Exportar' print: 'Imprimir' problem: label: '¿Algún problema?' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'original' annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones' created_at: 'Fecha de creación' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'Guardar un nuevo artículo' placeholder: 'http://sitioweb.com' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'Editar un artículo' title_label: 'Título' url_label: 'URL' - is_public_label: 'Es público' save_label: 'Guardar' public: shared_by_wallabag: "Este artículo se ha compartido con wallabag" @@@ -513,8 -510,6 +513,8 @@@ user delete: Eliminar delete_confirm: ¿Estás seguro? back_to_list: Volver a la lista + search: + # placeholder: Filter by username or email error: page_title: Ha ocurrido un error @@@ -533,7 -528,6 +533,7 @@@ flashes annotations_reset: Anotaciones reiniciadas tags_reset: Etiquetas reiniciadas entries_reset: Artículos reiniciados + # archived_reset: Archived entries deleted entry: notice: entry_already_saved: 'Artículo ya guardado el %fecha%' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index fb6e315e,d9d76b32..ecd8f64d --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@@ -110,7 -110,6 +110,7 @@@ config # annotations: Remove ALL annotations # tags: Remove ALL tags # entries: Remove ALL entries + # archived: Remove ALL archived entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: # description: "You can change your password here. Your new password should by at least 8 characters long." @@@ -155,7 -154,6 +155,7 @@@ # or: 'One rule OR another' # and: 'One rule AND another' # matches: 'Tests that a subject is matches a search (case-insensitive).
Example: title matches "football"' + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'نشانی ایمیل' # public_link: 'public link' # delete_public_link: 'delete public link' - download: 'بارگیری' + export: 'بارگیری' print: 'چاپ' problem: label: 'مشکلات؟' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'اصلی' annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' created_at: 'زمان ساخت' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'ذخیرهٔ مقالهٔ تازه' placeholder: 'http://website.com' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'ویرایش مقاله' title_label: 'عنوان' url_label: 'نشانی' - is_public_label: 'عمومی' save_label: 'ذخیره' public: # shared_by_wallabag: "This article has been shared by wallabag" @@@ -513,8 -510,6 +513,8 @@@ user # delete: Delete # delete_confirm: Are you sure? # back_to_list: Back to list + search: + # placeholder: Filter by username or email error: # page_title: An error occurred @@@ -533,7 -528,6 +533,7 @@@ flashes # annotations_reset: Annotations reset # tags_reset: Tags reset # entries_reset: Entries reset + # archived_reset: Archived entries deleted entry: notice: entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index ad886363,efddc46a..84706459 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@@ -46,7 -46,7 +46,7 @@@ footer social: "Social" powered_by: "propulsé par" about: "À propos" - stats: Depuis le %user_creation%, vous avez lu %nb_archives% articles. Ce qui fait %per_day% par jour ! + stats: "Depuis le %user_creation%, vous avez lu %nb_archives% articles. Ce qui fait %per_day% par jour !" config: page_title: "Configuration" @@@ -71,16 -71,16 +71,16 @@@ 300_word: "Je lis environ 300 mots par minute" 400_word: "Je lis environ 400 mots par minute" action_mark_as_read: - label: 'Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?' - redirect_homepage: "À la page d'accueil" - redirect_current_page: 'À la page courante' - pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données - android_configuration: Configurez votre application Android - help_theme: "L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème que vous préférez." - help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page." + label: "Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?" + redirect_homepage: "À la page d’accueil" + redirect_current_page: "À la page courante" + pocket_consumer_key_label: "Clé d’authentification Pocket pour importer les données" + android_configuration: "Configurez votre application Android" + help_theme: "L’affichage de wallabag est personnalisable. C’est ici que vous choisissez le thème que vous préférez." + help_items_per_page: "Vous pouvez définir le nombre d’articles affichés sur chaque page." help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article." - help_language: "Vous pouvez définir la langue de l'interface de wallabag." - help_pocket_consumer_key: "Nécessaire pour l'import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket." + help_language: "Vous pouvez définir la langue de l’interface de wallabag." + help_pocket_consumer_key: "Nécessaire pour l’import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket." form_rss: description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton." token_label: "Jeton RSS" @@@ -100,18 -100,17 +100,18 @@@ twoFactorAuthentication_label: "Double authentification" help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email." delete: - title: Supprimer mon compte (attention danger !) - description: Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c'est IRRÉVERSIBLE). Vous serez ensuite déconnecté. - confirm: Vous êtes vraiment sûr ? (C'EST IRRÉVERSIBLE) - button: 'Supprimer mon compte' + title: "Supprimer mon compte (attention danger !)" + description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté." + confirm: "Vous êtes vraiment sûr ? (C’EST IRRÉVERSIBLE)" + button: "Supprimer mon compte" reset: - title: Réinitialisation (attention danger !) - description: En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES ! - annotations: Supprimer TOUTES les annotations - tags: Supprimer TOUS les tags - entries: Supprimer TOUS les articles - confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE) + title: "Réinitialisation (attention danger !)" + description: "En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES !" + annotations: "Supprimer TOUTES les annotations" + tags: "Supprimer TOUS les tags" + entries: "Supprimer TOUS les articles" + archived: "Supprimer TOUS les articles archivés" + confirm: "Êtes-vous vraiment vraiment sûr ? (C’EST IRRÉVERSIBLE)" form_password: description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères." old_password_label: "Mot de passe actuel" @@@ -155,7 -154,6 +155,7 @@@ or: "Une règle OU l’autre" and: "Une règle ET l’autre" matches: "Teste si un sujet correspond à une recherche (non sensible à la casse).
Exemple : title matches \"football\"" + notmatches: "Teste si un sujet ne correspond pas à une recherche (non sensible à la casse).
Exemple : title notmatches \"football\"" entry: page_titles: @@@ -164,7 -162,7 +164,7 @@@ archived: "Articles lus" filtered: "Articles filtrés" filtered_tags: "Articles filtrés par tags :" - filtered_search: 'Articles filtrés par recherche :' + filtered_search: "Articles filtrés par recherche :" untagged: "Article sans tag" list: number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." @@@ -188,7 -186,7 +188,7 @@@ preview_picture_label: "A une photo" preview_picture_help: "Photo" language_label: "Langue" - http_status_label: 'Statut HTTP' + http_status_label: "Statut HTTP" reading_time: label: "Durée de lecture en minutes" from: "de" @@@ -216,7 -214,7 +216,7 @@@ share_email_label: "Courriel" public_link: "Lien public" delete_public_link: "Supprimer le lien public" - download: "Télécharger" + export: "Exporter" print: "Imprimer" problem: label: "Un problème ?" @@@ -225,8 -223,6 +225,8 @@@ original_article: "original" annotations_on_the_entry: "{0} Aucune annotation|{1} Une annotation|]1,Inf[ %count% annotations" created_at: "Date de création" + published_at: "Date de publication" + published_by: "Publié par" new: page_title: "Sauvegarder un nouvel article" placeholder: "http://website.com" @@@ -238,6 -234,7 +238,6 @@@ page_title: "Éditer un article" title_label: "Titre" url_label: "Adresse" - is_public_label: "Public" save_label: "Enregistrer" public: shared_by_wallabag: "Cet article a été partagé par wallabag" @@@ -298,32 -295,32 +298,32 @@@ howto bookmarklet: description: "Glissez et déposez ce lien dans votre barre de favoris :" shortcuts: - page_description: Voici les raccourcis disponibles dans wallabag. - shortcut: Raccourci - action: Action - all_pages_title: Raccourcis disponibles dans toutes les pages - go_unread: Afficher les articles non lus - go_starred: Afficher les articles favoris - go_archive: Afficher les articles lus - go_all: Afficher tous les articles - go_tags: Afficher les tags - go_config: Aller à la configuration - go_import: Aller aux imports - go_developers: Aller à la section Développeurs - go_howto: Afficher l'aide (cette page !) - go_logout: Se déconnecter - list_title: Raccourcis disponibles dans les pages de liste - search: Afficher le formulaire de recherche - article_title: Raccourcis disponibles quand on affiche un article - open_original: Ouvrir l'URL originale de l'article - toggle_favorite: Changer le statut Favori de l'article - toggle_archive: Changer le status Lu de l'article - delete: Supprimer l'article - material_title: Raccourcis disponibles avec le thème Material uniquement - add_link: Ajouter un nouvel article - hide_form: Masquer le formulaire courant (recherche ou nouvel article) - arrows_navigation: Naviguer à travers les articles - open_article: Afficher l'article sélectionné + page_description: "Voici les raccourcis disponibles dans wallabag." + shortcut: "Raccourci" + action: "Action" + all_pages_title: "Raccourcis disponibles dans toutes les pages" + go_unread: "Afficher les articles non lus" + go_starred: "Afficher les articles favoris" + go_archive: "Afficher les articles lus" + go_all: "Afficher tous les articles" + go_tags: "Afficher les tags" + go_config: "Aller à la configuration" + go_import: "Aller aux imports" + go_developers: "Aller à la section Développeurs" + go_howto: "Afficher l’aide (cette page !)" + go_logout: "Se déconnecter" + list_title: "Raccourcis disponibles dans les pages de liste" + search: "Afficher le formulaire de recherche" + article_title: "Raccourcis disponibles quand on affiche un article" + open_original: "Ouvrir l’URL originale de l’article" + toggle_favorite: "Changer le statut Favori de l’article" + toggle_archive: "Changer le status Lu de l’article" + delete: "Supprimer l’article" + material_title: "Raccourcis disponibles avec le thème Material uniquement" + add_link: "Ajouter un nouvel article" + hide_form: "Masquer le formulaire courant (recherche ou nouvel article)" + arrows_navigation: "Naviguer à travers les articles" + open_article: "Afficher l’article sélectionné" quickstart: page_title: "Pour bien débuter" @@@ -385,8 -382,8 +385,8 @@@ tag number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags." see_untagged_entries: "Voir les articles sans tag" new: - add: 'Ajouter' - placeholder: 'Vous pouvez ajouter plusieurs tags, séparés par une virgule.' + add: "Ajouter" + placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." import: page_title: "Importer" @@@ -420,7 -417,7 +420,7 @@@ how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l’importer." worker: enabled: "Les imports sont asynchrones. Une fois l’import commencé un worker externe traitera les messages un par un. Le service activé est :" - download_images_warning: "Vous avez configuré le téléchagement des images pour vos articles. Combiné à l'import classique, cette opération peut être très très longue (voire échouer). Nous vous conseillons vivement d'activer les imports asynchrones." + download_images_warning: "Vous avez configuré le téléchagement des images pour vos articles. Combiné à l’import classique, cette opération peut être très très longue (voire échouer). Nous vous conseillons vivement d’activer les imports asynchrones." firefox: page_title: "Import > Firefox" description: "Cet outil va vous permettre d’importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde… ». Vous allez récupérer un fichier .json.

" @@@ -489,16 -486,16 +489,16 @@@ developer back: "Retour" user: - page_title: Gestion des utilisateurs - new_user: Créer un nouvel utilisateur - edit_user: Éditer un utilisateur existant - description: Ici vous pouvez gérer vos utilisateurs (création, mise à jour et suppression) + page_title: "Gestion des utilisateurs" + new_user: "Créer un nouvel utilisateur" + edit_user: "Éditer un utilisateur existant" + description: "Ici vous pouvez gérer vos utilisateurs (création, mise à jour et suppression)" list: - actions: Actions - edit_action: Éditer - yes: Oui - no: Non - create_new_one: Créer un nouvel utilisateur + actions: "Actions" + edit_action: "Éditer" + yes: "Oui" + no: "Non" + create_new_one: "Créer un nouvel utilisateur" form: username_label: "Nom d’utilisateur" name_label: "Nom" @@@ -513,11 -510,9 +513,11 @@@ delete: "Supprimer" delete_confirm: "Voulez-vous vraiment ?" back_to_list: "Revenir à la liste" + search: + placeholder: "Filtrer par nom d’utilisateur ou email" error: - page_title: Une erreur est survenue + page_title: "Une erreur est survenue" flashes: config: @@@ -530,10 -525,9 +530,10 @@@ tagging_rules_updated: "Règles mises à jour" tagging_rules_deleted: "Règle supprimée" rss_token_updated: "Jeton RSS mis à jour" - annotations_reset: Annotations supprimées - tags_reset: Tags supprimés - entries_reset: Articles supprimés + annotations_reset: "Annotations supprimées" + tags_reset: "Tags supprimés" + entries_reset: "Articles supprimés" + archived_reset: "Articles archivés supprimés" entry: notice: entry_already_saved: "Article déjà sauvegardé le %date%" @@@ -565,6 -559,6 +565,6 @@@ client_deleted: "Client %name% supprimé" user: notice: - added: 'Utilisateur "%username%" ajouté' - updated: 'Utilisateur "%username%" mis à jour' - deleted: 'Utilisateur "%username%" supprimé' + added: "Utilisateur \"%username%\" ajouté" + updated: "Utilisateur \"%username%\" mis à jour" + deleted: "Utilisateur \"%username%\" supprimé" diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 5a9605ff,3f7c7010..a8baa96f --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@@ -110,7 -110,6 +110,7 @@@ config # annotations: Remove ALL annotations # tags: Remove ALL tags # entries: Remove ALL entries + # archived: Remove ALL archived entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: # description: "You can change your password here. Your new password should by at least 8 characters long." @@@ -155,7 -154,6 +155,7 @@@ or: "Una regola O un'altra" and: "Una regola E un'altra" matches: 'Verifica che un oggetto risulti in una ricerca (case-insensitive).
Esempio: titolo contiene "football"' + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'E-mail' # public_link: 'public link' # delete_public_link: 'delete public link' - download: 'Download' + export: 'Esporta' print: 'Stampa' problem: label: 'Problemi?' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'originale' annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni' created_at: 'Data di creazione' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'Salva un nuovo contenuto' placeholder: 'http://website.com' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'Modifica voce' title_label: 'Titolo' url_label: 'Url' - is_public_label: 'Pubblico' save_label: 'Salva' public: # shared_by_wallabag: "This article has been shared by wallabag" @@@ -513,8 -510,6 +513,8 @@@ user # delete: Delete # delete_confirm: Are you sure? # back_to_list: Back to list + search: + # placeholder: Filter by username or email error: # page_title: An error occurred @@@ -533,7 -528,6 +533,7 @@@ flashes # annotations_reset: Annotations reset # tags_reset: Tags reset # entries_reset: Entries reset + # archived_reset: Archived entries deleted entry: notice: entry_already_saved: 'Contenuto già salvato in data %date%' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 5e983488,913e3bcb..8f39ce05 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@@ -110,7 -110,6 +110,7 @@@ config annotations: Levar TOTAS las anotacions tags: Levar TOTAS las etiquetas entries: Levar TOTES los articles + archived: Levar TOTES los articles archivats confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) form_password: description: "Podètz cambiar vòstre senhal aquí. Vòstre senhal deu èsser long d'almens 8 caractèrs." @@@ -154,8 -153,7 +154,8 @@@ not_equal_to: 'Diferent de…' or: "Una règla O l'autra" and: "Una règla E l'autra" - matches: 'Teste se un subjècte correspond a una recerca (non sensibla a la cassa).
Exemple : title matches \"football\"' + matches: 'Teste se un subjècte correspond a una recèrca (non sensibla a la cassa).
Exemple : title matches \"football\"' + notmatches: 'Teste se subjècte correspond pas a una recèrca (sensibla a la cassa).
Example : title notmatches "football"' entry: page_titles: @@@ -185,8 -183,8 +185,8 @@@ archived_label: 'Legits' starred_label: 'Favorits' unread_label: 'Pas legits' - preview_picture_label: 'A una fotò' - preview_picture_help: 'Fotò' + preview_picture_label: 'A un imatge' + preview_picture_help: 'Imatge' language_label: 'Lenga' http_status_label: 'Estatut HTTP' reading_time: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'Corrièl' public_link: 'ligam public' delete_public_link: 'suprimir lo ligam public' - download: 'Telecargar' + export: 'Exportar' print: 'Imprimir' problem: label: 'Un problèma ?' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'original' annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %count% anotacions" created_at: 'Data de creacion' + published_at: 'Data de publicacion' + published_by: 'Publicat per' new: page_title: 'Enregistrar un novèl article' placeholder: 'http://website.com' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'Modificar un article' title_label: 'Títol' url_label: 'Url' - is_public_label: 'Public' save_label: 'Enregistrar' public: shared_by_wallabag: "Aqueste article es estat partejat per wallabag" @@@ -344,8 -341,8 +344,8 @@@ quickstart new_user: 'Crear un novèl utilizaire' analytics: 'Configurar las estadisticas' sharing: 'Activar de paramètres de partatge' - export: 'Configurar los expòrt' - import: 'Configurar los impòrt' + export: 'Configurar los expòrts' + import: 'Configurar los impòrts' first_steps: title: 'Primièrs passes' description: "Ara wallabag es ben configurat, es lo moment d'archivar lo web. Podètz clicar sul signe + a man drecha amont per ajustar un ligam." @@@ -461,7 -458,7 +461,7 @@@ developer action: 'Suprimir aqueste client' client: page_title: 'Gestion dels clients API > Novèl client' - page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion." + page_description: "Anatz crear un novèl client. Mercés de garnir l'url de redireccion cap a vòstra aplicacion." form: name_label: "Nom del client" redirect_uris_label: 'URLs de redireccion' @@@ -472,7 -469,7 +472,7 @@@ page_description: 'Vaquí los paramètres de vòstre client.' field_name: 'Nom del client' field_id: 'ID Client' - field_secret: 'Clau secreta' + field_secret: 'Clau secrèta' back: 'Retour' read_howto: 'Legir "cossí crear ma primièra aplicacion"' howto: @@@ -513,8 -510,6 +513,8 @@@ user delete: 'Suprimir' delete_confirm: 'Sètz segur ?' back_to_list: 'Tornar a la lista' + search: + placeholder: "Filtrar per nom d'utilizaire o corrièl" error: page_title: Una error s'es produsida @@@ -533,7 -528,6 +533,7 @@@ flashes annotations_reset: Anotacions levadas tags_reset: Etiquetas levadas entries_reset: Articles levats + archived_reset: Articles archivat suprimits entry: notice: entry_already_saved: 'Article ja salvargardat lo %date%' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index fea90440,b990a6b9..a6e0c10f --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@@ -110,7 -110,6 +110,7 @@@ config annotations: Usuń WSZYSTKIE adnotacje tags: Usuń WSZYSTKIE tagi entries: usuń WSZYTSTKIE wpisy + # archived: Remove ALL archived entries confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) form_password: description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków." @@@ -155,7 -154,6 +155,7 @@@ or: 'Jedna reguła LUB inna' and: 'Jedna reguła I inna' matches: 'Sprawdź czy temat pasuje szukaj (duże lub małe litery).
Przykład: tytuł zawiera "piłka nożna"' + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'Adres email' public_link: 'Publiczny link' delete_public_link: 'Usuń publiczny link' - download: 'Pobierz' + export: 'Export' print: 'Drukuj' problem: label: 'Problemy' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'oryginalny' annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji' created_at: 'Czas stworzenia' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'Zapisz nowy wpis' placeholder: 'http://website.com' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'Edytuj wpis' title_label: 'Tytuł' url_label: 'Adres URL' - is_public_label: 'Publiczny' save_label: 'Zapisz' public: shared_by_wallabag: "Ten artykuł został udostępniony przez wallabag" @@@ -513,8 -510,6 +513,8 @@@ user delete: Usuń delete_confirm: Jesteś pewien? back_to_list: Powrót do listy + search: + # placeholder: Filter by username or email error: page_title: Wystąpił błąd @@@ -533,7 -528,6 +533,7 @@@ flashes annotations_reset: Zresetuj adnotacje tags_reset: Zresetuj tagi entries_reset: Zresetuj wpisy + # archived_reset: Archived entries deleted entry: notice: entry_already_saved: 'Wpis już został dodany %date%' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index c59991f8,fd87ca44..a9473591 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@@ -110,7 -110,6 +110,7 @@@ config # annotations: Remove ALL annotations # tags: Remove ALL tags # entries: Remove ALL entries + # archived: Remove ALL archived entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: # description: "You can change your password here. Your new password should by at least 8 characters long." @@@ -155,7 -154,6 +155,7 @@@ or: 'Uma regra OU outra' and: 'Uma regra E outra' matches: 'Testa que um assunto corresponde a uma pesquisa (maiúscula ou minúscula).
Exemplo: título corresponde a "futebol"' + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'E-mail' public_link: 'link público' delete_public_link: 'apagar link público' - download: 'Download' + export: 'Exportar' print: 'Imprimir' problem: label: 'Problemas?' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'original' annotations_on_the_entry: '{0} Sem anotações|{1} Uma anotação|]1,Inf[ %nbAnnotations% anotações' created_at: 'Data de criação' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'Salvar nova entrada' placeholder: 'http://website.com' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'Editar uma entrada' title_label: 'Título' url_label: 'Url' - is_public_label: 'Público' save_label: 'Salvar' public: shared_by_wallabag: "Este artigo foi compartilhado pelo wallabag" @@@ -513,8 -510,6 +513,8 @@@ user delete: 'Apagar' delete_confirm: 'Tem certeza?' back_to_list: 'Voltar para a lista' + search: + # placeholder: Filter by username or email error: # page_title: An error occurred @@@ -533,7 -528,6 +533,7 @@@ flashes # annotations_reset: Annotations reset # tags_reset: Tags reset # entries_reset: Entries reset + # archived_reset: Archived entries deleted entry: notice: entry_already_saved: 'Entrada já foi salva em %date%' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 5846b7cc,14954b53..80d78a01 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@@ -110,7 -110,6 +110,7 @@@ config # annotations: Remove ALL annotations # tags: Remove ALL tags # entries: Remove ALL entries + # archived: Remove ALL archived entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: # description: "You can change your password here. Your new password should by at least 8 characters long." @@@ -155,7 -154,6 +155,7 @@@ # or: 'One rule OR another' # and: 'One rule AND another' # matches: 'Tests that a subject is matches a search (case-insensitive).
Example: title matches "football"' + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'E-mail' # public_link: 'public link' # delete_public_link: 'delete public link' - download: 'Descarcă' + export: 'Descarcă' # print: 'Print' problem: label: 'Probleme?' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'original' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' created_at: 'Data creării' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'Salvează un nou articol' placeholder: 'http://website.com' @@@ -238,6 -234,7 +238,6 @@@ # page_title: 'Edit an entry' # title_label: 'Title' url_label: 'Url' - # is_public_label: 'Public' save_label: 'Salvează' public: # shared_by_wallabag: "This article has been shared by wallabag" @@@ -513,8 -510,6 +513,8 @@@ user # delete: Delete # delete_confirm: Are you sure? # back_to_list: Back to list + search: + # placeholder: Filter by username or email error: # page_title: An error occurred @@@ -533,7 -528,6 +533,7 @@@ flashes # annotations_reset: Annotations reset # tags_reset: Tags reset # entries_reset: Entries reset + # archived_reset: Archived entries deleted entry: notice: # entry_already_saved: 'Entry already saved on %date%' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 430fb96b,778a5515..2896c823 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@@ -110,7 -110,6 +110,7 @@@ config # annotations: Remove ALL annotations # tags: Remove ALL tags # entries: Remove ALL entries + # archived: Remove ALL archived entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: # description: "You can change your password here. Your new password should by at least 8 characters long." @@@ -155,7 -154,6 +155,7 @@@ or: 'Bir kural veya birbaşkası' and: 'Bir kural ve diğeri' # matches: 'Tests that a subject is matches a search (case-insensitive).
Example: title matches "football"' + # notmatches: 'Tests that a subject is not matches a search (case-insensitive).
Example: title notmatches "football"' entry: page_titles: @@@ -216,7 -214,7 +216,7 @@@ share_email_label: 'E-posta' # public_link: 'public link' # delete_public_link: 'delete public link' - download: 'İndir' + export: 'Dışa Aktar' # print: 'Print' problem: label: 'Bir sorun mu var?' @@@ -225,8 -223,6 +225,8 @@@ original_article: 'orijinal' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' created_at: 'Oluşturulma tarihi' + # published_at: 'Publication date' + # published_by: 'Published by' new: page_title: 'Yeni makaleyi kaydet' placeholder: 'http://website.com' @@@ -238,6 -234,7 +238,6 @@@ page_title: 'Makaleyi düzenle' title_label: 'Başlık' url_label: 'Url' - is_public_label: 'Herkes tarafından erişime açık olsun mu?' save_label: 'Kaydet' public: # shared_by_wallabag: "This article has been shared by wallabag" @@@ -513,8 -510,6 +513,8 @@@ user # delete: Delete # delete_confirm: Are you sure? # back_to_list: Back to list + search: + # placeholder: Filter by username or email error: # page_title: An error occurred @@@ -533,7 -528,6 +533,7 @@@ flashes # annotations_reset: Annotations reset # tags_reset: Tags reset # entries_reset: Entries reset + # archived_reset: Archived entries deleted entry: notice: entry_already_saved: 'Entry already saved on %date%' diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 47e6e8c3,af53084f..58e08cbc --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@@ -11,11 -11,6 +11,11 @@@ @@@ -125,43 -125,39 +125,43 @@@ {% endif %} {% if craue_setting('share_shaarli') %}
  • - - + shaarli
    • {% endif %} + {% if craue_setting('share_scuttle') %} +
  • + + scuttle + +
    • + {% endif %} {% if craue_setting('share_diaspora') %}
  • - - + diaspora*
    • {% endif %} {% if craue_setting('share_unmark') %}
  • - - + unmark.it
    • {% endif %} {% if craue_setting('carrot') %}
  • - - + Carrot
    • {% endif %} {% if craue_setting('share_mail') %}
  • - + mail {{ 'entry.view.left_menu.share_email_label'|trans }}
    • @@@ -183,7 -179,7 +183,7 @@@
  • file_download - {{ 'entry.view.left_menu.download'|trans }} + {{ 'entry.view.left_menu.export'|trans }}
      @@@ -216,48 -212,32 +216,48 @@@

      {{ entry.title|striptags|raw }} ✎