aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2017-09-09 19:32:42 +0200
committerKevin Decherf <kevin@kdecherf.com>2017-11-19 15:02:11 +0100
commit03b020eb205a052b3a09f94e316c3b6b48607103 (patch)
treea62df8b9c590276e8d34fa01aafda39de900a109 /src
parente0ef1a1c8b6badd2f52acbdcf928469ef1a15b3e (diff)
downloadwallabag-03b020eb205a052b3a09f94e316c3b6b48607103.tar.gz
wallabag-03b020eb205a052b3a09f94e316c3b6b48607103.tar.zst
wallabag-03b020eb205a052b3a09f94e316c3b6b48607103.zip
Entry: handle originUrl in edit form, update translations
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/EditEntryType.php5
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig5
14 files changed, 22 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
index 1627cc44..4bceaf5f 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
@@ -22,6 +22,11 @@ class EditEntryType extends AbstractType
22 'required' => false, 22 'required' => false,
23 'label' => 'entry.edit.url_label', 23 'label' => 'entry.edit.url_label',
24 ]) 24 ])
25 ->add('origin_url', TextType::class, [
26 'required' => false,
27 'property_path' => 'originUrl',
28 'label' => 'entry.edit.origin_url_label',
29 ])
25 ->add('save', SubmitType::class, [ 30 ->add('save', SubmitType::class, [
26 'label' => 'entry.edit.save_label', 31 'label' => 'entry.edit.save_label',
27 ]) 32 ])
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index d0a38f7e..8fa5965e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -244,6 +244,7 @@ entry:
244 # page_title: 'Edit an entry' 244 # page_title: 'Edit an entry'
245 # title_label: 'Title' 245 # title_label: 'Title'
246 url_label: 'Url' 246 url_label: 'Url'
247 # origin_url_label: 'Origin url'
247 save_label: 'Gem' 248 save_label: 'Gem'
248 public: 249 public:
249 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" 250 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 158762a9..3bb10d51 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: 'Eintrag bearbeiten' 244 page_title: 'Eintrag bearbeiten'
245 title_label: 'Titel' 245 title_label: 'Titel'
246 url_label: 'URL' 246 url_label: 'URL'
247 # origin_url_label: 'Origin url'
247 save_label: 'Speichern' 248 save_label: 'Speichern'
248 public: 249 public:
249 shared_by_wallabag: 'Dieser Artikel wurde von %username% mittels <a href="%wallabag_instance%">wallabag</a> geteilt' 250 shared_by_wallabag: 'Dieser Artikel wurde von %username% mittels <a href="%wallabag_instance%">wallabag</a> geteilt'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index de3e11fe..9da36e24 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: 'Edit an entry' 244 page_title: 'Edit an entry'
245 title_label: 'Title' 245 title_label: 'Title'
246 url_label: 'Url' 246 url_label: 'Url'
247 origin_url_label: 'Origin url'
247 save_label: 'Save' 248 save_label: 'Save'
248 public: 249 public:
249 shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" 250 shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 6dfc1525..37fee3c1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: 'Editar un artículo' 244 page_title: 'Editar un artículo'
245 title_label: 'Título' 245 title_label: 'Título'
246 url_label: 'URL' 246 url_label: 'URL'
247 # origin_url_label: 'Origin url'
247 save_label: 'Guardar' 248 save_label: 'Guardar'
248 public: 249 public:
249 shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" 250 shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index ffc48933..ac39aa62 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: 'ویرایش مقاله' 244 page_title: 'ویرایش مقاله'
245 title_label: 'عنوان' 245 title_label: 'عنوان'
246 url_label: 'نشانی' 246 url_label: 'نشانی'
247 # origin_url_label: 'Origin url'
247 save_label: 'ذخیره' 248 save_label: 'ذخیره'
248 public: 249 public:
249 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" 250 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index c9d95e2b..e640f2ba 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: "Éditer un article" 244 page_title: "Éditer un article"
245 title_label: "Titre" 245 title_label: "Titre"
246 url_label: "Adresse" 246 url_label: "Adresse"
247 origin_url_label: "Adresse d'origine"
247 save_label: "Enregistrer" 248 save_label: "Enregistrer"
248 public: 249 public:
249 shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>" 250 shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index c53266ca..c2dad0df 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: 'Modifica voce' 244 page_title: 'Modifica voce'
245 title_label: 'Titolo' 245 title_label: 'Titolo'
246 url_label: 'Url' 246 url_label: 'Url'
247 # origin_url_label: 'Origin url'
247 save_label: 'Salva' 248 save_label: 'Salva'
248 public: 249 public:
249 shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>" 250 shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 3ae64c49..72442c56 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: 'Modificar un article' 244 page_title: 'Modificar un article'
245 title_label: 'Títol' 245 title_label: 'Títol'
246 url_label: 'Url' 246 url_label: 'Url'
247 # origin_url_label: 'Origin url'
247 save_label: 'Enregistrar' 248 save_label: 'Enregistrar'
248 public: 249 public:
249 shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" 250 shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index e642c530..2e1039bd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: 'Edytuj wpis' 244 page_title: 'Edytuj wpis'
245 title_label: 'Tytuł' 245 title_label: 'Tytuł'
246 url_label: 'Adres URL' 246 url_label: 'Adres URL'
247 # origin_url_label: 'Origin url'
247 save_label: 'Zapisz' 248 save_label: 'Zapisz'
248 public: 249 public:
249 shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" 250 shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 9b3fea6b..72fe2c9a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -244,6 +244,7 @@ entry:
244 page_title: 'Editar uma entrada' 244 page_title: 'Editar uma entrada'
245 title_label: 'Título' 245 title_label: 'Título'
246 url_label: 'Url' 246 url_label: 'Url'
247 # origin_url_label: 'Origin url'
247 save_label: 'Salvar' 248 save_label: 'Salvar'
248 public: 249 public:
249 shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" 250 shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 673ca183..7a3f0526 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -244,6 +244,7 @@ entry:
244 # page_title: 'Edit an entry' 244 # page_title: 'Edit an entry'
245 # title_label: 'Title' 245 # title_label: 'Title'
246 url_label: 'Url' 246 url_label: 'Url'
247 # origin_url_label: 'Origin url'
247 save_label: 'Salvează' 248 save_label: 'Salvează'
248 public: 249 public:
249 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" 250 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 563bc50b..44619ea5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -242,6 +242,7 @@ entry:
242 page_title: 'Makaleyi düzenle' 242 page_title: 'Makaleyi düzenle'
243 title_label: 'Başlık' 243 title_label: 'Başlık'
244 url_label: 'Url' 244 url_label: 'Url'
245 # origin_url_label: 'Origin url'
245 save_label: 'Kaydet' 246 save_label: 'Kaydet'
246 public: 247 public:
247 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" 248 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
index b9537975..ed225957 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
@@ -27,6 +27,11 @@
27 {{ form_label(form.url) }} 27 {{ form_label(form.url) }}
28 {{ form_widget(form.url) }} 28 {{ form_widget(form.url) }}
29 </div> 29 </div>
30
31 <div class="input-field s12">
32 {{ form_label(form.origin_url) }}
33 {{ form_widget(form.origin_url) }}
34 </div>
30 <br> 35 <br>
31 36
32 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 37 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}