paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

i18n: Be deliberate about distinguishing ugettext and ugettext_lazy.

Browse Source 
The early str conversions in zerver.models were defeating the point of
ugettext_lazy.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-10-16 18:00:33 -07:00
committed by Tim Abbott
parent e6f6f8d45f
commit bba43f35ca
4 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
zerver/lib/hotspots.py
View File

@@ -3,34 +3,43 @@
from typing import Dict, List
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from django.utils.functional import Promise
from django.utils.translation import ugettext_lazy
from zerver.models import UserHotspot, UserProfile
ALL_HOTSPOTS: Dict[str, Dict[str, str]] = {
ALL_HOTSPOTS: Dict[str, Dict[str, Promise]] = {
'intro_reply': {
'title': _('Reply to a message'),
'description': _('Click anywhere on a message to reply.'),
'title': ugettext_lazy('Reply to a message'),
'description': ugettext_lazy('Click anywhere on a message to reply.'),
},
'intro_streams': {
'title': _('Catch up on a stream'),
'description': _('Messages sent to a stream are seen by everyone subscribed '
'to that stream. Try clicking on one of the stream links below.'),
'title': ugettext_lazy('Catch up on a stream'),
'description': ugettext_lazy(
'Messages sent to a stream are seen by everyone subscribed '
'to that stream. Try clicking on one of the stream links below.'
),
},
'intro_topics': {
'title': _('Topics'),
'description': _('Every message has a topic. Topics keep conversations '
'easy to follow, and make it easy to reply to conversations that start '
'while you are offline.'),
'title': ugettext_lazy('Topics'),
'description': ugettext_lazy(
'Every message has a topic. Topics keep conversations '
'easy to follow, and make it easy to reply to conversations that start '
'while you are offline.'
),
},
'intro_gear': {
'title': _('Settings'),
'description': _('Go to Settings to configure your notifications and display settings.'),
'title': ugettext_lazy('Settings'),
'description': ugettext_lazy(
'Go to Settings to configure your notifications and display settings.'
),
},
'intro_compose': {
'title': _('Compose'),
'description': _('Click here to start a new conversation. Pick a topic '
'(2-3 words is best), and give it a go!'),
'title': ugettext_lazy('Compose'),
'description': ugettext_lazy(
'Click here to start a new conversation. Pick a topic '
'(2-3 words is best), and give it a go!'
),
},
}