diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 69dfd4b10..33b5e2ad0 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -23,10 +23,16 @@ class EntryController extends Controller
{
try {
$entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
+
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
} catch (\Exception $e) {
+ $this->get('logger')->error('Error while saving an entry', [
+ 'exception' => $e,
+ 'entry' => $entry,
+ ]);
+
return false;
}
@@ -60,11 +66,12 @@ class EntryController extends Controller
return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()]));
}
- $this->updateEntry($entry);
- $this->get('session')->getFlashBag()->add(
- 'notice',
- 'flashes.entry.notice.entry_saved'
- );
+ $message = 'flashes.entry.notice.entry_saved';
+ if (false === $this->updateEntry($entry)) {
+ $message = 'flashes.entry.notice.entry_saved_failed';
+ }
+
+ $this->get('session')->getFlashBag()->add('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 8d3920630..0c2a3249b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -396,6 +396,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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index c7a894929..b28b3b046 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -396,6 +396,7 @@ flashes:
notice:
entry_already_saved: 'Eintrag bereits am %date% gespeichert'
entry_saved: 'Eintag gespeichert'
+ # entry_saved_failed: 'Failed to save entry'
entry_updated: 'Eintrag aktualisiert'
entry_reloaded: 'Eintrag neugeladen'
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 876e7900c..ec5605596 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -396,6 +396,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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index e8461247c..11358d8e3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -396,6 +396,7 @@ flashes:
notice:
entry_already_saved: 'Entrada ya guardada por %fecha%'
entry_saved: 'Entrada guardada'
+ # entry_saved_failed: 'Failed to save entry'
entry_updated: 'Entrada actualizada'
entry_reloaded: 'Entrada recargada'
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 d34ff8ff8..92b4dabe1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -96,8 +96,8 @@ config:
rule_label: 'قانون'
tags_label: 'برچسبها'
faq:
- title: 'پرسشهای متداول'
- tagging_rules_definition_title: 'برچسبگذاری خودکار یعنی چه؟'
+ title: 'پرسشهای متداول'
+ tagging_rules_definition_title: 'برچسبگذاری خودکار یعنی چه؟'
# 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.'
# 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 »'
@@ -383,30 +383,31 @@ developer:
flashes:
config:
notice:
- config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال میشود.'
- password_updated: 'رمز بهروز شد'
- password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید."
- user_updated: 'اطلاعات بهروز شد'
- rss_updated: 'اطلاعات آر-اس-اس بهروز شد'
- tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد'
- tagging_rules_deleted: 'قانون برچسبگذاری پاک شد'
- user_added: 'کابر "%username%" افزوده شد'
- rss_token_updated: 'کد آر-اس-اس بهروز شد'
+ config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال میشود.'
+ password_updated: 'رمز بهروز شد'
+ password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید."
+ user_updated: 'اطلاعات بهروز شد'
+ rss_updated: 'اطلاعات آر-اس-اس بهروز شد'
+ tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد'
+ tagging_rules_deleted: 'قانون برچسبگذاری پاک شد'
+ user_added: 'کابر "%username%" افزوده شد'
+ rss_token_updated: 'کد آر-اس-اس بهروز شد'
entry:
notice:
- entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
- entry_saved: 'مقاله ذخیره شد'
- entry_updated: 'مقاله بهروز شد'
- entry_reloaded: 'مقاله بهروز شد'
- entry_reload_failed: 'بهروزرسانی مقاله شکست خورد'
- entry_archived: 'مقاله بایگانی شد'
- entry_unarchived: 'مقاله از بایگانی درآمد'
- entry_starred: 'مقاله برگزیده شد'
- entry_unstarred: 'مقاله نابرگزیده شد'
- entry_deleted: 'مقاله پاک شد'
+ entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
+ entry_saved: 'مقاله ذخیره شد'
+ # entry_saved_failed: 'Failed to save entry'
+ entry_updated: 'مقاله بهروز شد'
+ entry_reloaded: 'مقاله بهروز شد'
+ entry_reload_failed: 'بهروزرسانی مقاله شکست خورد'
+ entry_archived: 'مقاله بایگانی شد'
+ entry_unarchived: 'مقاله از بایگانی درآمد'
+ entry_starred: 'مقاله برگزیده شد'
+ entry_unstarred: 'مقاله نابرگزیده شد'
+ entry_deleted: 'مقاله پاک شد'
tag:
notice:
- tag_added: 'برچسب افزوده شد'
+ tag_added: 'برچسب افزوده شد'
import:
notice:
failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 80ba0546a..84e3a5fc3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -396,6 +396,7 @@ flashes:
notice:
entry_already_saved: 'Article déjà sauvergardé le %date%'
entry_saved: 'Article enregistré'
+ entry_saved_failed: "L'enregistrement a échoué"
entry_updated: 'Article mis à jour'
entry_reloaded: 'Article rechargé'
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 4f3ac090f..00ed9c98c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -396,6 +396,7 @@ flashes:
notice:
entry_already_saved: 'Contenuto già salvato in data %date%'
entry_saved: 'Contenuto salvato'
+ # entry_saved_failed: 'Failed to save entry'
entry_updated: 'Contenuto aggiornato'
entry_reloaded: 'Contenuto ricaricato'
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 46f58bbf5..70e4342c7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -396,6 +396,7 @@ flashes:
notice:
entry_already_saved: 'Article ja salvargardat lo %date%'
entry_saved: 'Article enregistrat'
+ # entry_saved_failed: 'Failed to save entry'
entry_updated: 'Article mes a jorn'
entry_reloaded: 'Article recargat'
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 292749ed6..dd2dce5d9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -396,6 +396,7 @@ flashes:
notice:
entry_already_saved: 'Wpis już został dodany %date%'
entry_saved: 'Wpis zapisany'
+ # entry_saved_failed: 'Failed to save entry'
entry_updated: 'Wpis zaktualizowany'
entry_reloaded: 'Wpis ponownie załadowany'
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 45040f359..a3a09f4c1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -396,6 +396,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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 8a095a5b1..bc502a2b8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -396,6 +396,7 @@ flashes:
notice:
entry_already_saved: 'Entry already saved on %date%'
entry_saved: 'Makale kaydedildi'
+ # entry_saved_failed: 'Failed to save entry'
# entry_updated: 'Entry updated'
entry_reloaded: 'Makale içeriği yenilendi'
# entry_reload_failed: 'Failed to reload entry'