Ticket #9321: django_t9321_r15242_a.diff

django/db/models/fields/related.py

@@ -9 +9 @@
 from django.db.models.query_utils import QueryWrapper
 from django.db.models.deletion import CASCADE
 from django.utils.encoding import smart_unicode
-from django.utils.translation import (ugettext_lazy as _, string_concat,
-    ungettext, ugettext)
+from django.utils.translation import ugettext_lazy as _, ungettext, ugettext
 from django.utils.functional import curry
 from django.core import exceptions
 from django import forms
@@ -1007 +1006 @@
 
         Field.__init__(self, **kwargs)
 
-        msg = _('Hold down "Control", or "Command" on a Mac, to select more than one.')
-        self.help_text = string_concat(self.help_text, ' ', msg)
-
     def get_choices_default(self):
         return Field.get_choices(self, include_blank=False)
 

django/contrib/admin/options.py

@@ -24 +24 @@
 from django.utils.functional import curry
 from django.utils.text import capfirst, get_text_list
 from django.utils.translation import ugettext as _
-from django.utils.translation import ungettext
+from django.utils.translation import ungettext, string_concat
 from django.utils.encoding import force_unicode
 
 HORIZONTAL, VERTICAL = 1, 2
@@ -53 +53 @@
     models.FileField:       {'widget': widgets.AdminFileWidget},
 }
 
+SELECT_MULTIPLE_MSG = _('Hold down "Control", or "Command" on a Mac, to select more than one.')
+
 csrf_protect_m = method_decorator(csrf_protect)
 
 class BaseModelAdmin(object):
@@ -180 +182 @@
         elif db_field.name in (list(self.filter_vertical) + list(self.filter_horizontal)):
             kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
 
+        kwargs['help_text'] = string_concat(kwargs.get('help_text', ''), ' ', SELECT_MULTIPLE_MSG)
+
         return db_field.formfield(**kwargs)
 
     def _declared_fieldsets(self):