From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 8 Mar 2016 17:02:34 +0100 Subject: manage assets through npm first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version --- .../Resources/translations/messages.en.yml | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.en.yml') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 1cc42404..b65e4522 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -81,7 +81,7 @@ config: archive: 'archived' rss_limit: 'Number of items in the feed' form_user: - two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" + two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection." name_label: 'Name' email_label: 'Email' twoFactorAuthentication_label: 'Two factor authentication' @@ -98,9 +98,9 @@ config: faq: title: 'FAQ' tagging_rules_definition_title: 'What does « tagging rules » mean?' - tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.
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.' + tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.
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.' how_to_use_them_title: 'How do I use them?' - how_to_use_them_description: 'Let assume you want to tag new entries as « short reading » when the reading time is inferior to 3 minutes.
In that case, you should put « readingTime <= 3 » in the Rule field and « short reading » in the Tags field.
Several tags can added simultaneously by separating them by a comma: « short reading, must read »
Complex rules can be written by using predefined operators: if « readingTime >= 5 AND domainName = "github.com" » then tag as « long reading, github »' + how_to_use_them_description: 'Let us assume you want to tag new entries as « short reading » when the reading time is under 3 minutes.
In that case, you should put « readingTime <= 3 » in the Rule field and « short reading » in the Tags field.
Several tags can added simultaneously by separating them with a comma: « short reading, must read »
Complex rules can be written by using predefined operators: if « readingTime >= 5 AND domainName = "github.com" » then tag as « long reading, github »' variables_available_title: 'Which variables and operators can I use to write rules?' variables_available_description: 'The following variables and operators can be used to create tagging rules:' meaning: 'Meaning' @@ -140,7 +140,7 @@ entry: archived: 'Archived entries' filtered: 'Filtered entries' list: - number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' + number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' reading_time: 'estimated reading time' reading_time_minutes: 'estimated reading time: %readingTime% min' reading_time_less_one_minute: 'estimated reading time: < 1 min' @@ -154,6 +154,7 @@ entry: status_label: 'Status' archived_label: 'Archived' starred_label: 'Starred' + unread_label: 'Unread' preview_picture_label: 'Has a preview picture' preview_picture_help: 'Preview picture' language_label: 'Language' @@ -222,14 +223,14 @@ about: bug_reports: 'Bug reports' support: 'On our support website or on GitHub' helping: - description: 'wallabag is free and opensource. You can help us:' + description: 'wallabag is free and open source. You can help us:' by_contributing: 'by contributing to the project:' by_contributing_2: 'an issue lists all our needs' by_paypal: 'via Paypal' contributors: description: 'Thank you to contributors on wallabag web application' third_party: - description: 'Here are the list of third-party libraries used in wallabag (with their licenses):' + description: 'Here is the list of third-party libraries used in wallabag (with their licenses):' package: 'Package' license: 'License' @@ -258,7 +259,7 @@ quickstart: page_title: 'Quickstart' intro: title: 'Welcome to wallabag!' - paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you." + paragraph_1: "We'll accompany you on your visit to wallabag and show you some features that might interest you." paragraph_2: 'Follow us!' configure: title: 'Configure the application' @@ -290,7 +291,7 @@ quickstart: title: 'Full documentation' annotate: 'Annotate your article' export: 'Convert your articles into ePUB or PDF' - search_filters: 'See how you can look for an article by using search engine and filters' + search_filters: 'See how you can look for an article by using the search engine and filters' fetching_errors: 'What can I do if an article encounters errors during fetching?' all_docs: 'And so many other articles!' support: @@ -303,11 +304,11 @@ quickstart: tag: page_title: 'Tags' list: - number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' + number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.' import: page_title: 'Import' - page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.' + page_description: 'Welcome to wallabag importer. Please select your previous service from which you want to migrate.' action: import_contents: 'Import contents' form: @@ -317,7 +318,7 @@ import: save_label: 'Upload file' pocket: page_title: 'Import > Pocket' - 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." + 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." config_missing: description: "Pocket import isn't configured." admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.' @@ -396,6 +397,7 @@ flashes: notice: entry_already_saved: 'Entry already saved on %date%' entry_saved: 'Entry saved' + entry_saved_failed: 'Failed to save entry' entry_updated: 'Entry updated' entry_reloaded: 'Entry reloaded' entry_reload_failed: 'Failed to reload entry' -- cgit v1.2.3