Commit d0c7a532 by Omar Al-Ithawi Committed by Alex Dusenbery

Make the platform name translatable

parent 167e4d58
...@@ -246,9 +246,9 @@ LOGGING = get_logger_config(LOG_DIR, ...@@ -246,9 +246,9 @@ LOGGING = get_logger_config(LOG_DIR,
service_variant=SERVICE_VARIANT) service_variant=SERVICE_VARIANT)
#theming start: #theming start:
PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'edX') PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
STUDIO_NAME = ENV_TOKENS.get('STUDIO_NAME', 'edX Studio') STUDIO_NAME = ENV_TOKENS.get('STUDIO_NAME', STUDIO_NAME)
STUDIO_SHORT_NAME = ENV_TOKENS.get('STUDIO_SHORT_NAME', 'Studio') STUDIO_SHORT_NAME = ENV_TOKENS.get('STUDIO_SHORT_NAME', STUDIO_SHORT_NAME)
# Event Tracking # Event Tracking
if "TRACKING_IGNORE_URL_PATTERNS" in ENV_TOKENS: if "TRACKING_IGNORE_URL_PATTERNS" in ENV_TOKENS:
......
...@@ -65,6 +65,9 @@ from lms.envs.common import ( ...@@ -65,6 +65,9 @@ from lms.envs.common import (
MEDIA_ROOT, MEDIA_ROOT,
MEDIA_URL, MEDIA_URL,
# Lazy Gettext
_,
# Django REST framework configuration # Django REST framework configuration
REST_FRAMEWORK, REST_FRAMEWORK,
...@@ -125,8 +128,8 @@ from openedx.core.lib.license import LicenseMixin ...@@ -125,8 +128,8 @@ from openedx.core.lib.license import LicenseMixin
# Dummy secret key for dev/test # Dummy secret key for dev/test
SECRET_KEY = 'dev key' SECRET_KEY = 'dev key'
STUDIO_NAME = "Studio" STUDIO_NAME = _("Your Platform Studio")
STUDIO_SHORT_NAME = "Studio" STUDIO_SHORT_NAME = _("Studio")
FEATURES = { FEATURES = {
'GITHUB_PUSH': False, 'GITHUB_PUSH': False,
......
...@@ -51,14 +51,6 @@ _PSA_OAUTH2_BACKENDS = [backend_class.name for backend_class in _load_backend_cl ...@@ -51,14 +51,6 @@ _PSA_OAUTH2_BACKENDS = [backend_class.name for backend_class in _load_backend_cl
_PSA_SAML_BACKENDS = [backend_class.name for backend_class in _load_backend_classes(SAMLAuth)] _PSA_SAML_BACKENDS = [backend_class.name for backend_class in _load_backend_classes(SAMLAuth)]
_LTI_BACKENDS = [backend_class.name for backend_class in _load_backend_classes(LTIAuthBackend)] _LTI_BACKENDS = [backend_class.name for backend_class in _load_backend_classes(LTIAuthBackend)]
DEFAULT_SAML_CONTACT = {
# Default contact information to put into the SAML metadata that gets generated by python-saml.
"givenName": u"{} Support".format(
configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME),
),
"emailAddress": configuration_helpers.get_value('TECH_SUPPORT_EMAIL', settings.TECH_SUPPORT_EMAIL),
}
def clean_json(value, of_type): def clean_json(value, of_type):
""" Simple helper method to parse and clean JSON """ """ Simple helper method to parse and clean JSON """
...@@ -576,6 +568,14 @@ class SAMLConfiguration(ConfigurationModel): ...@@ -576,6 +568,14 @@ class SAMLConfiguration(ConfigurationModel):
def get_setting(self, name): def get_setting(self, name):
""" Get the value of a setting, or raise KeyError """ """ Get the value of a setting, or raise KeyError """
default_saml_contact = {
# Default contact information to put into the SAML metadata that gets generated by python-saml.
"givenName": _("{platform_name} Support").format(
platform_name=configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)
),
"emailAddress": configuration_helpers.get_value('TECH_SUPPORT_EMAIL', settings.TECH_SUPPORT_EMAIL),
}
if name == "ORG_INFO": if name == "ORG_INFO":
return json.loads(self.org_info_str) return json.loads(self.org_info_str)
if name == "SP_ENTITY_ID": if name == "SP_ENTITY_ID":
...@@ -593,8 +593,8 @@ class SAMLConfiguration(ConfigurationModel): ...@@ -593,8 +593,8 @@ class SAMLConfiguration(ConfigurationModel):
other_config = { other_config = {
# These defaults can be overriden by self.other_config_str # These defaults can be overriden by self.other_config_str
"GET_ALL_EXTRA_DATA": True, # Save all attribute values the IdP sends into the UserSocialAuth table "GET_ALL_EXTRA_DATA": True, # Save all attribute values the IdP sends into the UserSocialAuth table
"TECHNICAL_CONTACT": DEFAULT_SAML_CONTACT, "TECHNICAL_CONTACT": default_saml_contact,
"SUPPORT_CONTACT": DEFAULT_SAML_CONTACT, "SUPPORT_CONTACT": default_saml_contact,
} }
other_config.update(json.loads(self.other_config_str)) other_config.update(json.loads(self.other_config_str))
return other_config[name] # SECURITY_CONFIG, SP_EXTRA, or similar extra settings return other_config[name] # SECURITY_CONFIG, SP_EXTRA, or similar extra settings
......
...@@ -179,7 +179,7 @@ class HomeHelpTest(StudioCourseTest): ...@@ -179,7 +179,7 @@ class HomeHelpTest(StudioCourseTest):
Scenario: Help link in sidebar links is working on 'Home'(Courses tab) page. Scenario: Help link in sidebar links is working on 'Home'(Courses tab) page.
Given that I am on the 'Home'(Courses tab) page. Given that I am on the 'Home'(Courses tab) page.
And I want help about the courses And I want help about the courses
And I click the 'Getting Started with edX Studio' in the sidebar links And I click the 'Getting Started with Your Platform Studio' in the sidebar links
Then Help link should open. Then Help link should open.
And help url should be correct And help url should be correct
""" """
...@@ -190,7 +190,7 @@ class HomeHelpTest(StudioCourseTest): ...@@ -190,7 +190,7 @@ class HomeHelpTest(StudioCourseTest):
test=self, test=self,
page=self.home_page, page=self.home_page,
href=expected_url, href=expected_url,
help_text='Getting Started with edX Studio', help_text='Getting Started with Your Platform Studio',
as_list_item=True as_list_item=True
) )
...@@ -232,7 +232,7 @@ class NewCourseHelpTest(AcceptanceTest): ...@@ -232,7 +232,7 @@ class NewCourseHelpTest(AcceptanceTest):
Scenario: Help link in sidebar links is working on 'Create a New Course' page in the dashboard. Scenario: Help link in sidebar links is working on 'Create a New Course' page in the dashboard.
Given that I am on the 'Create a New Course' page in the dashboard. Given that I am on the 'Create a New Course' page in the dashboard.
And I want help about the process And I want help about the process
And I click the 'Getting Started with edX Studio' in the sidebar links And I click the 'Getting Started with Your Platform Studio' in the sidebar links
Then Help link should open. Then Help link should open.
And help url should be correct And help url should be correct
""" """
...@@ -243,7 +243,7 @@ class NewCourseHelpTest(AcceptanceTest): ...@@ -243,7 +243,7 @@ class NewCourseHelpTest(AcceptanceTest):
test=self, test=self,
page=self.dashboard_page, page=self.dashboard_page,
href=expected_url, href=expected_url,
help_text='Getting Started with edX Studio', help_text='Getting Started with Your Platform Studio',
as_list_item=True as_list_item=True
) )
...@@ -285,7 +285,7 @@ class NewLibraryHelpTest(AcceptanceTest): ...@@ -285,7 +285,7 @@ class NewLibraryHelpTest(AcceptanceTest):
Scenario: Help link in sidebar links is working on 'Create a New Library' page in the dashboard. Scenario: Help link in sidebar links is working on 'Create a New Library' page in the dashboard.
Given that I am on the 'Create a New Library' page in the dashboard. Given that I am on the 'Create a New Library' page in the dashboard.
And I want help about the process And I want help about the process
And I click the 'Getting Started with edX Studio' in the sidebar links And I click the 'Getting Started with Your Platform Studio' in the sidebar links
Then Help link should open. Then Help link should open.
And help url should be correct And help url should be correct
""" """
...@@ -296,7 +296,7 @@ class NewLibraryHelpTest(AcceptanceTest): ...@@ -296,7 +296,7 @@ class NewLibraryHelpTest(AcceptanceTest):
test=self, test=self,
page=self.dashboard_page, page=self.dashboard_page,
href=expected_url, href=expected_url,
help_text='Getting Started with edX Studio', help_text='Getting Started with Your Platform Studio',
as_list_item=True as_list_item=True
) )
......
...@@ -581,7 +581,7 @@ if 'DATADOG_API' in AUTH_TOKENS: ...@@ -581,7 +581,7 @@ if 'DATADOG_API' in AUTH_TOKENS:
# Analytics Dashboard # Analytics Dashboard
ANALYTICS_DASHBOARD_URL = ENV_TOKENS.get("ANALYTICS_DASHBOARD_URL", ANALYTICS_DASHBOARD_URL) ANALYTICS_DASHBOARD_URL = ENV_TOKENS.get("ANALYTICS_DASHBOARD_URL", ANALYTICS_DASHBOARD_URL)
ANALYTICS_DASHBOARD_NAME = ENV_TOKENS.get("ANALYTICS_DASHBOARD_NAME", PLATFORM_NAME + " Insights") ANALYTICS_DASHBOARD_NAME = ENV_TOKENS.get("ANALYTICS_DASHBOARD_NAME", ANALYTICS_DASHBOARD_NAME)
# Mailchimp New User List # Mailchimp New User List
MAILCHIMP_NEW_USER_LIST_ID = ENV_TOKENS.get("MAILCHIMP_NEW_USER_LIST_ID") MAILCHIMP_NEW_USER_LIST_ID = ENV_TOKENS.get("MAILCHIMP_NEW_USER_LIST_ID")
......
...@@ -45,7 +45,7 @@ from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin ...@@ -45,7 +45,7 @@ from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin
################################### FEATURES ################################### ################################### FEATURES ###################################
# The display name of the platform to be used in templates/emails/etc. # The display name of the platform to be used in templates/emails/etc.
PLATFORM_NAME = "Your Platform Name Here" PLATFORM_NAME = _('Your Platform Name Here')
CC_MERCHANT_NAME = PLATFORM_NAME CC_MERCHANT_NAME = PLATFORM_NAME
PLATFORM_FACEBOOK_ACCOUNT = "http://www.facebook.com/YourPlatformFacebookAccount" PLATFORM_FACEBOOK_ACCOUNT = "http://www.facebook.com/YourPlatformFacebookAccount"
...@@ -2852,7 +2852,7 @@ OPENID_DOMAIN_PREFIX = 'openid:' ...@@ -2852,7 +2852,7 @@ OPENID_DOMAIN_PREFIX = 'openid:'
### Analytics Dashboard (Insights) settings ### Analytics Dashboard (Insights) settings
ANALYTICS_DASHBOARD_URL = "" ANALYTICS_DASHBOARD_URL = ""
ANALYTICS_DASHBOARD_NAME = PLATFORM_NAME + " Insights" ANALYTICS_DASHBOARD_NAME = _('Your Platform Insights')
# REGISTRATION CODES DISPLAY INFORMATION SUBTITUTIONS IN THE INVOICE ATTACHMENT # REGISTRATION CODES DISPLAY INFORMATION SUBTITUTIONS IN THE INVOICE ATTACHMENT
INVOICE_CORP_ADDRESS = "Please place your corporate address\nin this configuration" INVOICE_CORP_ADDRESS = "Please place your corporate address\nin this configuration"
......
...@@ -15,7 +15,6 @@ DEBUG = True ...@@ -15,7 +15,6 @@ DEBUG = True
USE_I18N = True USE_I18N = True
DEFAULT_TEMPLATE_ENGINE['OPTIONS']['debug'] = True DEFAULT_TEMPLATE_ENGINE['OPTIONS']['debug'] = True
SITE_NAME = 'localhost:8000' SITE_NAME = 'localhost:8000'
PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'Devstack')
# By default don't use a worker, execute tasks as if they were local functions # By default don't use a worker, execute tasks as if they were local functions
CELERY_ALWAYS_EAGER = True CELERY_ALWAYS_EAGER = True
HTTPS = 'off' HTTPS = 'off'
......
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