mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	python: Convert deprecated Django ugettext alias to gettext again.
django.utils.translation.ugettext is a deprecated alias of
django.utils.translation.gettext as of Django 3.0, and will be removed
in Django 4.0.
Commit e7ed907cf6 (#18174) fixed this
before, but new instances have been added.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
			
			
This commit is contained in:
		
				
					committed by
					
						
						Anders Kaseorg
					
				
			
			
				
	
			
			
			
						parent
						
							19b470c260
						
					
				
				
					commit
					bea64f8608
				
			@@ -4,7 +4,7 @@ from typing import Any, Dict, List, Set, cast
 | 
			
		||||
 | 
			
		||||
from django.core.exceptions import ValidationError
 | 
			
		||||
from django.http import HttpRequest, HttpResponse
 | 
			
		||||
from django.utils.translation import ugettext as _
 | 
			
		||||
from django.utils.translation import gettext as _
 | 
			
		||||
 | 
			
		||||
from zerver.lib.actions import recipient_for_user_profiles
 | 
			
		||||
from zerver.lib.addressee import get_user_profiles_by_ids
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@ from typing import Any, Dict, List
 | 
			
		||||
 | 
			
		||||
import dateutil.parser
 | 
			
		||||
from django.http import HttpRequest, HttpResponse
 | 
			
		||||
from django.utils.translation import ugettext as _
 | 
			
		||||
from django.utils.translation import gettext as _
 | 
			
		||||
 | 
			
		||||
from zerver.decorator import webhook_view
 | 
			
		||||
from zerver.lib.actions import send_rate_limited_pm_notification_to_bot_owner
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
from typing import Any, Dict
 | 
			
		||||
 | 
			
		||||
from django.http import HttpRequest, HttpResponse
 | 
			
		||||
from django.utils.translation import ugettext as _
 | 
			
		||||
from django.utils.translation import gettext as _
 | 
			
		||||
 | 
			
		||||
from zerver.decorator import webhook_view
 | 
			
		||||
from zerver.lib.actions import send_rate_limited_pm_notification_to_bot_owner
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user