diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index e26280d7..63bca16b 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -1112,7 +1112,7 @@
Add a new newsletter agent, or configure an existing newsletter agent by clicking the settings icon on the right.
- Warning: Image Hosting must be enabled for images to display on the newsletter.
+ Warning: The Image Hosting setting must be enabled for images to display on the newsletter.
diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html
index 2aac7e4a..5684ce36 100644
--- a/data/interfaces/newsletters/recently_added.html
+++ b/data/interfaces/newsletters/recently_added.html
@@ -11,10 +11,10 @@
else:
base_url = ''
- service = get_img_service()
- if get_img_service(include_self=True) == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
+ service = get_img_service(include_self=True)
+ if service == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/image/'
- elif service and preview:
+ elif service and service != 'self-hosted' and preview:
base_url_image = 'newsletter/image/'
else:
base_url_image = ''
@@ -624,7 +624,9 @@
% if preview and service:
-
Note: Local preview only - images have not been uploaded to ${service.capitalize()}
+
Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.
+% elif preview and not service:
+
Warning: The Image Hosting setting must be enabled for images to display on the newsletter.
% endif
diff --git a/data/interfaces/newsletters/recently_added_master.html b/data/interfaces/newsletters/recently_added_master.html
index 0e74526f..547bd041 100644
--- a/data/interfaces/newsletters/recently_added_master.html
+++ b/data/interfaces/newsletters/recently_added_master.html
@@ -11,10 +11,10 @@
else:
base_url = ''
- service = get_img_service()
- if get_img_service(include_self=True) == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
+ service = get_img_service(include_self=True)
+ if service == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/image/'
- elif service and preview:
+ elif service and service != 'self-hosted' and preview:
base_url_image = 'newsletter/image/'
else:
base_url_image = ''
@@ -624,7 +624,9 @@
% if preview and service:
-Note: Local preview only - images have not been uploaded to ${service.capitalize()}
+Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.
+% elif preview and not service:
+Warning: The Image Hosting setting must be enabled for images to display on the newsletter.
% endif