diff --git a/.travis.yml b/.travis.yml index 69b4f9198..65e7e3047 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 - nightly - - hhvm node_js: - "5" @@ -37,15 +37,32 @@ env: matrix: fast_finish: true include: + # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency + - php: hhvm-3.12 + sudo: required + dist: trusty + group: edge + env: DB=mysql + addons: + apt: + packages: + - mysql-server-5.6 + - mysql-client-core-5.6 + - mysql-client-5.6 + services: + - mysql + - php: hhvm-3.12 + sudo: required + dist: trusty + group: edge + env: DB=sqlite - php: 7.0 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild - php: 7.0 env: DB=sqlite ASSETS=build - exclude: - - php: hhvm - env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency allow_failures: - - php: hhvm + - php: hhvm-3.12 + - php: nightly # exclude v1 branches branches: @@ -53,9 +70,11 @@ branches: - legacy before_script: - - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; - - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; - - if [ "$TRAVIS_PHP_VERSION" = "5.5" ]; then composer require "phpunit/phpunit:4.*" --no-update; fi; + - PHP=$TRAVIS_PHP_VERSION + - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; + # xdebug isn't enable for PHP 7.1 + - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi + - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi; - composer self-update --no-progress - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; diff --git a/.zappr.yaml b/.zappr.yaml new file mode 100644 index 000000000..f90cd8096 --- /dev/null +++ b/.zappr.yaml @@ -0,0 +1,26 @@ +# see https://zappr.opensource.zalan.do/ +autobranch: false +commit: false +approvals: + minimum: 1 + ignore: pr_opener + pattern: "^(:\\+1:|👍)$" + veto: + pattern: "^(:\\-1:|👎)$" + from: + orgs: + - wallabag + collaborators: true +specification: + title: + minimum-length: + enabled: true + length: 8 + body: + minimum-length: + enabled: true + length: 8 + contains-url: false + contains-issue-number: false + template: + differs-from-body: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 97245c68c..a6f7e168d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,39 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [2.0.7] - 2016-08-22 + +### Added + +- [#2222](https://github.com/wallabag/wallabag/pull/2222) Added creation date and reading time on article view (Nicolas Lœuillet) +- [#2134](https://github.com/wallabag/wallabag/pull/2134) Run tests on an uptodate HHVM (Jeremy Benoist) + +### Changed + +- [#2221](https://github.com/wallabag/wallabag/pull/2221) Replaced favorite word/icon with star one (Nicolas Lœuillet) + +### Fixed + +- [#2224](https://github.com/wallabag/wallabag/pull/2224) Avoid breaking import when fetching fail (Jeremy Benoist) +- [#2216](https://github.com/wallabag/wallabag/pull/2216), [#2220](https://github.com/wallabag/wallabag/pull/2220) Enable CORS headers for OAUTH part (Rurik19) +- [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (Nicolas Lœuillet) + +## [2.0.6] - 2016-08-10 + +### Changed + +- [#2199](https://github.com/wallabag/wallabag/pull/2199) Handling socials links into a config file (Simon Alberny) +- [#2172](https://github.com/wallabag/wallabag/pull/2172) Change the way to login user in tests (Jeremy Benoist) +- [#2155](https://github.com/wallabag/wallabag/pull/2155) Use friendsofphp instead of fabpot for PHP CS Fixer (Jeremy Benoist) + +### Fixed + +- [#2200](https://github.com/wallabag/wallabag/pull/2200) Fixed typo in entry:notice:entry_saved (charno6) +- [#2185](https://github.com/wallabag/wallabag/pull/2185) Fix 3rd-Party Apps links (Chrome & Firefox) (Thomas Citharel) +- [#2165](https://github.com/wallabag/wallabag/pull/2165) Fix a few french translations typos (Thomas Citharel) +- [#2157](https://github.com/wallabag/wallabag/pull/2157) Handle only upper or only lower reading filter (Jeremy Benoist) +- [#2156](https://github.com/wallabag/wallabag/pull/2156) Try to find bad redirection after delete (Jeremy Benoist) + ## [2.0.5] - 2016-05-31 ### Added diff --git a/README.md b/README.md index 0d87d7bb3..6053e6d9e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag) -[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master) [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag) # What is wallabag? @@ -16,7 +16,7 @@ Then you can install wallabag by executing the following commands: ``` git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.5 + git checkout 2.0.7 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod php bin/console server:run --env=prod diff --git a/app/Resources/static/themes/baggy/css/ratatouille.css b/app/Resources/static/themes/baggy/css/ratatouille.css index bf89d8816..b5aeb54e4 100644 --- a/app/Resources/static/themes/baggy/css/ratatouille.css +++ b/app/Resources/static/themes/baggy/css/ratatouille.css @@ -63,8 +63,7 @@ pre { max-width: 61.25em; /* 980px */ } -table, -img { +table, img, figure { max-width: 100%; height: auto; } diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 2ffe0b468..cade37f63 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -436,7 +436,8 @@ main ul.row { max-width: 40em; } -#article img { +#article img, +#article figure { max-width: 100%; height: auto; } diff --git a/app/config/config.yml b/app/config/config.yml index a1517e974..807543930 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.0.5 + version: 2.0.7 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' @@ -138,6 +138,11 @@ nelmio_cors: #origin_regex: false paths: '^/api/': + allow_origin: ['*'] + allow_headers: ['X-Custom-Auth'] + allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE'] + max_age: 3600 + '^/oauth/': allow_origin: ['*'] allow_headers: ['X-Custom-Auth'] allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index 37a801707..1b6710b7c 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -54,7 +54,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen: git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.5 + git checkout 2.0.7 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod @@ -73,7 +73,7 @@ Und wallabag unter http://deineserverip:8000 erreichen Auf einem geteilten Webhosting ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Wir stellen ein Paket inkl. aller Abhängigkeiten bereit. +Wir stellen ein Paket inkl. aller Abhängigkeiten bereit. Die Standardkonfiguration nutzt SQLite für die Datenbank. Wenn du diese Einstellung ändern willst, ändere bitte ``app/config/parameters.yml``. Wir haben bereits einen Nutzer erstellt: Login und Passwort sind ``wallabag``. diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index bd3095e03..95df263ab 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -53,7 +53,7 @@ To install wallabag itself, you must run the following commands: git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.5 + git checkout 2.0.7 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 0693fc5d3..d46f79a40 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -51,7 +51,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes : git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.5 + git checkout 2.0.7 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 4eb314f75..ccdf94066 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -357,7 +357,7 @@ class EntryController extends Controller } /** - * Changes favorite status for an entry. + * Changes starred status for an entry. * * @param Request $request * @param Entry $entry diff --git a/src/Wallabag/CoreBundle/Controller/FooterController.php b/src/Wallabag/CoreBundle/Controller/FooterController.php new file mode 100644 index 000000000..fd93c436f --- /dev/null +++ b/src/Wallabag/CoreBundle/Controller/FooterController.php @@ -0,0 +1,27 @@ +container->getParameter('addons_url'); + $socialsUrl = $this->container->getParameter('socials_url'); + + return $this->render( + 'WallabagCoreBundle::footer.html.twig', + [ + 'addonsUrl' => $addonsUrl, + 'socialsUrl' => $socialsUrl, + ] + ); + } +} diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index b41302f85..2a57f06fb 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php @@ -12,9 +12,11 @@ class StaticController extends Controller */ public function howtoAction() { + $addonsUrl = $this->container->getParameter('addons_url'); + return $this->render( 'WallabagCoreBundle:Static:howto.html.twig', - [] + ['addonsUrl' => $addonsUrl] ); } diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php index 84599f0d7..7d08b73b7 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php @@ -25,6 +25,7 @@ class WallabagCoreExtension extends Extension $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); + $loader->load('parameters.yml'); } public function getAlias() diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php index b712ad152..cb4bee830 100644 --- a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php +++ b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php @@ -16,7 +16,7 @@ class StringToListTransformer implements DataTransformerInterface private $separator; /** - * @param string $separator The separator used in the list. + * @param string $separator The separator used in the list */ public function __construct($separator = ',') { diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 74c53bf05..7d25cc805 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php @@ -21,7 +21,9 @@ class ConfigType extends AbstractType { $this->themes = array_combine( $themes, - array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes) + array_map(function ($s) { + return ucwords(strtolower(str_replace('-', ' ', $s))); + }, $themes) ); $this->languages = $languages; diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php index 14ef4a641..239d09ae7 100644 --- a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php +++ b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php @@ -25,7 +25,7 @@ class RuleBasedTagger /** * Add tags from rules defined by the user. * - * @param Entry $entry Entry to tag. + * @param Entry $entry Entry to tag */ public function tag(Entry $entry) { @@ -49,7 +49,7 @@ class RuleBasedTagger * * @param User $user * - * @return array A list of modified entries. + * @return array A list of modified entries */ public function tagAllForUser(User $user) { @@ -75,7 +75,7 @@ class RuleBasedTagger /** * Fetch a tag. * - * @param string $label The tag's label. + * @param string $label The tag's label * * @return Tag */ diff --git a/src/Wallabag/CoreBundle/Resources/config/parameters.yml b/src/Wallabag/CoreBundle/Resources/config/parameters.yml new file mode 100644 index 000000000..abd9ab689 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/config/parameters.yml @@ -0,0 +1,12 @@ +parameters: + addons_url: + firefox: https://addons.mozilla.org/firefox/addon/wallabag-v2/ + chrome: https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm + f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche + google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche + ios: https://itunes.apple.com/app/wallabag/id828331015?mt=8 + windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646 + socials_url: + twitter: https://twitter.com/wallabagapp + google_plus: https://plus.google.com/+WallabagOrg/posts + facebook: https://facebook.com/Wallabag diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 798d8cbad..c24475d26 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'estimeret læsetid: %readingTime% min' reading_time_less_one_minute: 'estimeret læsetid: < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marker som læst' toogle_as_star: 'Skift favoritstatus' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Tilbage' set_as_read: 'Marker som læst' # set_as_unread: 'Mark as unread' - set_as_favorite: 'Marker som favorit' + set_as_starred: 'Marker som favorit' view_original_article: 'Originalartikel' # re_fetch_content: 'Re-fetch content' delete: 'Slet' @@ -192,6 +194,7 @@ entry: edit_title: 'Rediger titel' original_article: 'original' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Oprettelsesdato' new: page_title: 'Gem ny artikel' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 0b8516ee7..384ec09a1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min' reading_time_less_one_minute: 'geschätzte Lesezeit: < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Gelesen-Status ändern' toogle_as_star: 'Favoriten-Status ändern' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Zurück' set_as_read: 'Als gelesen markieren' set_as_unread: 'Als ungelesen markieren' - set_as_favorite: 'Favorisieren' + set_as_starred: 'Favorisieren' view_original_article: 'Original-Artikel' re_fetch_content: 'Inhalt neu laden' delete: 'Löschen' @@ -192,6 +194,7 @@ entry: edit_title: 'Titel ändern' original_article: 'original' annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen' + created_at: 'Erstellungsdatum' new: page_title: 'Neuen Artikel speichern' placeholder: 'https://website.de' @@ -397,7 +400,7 @@ flashes: entry: notice: entry_already_saved: 'Eintrag bereits am %date% gespeichert' - entry_saved: 'Eintag gespeichert' + entry_saved: 'Eintrag gespeichert' # entry_saved_failed: 'Failed to save entry' entry_updated: 'Eintrag aktualisiert' entry_reloaded: 'Eintrag neugeladen' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 2c087421d..ea860564b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -145,9 +145,11 @@ entry: reading_time_minutes: 'estimated reading time: %readingTime% min' reading_time_less_one_minute: 'estimated reading time: < 1 min' number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Toggle mark as read' - toogle_as_star: 'Toggle favorite' + toogle_as_star: 'Toggle starred' delete: 'Delete' export_title: 'Export' filters: @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Back' set_as_read: 'Mark as read' set_as_unread: 'Mark as unread' - set_as_favorite: 'Favorite' + set_as_starred: 'Toggle starred' view_original_article: 'Original article' re_fetch_content: 'Re-fetch content' delete: 'Delete' @@ -192,6 +194,7 @@ entry: edit_title: 'Edit title' original_article: 'original' annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Creation date' new: page_title: 'Save new entry' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 5a755e6c0..f64e95d5a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min' reading_time_less_one_minute: 'tiempo estimado de lectura: < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marcar como leído/ no leído' toogle_as_star: 'Marcar como favorito/ no favorito' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Regrese a la página principal' set_as_read: 'Marcar como leído' set_as_unread: 'Marcar como no leído' - set_as_favorite: 'Marcar como favorito' + set_as_starred: 'Marcar como favorito' view_original_article: 'Artículo original' re_fetch_content: 'Redescargar el contenido' delete: 'Suprimir' @@ -192,6 +194,7 @@ entry: edit_title: 'Modificar el título' original_article: 'original' annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones' + created_at: 'Fecha de creación' new: page_title: 'Guardar un nuevo artículo' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 5a8bc5c4b..e3592a782 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min' reading_time_less_one_minute: 'زمان تخمینی برای خواندن: < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'خوانده‌شده/خوانده‌نشده' toogle_as_star: 'برگزیده/نابرگزیده' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'بازگشت' set_as_read: 'خوانده‌شده' set_as_unread: 'به عنوان خوانده‌نشده علامت بزن' - set_as_favorite: 'برگزیده' + set_as_starred: 'برگزیده' view_original_article: 'مقالهٔ اصلی' re_fetch_content: 'مقاله‌ها را دوباره دریافت کن' delete: 'پاک کردن' @@ -192,6 +194,7 @@ entry: edit_title: 'ویرایش عنوان' original_article: 'اصلی' annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' + created_at: 'زمان ساخت' new: page_title: 'ذخیرهٔ مقالهٔ تازه' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 542f61c20..9e47d600a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'durée de lecture: %readingTime% min' reading_time_less_one_minute: 'durée de lecture: < 1 min' number_of_tags: '{1}et un autre tag|]1,Inf[et %count% autres tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marquer comme lu/non lu' toogle_as_star: 'Marquer comme favori' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Retour' set_as_read: 'Marquer comme lu' set_as_unread: 'Marquer comme non lu' - set_as_favorite: 'Mettre en favori' + set_as_starred: 'Mettre en favori' view_original_article: 'Article original' re_fetch_content: 'Recharger le contenu' delete: 'Supprimer' @@ -192,6 +194,7 @@ entry: edit_title: 'Modifier le titre' original_article: 'original' annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Date de création' new: page_title: 'Sauvegarder un nouvel article' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 0bcc94a5a..3760c2d64 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'tempo di lettura stimato: %readingTime% min' reading_time_less_one_minute: 'tempo di lettura stimato: < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'originale' toogle_as_read: 'Segna come da leggere' toogle_as_star: 'Segna come non preferito' @@ -176,7 +178,7 @@ entry: back_to_homepage: 'Indietro' set_as_read: 'Segna come già letto' set_as_unread: 'Segna come da leggere' - set_as_favorite: 'Segna come preferito' + set_as_starred: 'Segna come preferito' view_original_article: 'Contenuto originale' re_fetch_content: 'Ri-ottieni pagina' delete: 'Elimina' @@ -191,6 +193,7 @@ entry: edit_title: 'Modifica titolo' original_article: 'originale' annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni' + created_at: 'Data di creazione' new: page_title: 'Salva un nuovo contenuto' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index bf6b4100b..1e23168bf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'durada de lectura : %readingTime% min' reading_time_less_one_minute: 'durada de lectura : < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marcar coma legit/pas legit' toogle_as_star: 'Marcar coma favorit' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Tornar' set_as_read: 'Marcar coma legit' set_as_unread: 'Marcar coma pas legit' - set_as_favorite: 'Metre en favori' + set_as_starred: 'Metre en favori' view_original_article: 'Article original' re_fetch_content: 'Tornar cargar lo contengut' delete: 'Suprimir' @@ -192,6 +194,7 @@ entry: edit_title: 'Modificar lo títol' original_article: 'original' annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions" + created_at: 'Data de creacion' new: page_title: 'Enregistrar un novèl article' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 09428c890..0a325c574 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min' reading_time_less_one_minute: 'szacunkowy czas czytania: < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'oryginał' toogle_as_read: 'Oznacz jako przeczytane' toogle_as_star: 'Oznacz jako ulubione' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Cofnij' set_as_read: 'Oznacz jako przeczytane' set_as_unread: 'Oznacz jako nieprzeczytane' - set_as_favorite: 'Ulubione' + set_as_starred: 'Ulubione' view_original_article: 'Oryginalny artykuł' re_fetch_content: 'Pobierz ponownie treść' delete: 'Usuń' @@ -192,6 +194,7 @@ entry: edit_title: 'Edytuj tytuł' original_article: 'oryginalny' annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji' + created_at: 'Czas stworzenia' new: page_title: 'Zapisz nowy wpis' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index bc16eddc1..42ad28eec 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'timp estimat de citire: %readingTime% min' reading_time_less_one_minute: 'timp estimat de citire: < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Comută marcat ca citit' toogle_as_star: 'Comută marcat ca favorit' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Înapoi' set_as_read: 'Marchează ca citit' # set_as_unread: 'Mark as unread' - set_as_favorite: 'Favorit' + set_as_starred: 'Favorit' view_original_article: 'Articol original' # re_fetch_content: 'Re-fetch content' delete: 'Șterge' @@ -192,6 +194,7 @@ entry: edit_title: 'Editează titlul' original_article: 'original' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Data creării' new: page_title: 'Salvează un nou articol' placeholder: 'http://website.com' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 240bc53ac..a60dfc861 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -145,6 +145,8 @@ entry: reading_time_minutes: 'tahmini okuma süresi: %readingTime% min' reading_time_less_one_minute: 'tahmini okuma süresi: < 1 min' # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'orijinal' toogle_as_read: 'Okundu/okunmadı olarak işaretle' toogle_as_star: 'Favorilere ekle/çıkar' @@ -177,7 +179,7 @@ entry: back_to_homepage: 'Back' set_as_read: 'Okundu olarak işaretle' set_as_unread: 'Okunmadı olarak işaretle' - set_as_favorite: 'Favorilere ekle/çıkar' + set_as_starred: 'Favorilere ekle/çıkar' view_original_article: 'Orijinal makale' re_fetch_content: 'İçeriği yenile' delete: 'Sil' @@ -192,6 +194,7 @@ entry: edit_title: 'Başlığı düzenle' original_article: 'orijinal' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Oluşturulma tarihi' new: page_title: 'Yeni makaleyi kaydet' placeholder: 'http://website.com' 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 40f0ae165..f89265d40 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 @@ {% endif %} - {{ form_rest(form.user) }} + {{ form_widget(form.user._token) }} + {{ form_widget(form.user.save) }}

{{ 'config.tab_menu.password'|trans }}

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 8c06cf110..ce47a6771 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 @@ -9,26 +9,39 @@
- -
+ + +
+ {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} +
+ +
+ {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} + {% if readingTime > 0 %} + {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }} + {% else %} + {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} + {% endif %} +
+ {% set nbAnnotations = entry.annotations | length %} comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}