Merge pull request #29601 from edx/jawayria/fix-ugettext-lms6

fix: replace 'ugettext' with 'gettext' in lms
This commit is contained in:
Jawayria
2021-12-16 13:59:06 +05:00
committed by GitHub
18 changed files with 18 additions and 18 deletions

View File

@@ -18,7 +18,7 @@ import six
from lms.djangoapps.branding import api as branding_api
from django.urls import reverse
from django.utils.http import urlquote_plus
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from django.utils.translation import get_language_bidi
from lms.djangoapps.courseware.access import has_access
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers

View File

@@ -3,7 +3,7 @@
<%!
from django.urls import reverse
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from openedx.core.djangolib.js_utils import js_escaped_string
%>

View File

@@ -2,7 +2,7 @@
<%namespace name='static' file='../static_content.html'/>
<%!
from openedx.core.djangolib.markup import HTML, Text
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from django.urls import reverse
%>

View File

@@ -1,6 +1,6 @@
<%page expression_filter="h" />
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from openedx.core.djangolib.markup import HTML, Text
%>
<%namespace name='static' file='static_content.html'/>

View File

@@ -5,7 +5,7 @@
<%namespace name='static' file='static_content.html'/>
<% online_help_token = self.online_help_token() if hasattr(self, 'online_help_token') else None %>
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from openedx.core.djangolib.markup import HTML
from openedx.core.djangoapps.util.user_messages import PageLevelMessages, UserMessage, UserMessageType
# app that handles site status messages

View File

@@ -3,7 +3,7 @@
<%page args="active_page=None" expression_filter="h" />
<%namespace name='static' file='/static_content.html'/>
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from django.conf import settings
from openedx.core.djangolib.js_utils import dump_js_escaped_json
from openedx.core.djangolib.markup import HTML, Text

View File

@@ -1,6 +1,6 @@
<%page expression_filter="h" args="notification_name, notification_type, notification_icon,
notification_message, should_enable_next_hint, is_hidden=True"/>
<%! from django.utils.translation import ugettext as _ %>
<%! from django.utils.translation import gettext as _ %>
<div class="notification ${notification_type} ${'notification-'}${notification_name}
${'' if not is_hidden else 'is-hidden' }"

View File

@@ -1,5 +1,5 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%! from django.utils.translation import gettext as _ %>
<%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>

View File

@@ -1,5 +1,5 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _
<%! from django.utils.translation import gettext as _
from openedx.core.djangolib.markup import HTML, Text
%>

View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%inherit file="main.html" />
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from django.urls import reverse
from openedx.core.djangolib.markup import HTML, Text

View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from openedx.core.djangolib.markup import HTML, Text
%>

View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%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
from openedx.core.djangolib.js_utils import js_escaped_string
from six import text_type

View File

@@ -1,6 +1,6 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from openedx.core.djangolib.markup import HTML
from openedx.core.djangolib.js_utils import (

View File

@@ -1,5 +1,5 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%! from django.utils.translation import gettext as _ %>
<%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>

View File

@@ -1,6 +1,6 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from openedx.core.djangolib.markup import HTML
from openedx.core.djangolib.js_utils import (

View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
%>
<%namespace name='static' file='../static_content.html'/>

View File

@@ -3,7 +3,7 @@
<%!
import six
from django.urls import reverse
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
%>
<%namespace name='static' file='../static_content.html'/>

View File

@@ -3,7 +3,7 @@
<%namespace name='static' file='../static_content.html'/>
<%!
import six
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from django.urls import reverse
from django.utils import html
from openedx.core.djangolib.markup import Text, HTML