fix: ugetext and ngettext deprecation warnings (openedx#33097)

cms/djangoapps/contentstore/tests/test_i18n.py

@@ -118,7 +118,6 @@ def __exit__(self, _type, _value, _traceback):
             # Check that the old ugettext has been put back into place
             self.assertEqual(i18n_service.ugettext(self.test_language), 'dummy language')
 
-    @mock.patch('django.utils.translation.ugettext', mock.Mock(return_value='XYZ-TEST-LANGUAGE'))
     @mock.patch('django.utils.translation.gettext', mock.Mock(return_value='XYZ-TEST-LANGUAGE'))
     def test_django_translator_in_use_with_empty_block(self):
         """
@@ -127,7 +126,7 @@ def test_django_translator_in_use_with_empty_block(self):
         i18n_service = XBlockI18nService(None)
         self.assertEqual(i18n_service.ugettext(self.test_language), 'XYZ-TEST-LANGUAGE')
 
-    @mock.patch('django.utils.translation.ugettext', mock.Mock(return_value='XYZ-TEST-LANGUAGE'))
+    @mock.patch('django.utils.translation.gettext', mock.Mock(return_value='XYZ-TEST-LANGUAGE'))
     def test_message_catalog_translations(self):
         """
         Test: Message catalog from FakeTranslation should return required translations.

lms/templates/dashboard/_dashboard_course_listing.html

@@ -7,7 +7,7 @@
 from django.utils.http import urlencode
 from urllib.parse import quote_plus
 from django.utils.translation import gettext as _
-from django.utils.translation import ungettext
+from django.utils.translation import ngettext
 from django.urls import reverse
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.course_modes.helpers import enrollment_mode_display

lms/templates/discussion/_user_profile.html

@@ -1,10 +1,10 @@
-<%! from django.utils.translation import gettext as _, ungettext %>
+<%! from django.utils.translation import gettext as _, ngettext %>
 <%def name="span(num)"><span>${num}</span></%def>
 <div class="user-profile">
   <div class="sidebar-username"><a class="learner-profile-link" href="${learner_profile_page_url}">${django_user.username | h}</a></div>
   <div class="sidebar-user-roles">
     ${", ".join(_(role_name) for role_name in django_user_roles)}
   </div>
-  <div class="sidebar-threads-count">${ungettext('%s discussion started', '%s discussions started', profiled_user['threads_count']) % span(profiled_user['threads_count']) | h}</div>
-  <div class="sidebar-comments-count">${ungettext('%s comment', '%s comments', profiled_user['comments_count']) % span(profiled_user['comments_count']) | h}</div>
+  <div class="sidebar-threads-count">${ngettext('%s discussion started', '%s discussions started', profiled_user['threads_count']) % span(profiled_user['threads_count']) | h}</div>
+  <div class="sidebar-comments-count">${ngettext('%s comment', '%s comments', profiled_user['comments_count']) % span(profiled_user['comments_count']) | h}</div>
 </div>