Merge pull request #29600 from edx/jawayria/fix-ugettext-lms5
fix: replace 'ugettext' with 'gettext' in lms
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<%!
|
<%!
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
|
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
|
||||||
|
|
||||||
# App that handles subdomain specific branding
|
# App that handles subdomain specific branding
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<%namespace file='../main.html' import="login_query"/>
|
<%namespace file='../main.html' import="login_query"/>
|
||||||
<%!
|
<%!
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
import waffle
|
import waffle
|
||||||
|
|
||||||
from lms.djangoapps.ccx.overrides import get_current_ccx
|
from lms.djangoapps.ccx.overrides import get_current_ccx
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<%namespace file='../main.html' import="login_query"/>
|
<%namespace file='../main.html' import="login_query"/>
|
||||||
<%!
|
<%!
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
|
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
|
||||||
%>
|
%>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<%namespace name='static' file='../static_content.html'/>
|
<%namespace name='static' file='../static_content.html'/>
|
||||||
<%!
|
<%!
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from lms.djangoapps.ccx.overrides import get_current_ccx
|
from lms.djangoapps.ccx.overrides import get_current_ccx
|
||||||
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
|
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
|
||||||
from openedx.features.enterprise_support.utils import get_enterprise_learner_generic_name, get_enterprise_learner_portal
|
from openedx.features.enterprise_support.utils import get_enterprise_learner_generic_name, get_enterprise_learner_portal
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<%!
|
<%!
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from six import text_type
|
from six import text_type
|
||||||
|
|
||||||
from openedx.core.djangoapps.user_authn.toggles import should_redirect_to_authn_microfrontend
|
from openedx.core.djangoapps.user_authn.toggles import should_redirect_to_authn_microfrontend
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import json
|
|||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
|
|
||||||
from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_image_urls_for_user
|
from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_image_urls_for_user
|
||||||
from openedx.core.djangoapps.user_api.accounts.toggles import should_redirect_to_order_history_microfrontend
|
from openedx.core.djangoapps.user_api.accounts.toggles import should_redirect_to_order_history_microfrontend
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<%inherit file="main.html" />
|
<%inherit file="main.html" />
|
||||||
<%namespace name='static' file='static_content.html'/>
|
<%namespace name='static' file='static_content.html'/>
|
||||||
<%!
|
<%!
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
from openedx.core.djangolib.markup import HTML, Text
|
from openedx.core.djangolib.markup import HTML, Text
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<%page args="section_data" expression_filter="h"/>
|
<%page args="section_data" expression_filter="h"/>
|
||||||
<%!
|
<%!
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
%>
|
%>
|
||||||
<section id="add-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-labelledby="header-coupon-code">
|
<section id="add-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-labelledby="header-coupon-code">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<%page args="section_data" expression_filter="h"/>
|
<%page args="section_data" expression_filter="h"/>
|
||||||
<%namespace name='static' file='/static_content.html'/>
|
<%namespace name='static' file='/static_content.html'/>
|
||||||
<%!
|
<%!
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from openedx.core.djangolib.markup import HTML, Text
|
from openedx.core.djangolib.markup import HTML, Text
|
||||||
%>
|
%>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<%page args="section_data" expression_filter="h"/>
|
<%page args="section_data" expression_filter="h"/>
|
||||||
<%!
|
<%!
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
%>
|
%>
|
||||||
<section id="edit-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-labelledby="header-edit-coupon-code">
|
<section id="edit-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-labelledby="header-edit-coupon-code">
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<%!
|
<%!
|
||||||
from django.utils.encoding import escape_uri_path
|
from django.utils.encoding import escape_uri_path
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
|
|
||||||
from openedx.core.djangolib.markup import HTML, Text
|
from openedx.core.djangolib.markup import HTML, Text
|
||||||
%>
|
%>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<%namespace name='static' file='/static_content.html'/>
|
<%namespace name='static' file='/static_content.html'/>
|
||||||
<%def name="online_help_token()"><% return "instructor" %></%def>
|
<%def name="online_help_token()"><% return "instructor" %></%def>
|
||||||
<%!
|
<%!
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from openedx.core.djangolib.markup import HTML
|
from openedx.core.djangolib.markup import HTML
|
||||||
%>
|
%>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<%page args="section_data" expression_filter="h"/>
|
<%page args="section_data" expression_filter="h"/>
|
||||||
<%!
|
<%!
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
%>
|
%>
|
||||||
<section id="set-course-mode-price-modal" class="modal" role="dialog" tabindex="-1" aria-labelledby="header-course-price">
|
<section id="set-course-mode-price-modal" class="modal" role="dialog" tabindex="-1" aria-labelledby="header-course-price">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<%page expression_filter="h" />
|
<%page expression_filter="h" />
|
||||||
<%inherit file="main.html" />
|
<%inherit file="main.html" />
|
||||||
<%! from django.utils.translation import ugettext as _
|
<%! from django.utils.translation import gettext as _
|
||||||
from openedx.core.djangolib.markup import HTML, Text
|
from openedx.core.djangolib.markup import HTML, Text
|
||||||
%>
|
%>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<%page expression_filter="h"/>
|
<%page expression_filter="h"/>
|
||||||
<%!
|
<%!
|
||||||
import json
|
import json
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<h3 class="hd hd-3 problem-header">
|
<h3 class="hd hd-3 problem-header">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<%page expression_filter="h"/>
|
<%page expression_filter="h"/>
|
||||||
<%!
|
<%!
|
||||||
import json
|
import json
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import gettext as _
|
||||||
from openedx.core.djangolib.js_utils import js_escaped_string
|
from openedx.core.djangolib.js_utils import js_escaped_string
|
||||||
%>
|
%>
|
||||||
<!DOCTYPE HTML>
|
<!DOCTYPE HTML>
|
||||||
|
|||||||
Reference in New Issue
Block a user