Commit cccdb74e authored by Olga Brani's avatar Olga Brani

astakos: Remove unused ASTAKOS_SITENAME setting

ASTAKOS_SITENAME is deprecated in favor of BRANDING_SERVICE_NAME
parent 2dd74fd9
......@@ -152,7 +152,6 @@ default_dict = {
'subject': sample_subject,
'body': render_to_string('im/plain_email.txt', {
'baseurl': astakos_settings.BASE_URL,
'site_name': astakos_settings.SITENAME,
'support': astakos_settings.CONTACT_EMAIL}).replace('\n\n\n', '\n'),
'legend': {
'Full name': "{{ full_name }}",
......
......@@ -436,7 +436,6 @@ class ExtendedPasswordResetForm(PasswordResetForm):
c = {
'email': user.email,
'url': url,
'site_name': settings.SITENAME,
'user': user,
'baseurl': settings.BASE_URL,
'support': settings.CONTACT_EMAIL
......
......@@ -113,9 +113,6 @@ IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/static/im/')
# will be automatically accepted
MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True)
# Set service name
SITENAME = getattr(settings, 'ASTAKOS_SITENAME', synnefo_settings.SERVICE_NAME)
# Set recaptcha keys
RECAPTCHA_PUBLIC_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PUBLIC_KEY', '')
RECAPTCHA_PRIVATE_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PRIVATE_KEY', '')
......
......@@ -6,4 +6,4 @@ Dear {{ invitation.realname }},
{{ invitation.inviter.realname }} has invited you to use {{ BRANDING_COMPANY_NAME|upper }}'s {{ BRANDING_SERVICE_NAME }} service.
To access the service, please use the link: {{ url }}
{% endblock %}
\ No newline at end of file
{% endblock %}
......@@ -56,7 +56,6 @@ class TestUserUtils(TestCase):
'user': self.user1,
'text': text,
'baseurl': astakos_settings.BASE_URL,
'site_name': astakos_settings.SITENAME,
'support': astakos_settings.CONTACT_EMAIL})
# Test 1 - Check if a simple test mail is sent properly.
......
......@@ -73,7 +73,6 @@ def send_plain(user, sender=settings.SERVER_EMAIL,
'user': user,
'text': text,
'baseurl': settings.BASE_URL,
'site_name': settings.SITENAME,
'support': settings.CONTACT_EMAIL})
send_mail(subject, message, sender, [user.email],
......@@ -92,7 +91,6 @@ def send_verification(user, template_name='im/activation_email.txt'):
'user': user,
'url': url,
'baseurl': settings.BASE_URL,
'site_name': settings.SITENAME,
'support': settings.CONTACT_EMAIL})
sender = settings.SERVER_EMAIL
send_mail(_(astakos_messages.VERIFICATION_EMAIL_SUBJECT), message, sender,
......@@ -153,7 +151,6 @@ def send_invitation(invitation, template_name='im/invitation.txt'):
'invitation': invitation,
'url': url,
'baseurl': settings.BASE_URL,
'site_name': settings.SITENAME,
'support': settings.CONTACT_EMAIL})
sender = settings.SERVER_EMAIL
send_mail(subject, message, sender, [invitation.username],
......@@ -177,7 +174,6 @@ def send_greeting(user, email_template_name='im/welcome_email.txt'):
'user': user,
'url': join_urls(settings.BASE_HOST, index_url),
'baseurl': settings.BASE_URL,
'site_name': settings.SITENAME,
'support': settings.CONTACT_EMAIL})
sender = settings.SERVER_EMAIL
send_mail(subject, message, sender, [user.email],
......@@ -206,7 +202,6 @@ def send_change_email(ec, request, email_template_name=(
url = ec.get_url()
url = request.build_absolute_uri(url)
c = {'url': url,
'site_name': settings.SITENAME,
'support': settings.CONTACT_EMAIL,
'ec': ec}
message = render_to_string(email_template_name, c)
......
......@@ -35,9 +35,6 @@
# Set baseurl
#ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org'
# Set service name
#ASTAKOS_SITENAME = 'Synnefo Cloud'
# Set recaptcha keys
# http://www.google.com/recaptcha/whyrecaptcha
#ASTAKOS_RECAPTCHA_PUBLIC_KEY = ''
......
......@@ -10,7 +10,7 @@ ASTAKOS_IM_MODULES = ['local']
ASTAKOS_BASE_URL = 'https://%ACCOUNTS%/astakos'
ASTAKOS_SITENAME = 'Synnefo'
BRANDING_SERVICE_NAME = 'Synnefo'
ASTAKOS_RECAPTCHA_PUBLIC_KEY = '6LeFidMSAAAAAM7Px7a96YQzsBcKYeXCI_sFz0Gk'
ASTAKOS_RECAPTCHA_PRIVATE_KEY = '6LeFidMSAAAAAFv5U5NSayJJJhr0roludAidPd2M'
......@@ -23,14 +23,14 @@ ASTAKOS_PROFILE_MESSAGES = []
ASTAKOS_GLOBAL_MESSAGES = []
ASTAKOS_PROFILE_EXTRA_LINKS = []
ASTAKOS_INVITATION_EMAIL_SUBJECT = 'Invitation to %s' % ASTAKOS_SITENAME
ASTAKOS_GREETING_EMAIL_SUBJECT = 'Welcome to %s' % ASTAKOS_SITENAME
ASTAKOS_FEEDBACK_EMAIL_SUBJECT = 'Feedback from %s' % ASTAKOS_SITENAME
ASTAKOS_VERIFICATION_EMAIL_SUBJECT = '%s account activation is needed' % ASTAKOS_SITENAME
ASTAKOS_ADMIN_NOTIFICATION_EMAIL_SUBJECT = '%s account created (%%(user)s)' % ASTAKOS_SITENAME
ASTAKOS_HELPDESK_NOTIFICATION_EMAIL_SUBJECT = '%s account activated (%%(user)s)' % ASTAKOS_SITENAME
ASTAKOS_EMAIL_CHANGE_EMAIL_SUBJECT = 'Email change on %s' % ASTAKOS_SITENAME
ASTAKOS_PASSWORD_RESET_EMAIL_SUBJECT = 'Password reset on %s' % ASTAKOS_SITENAME
ASTAKOS_INVITATION_EMAIL_SUBJECT = 'Invitation to %s' % BRANDING_SERVICE_NAME
ASTAKOS_GREETING_EMAIL_SUBJECT = 'Welcome to %s' % BRANDING_SERVICE_NAME
ASTAKOS_FEEDBACK_EMAIL_SUBJECT = 'Feedback from %s' % BRANDING_SERVICE_NAME
ASTAKOS_VERIFICATION_EMAIL_SUBJECT = '%s account activation is needed' % BRANDING_SERVICE_NAME
ASTAKOS_ADMIN_NOTIFICATION_EMAIL_SUBJECT = '%s account created (%%(user)s)' % BRANDING_SERVICE_NAME
ASTAKOS_HELPDESK_NOTIFICATION_EMAIL_SUBJECT = '%s account activated (%%(user)s)' % BRANDING_SERVICE_NAME
ASTAKOS_EMAIL_CHANGE_EMAIL_SUBJECT = 'Email change on %s' % BRANDING_SERVICE_NAME
ASTAKOS_PASSWORD_RESET_EMAIL_SUBJECT = 'Password reset on %s' % BRANDING_SERVICE_NAME
ASTAKOS_COOKIE_DOMAIN = '%DOMAIN%'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment