diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 6574e587c..5229ac732 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -159,6 +159,7 @@ config:
# 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'
@@ -244,7 +245,7 @@ entry:
url_label: 'Url'
save_label: 'Gem'
public:
- # shared_by_wallabag: "This article has been shared by wallabag"
+ # shared_by_wallabag: "This article has been shared by %username% with wallabag"
confirm:
# delete: "Are you sure you want to remove that article?"
# delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 49e9eab3b..aa1cd1a97 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -245,7 +245,7 @@ entry:
url_label: 'Url'
save_label: 'Save'
public:
- shared_by_wallabag: "This article has been shared by wallabag"
+ shared_by_wallabag: "This article has been shared by %username% with wallabag"
confirm:
delete: "Are you sure you want to remove that article?"
delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 15460ef76..57e6c0298 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -245,7 +245,7 @@ entry:
url_label: 'نشانی'
save_label: 'ذخیره'
public:
- # shared_by_wallabag: "This article has been shared by wallabag"
+ # shared_by_wallabag: "This article has been shared by %username% with wallabag"
confirm:
# delete: "Are you sure you want to remove that article?"
# delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 0d9fda5f0..6eac4c36d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -245,7 +245,7 @@ entry:
url_label: "Adresse"
save_label: "Enregistrer"
public:
- shared_by_wallabag: "Cet article a été partagé par wallabag"
+ shared_by_wallabag: "Cet article a été partagé par %username% avec wallabag"
confirm:
delete: "Voulez-vous vraiment supprimer cet article ?"
delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 669a1aa39..73081ca50 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -245,7 +245,7 @@ entry:
url_label: 'Url'
save_label: 'Salva'
public:
- # shared_by_wallabag: "This article has been shared by wallabag"
+ # shared_by_wallabag: "This article has been shared by %username% with wallabag"
confirm:
delete: "Vuoi veramente rimuovere quell'articolo?"
delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index c663b23ed..f16504eda 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -245,7 +245,7 @@ entry:
url_label: 'Url'
save_label: 'Salvează'
public:
- # shared_by_wallabag: "This article has been shared by wallabag"
+ # shared_by_wallabag: "This article has been shared by %username% with wallabag"
confirm:
# delete: "Are you sure you want to remove that article?"
# delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index e0e752e04..90a140cd4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -243,7 +243,7 @@ entry:
url_label: 'Url'
save_label: 'Kaydet'
public:
- # shared_by_wallabag: "This article has been shared by wallabag"
+ # shared_by_wallabag: "This article has been shared by %username% with wallabag"
confirm:
# delete: "Are you sure you want to remove that article?"
# delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index 623cf1c4d..3828c2964 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -24,7 +24,7 @@
article {
margin: 0 auto;
- width: 600px;
+ width: 900px;
}
@@ -45,7 +45,11 @@
{{ entry.title|e|raw }}
- {{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}
+ {{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.
+
+ {% if entry.previewPicture is not null %}
+
+ {% endif %}
{{ entry.content | raw }}