Merged revisions 6442-6524 via svnmerge from [repos:django/trunk trunk].

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6525 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 13 insertions, 13 deletions

diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index 2f3c9bb568..d750f098f0 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -54,7 +54,10 @@ class SortedDict(dict):
     def __init__(self, data=None):
         if data is None: data = {}
         dict.__init__(self, data)
-        self.keyOrder = data.keys()
+        if isinstance(data, dict):
+            self.keyOrder = data.keys()
+        else:
+            self.keyOrder=[key for key, value in data]
 
     def __setitem__(self, key, value):
         dict.__setitem__(self, key, value)
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index 13fc8a847a..9ca7419e1e 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -2,6 +2,7 @@
 Internationalization support.
 """
 from django.utils.functional import lazy
+from django.utils.encoding import force_unicode
 
 __all__ = ['gettext', 'gettext_noop', 'gettext_lazy', 'ngettext',
         'ngettext_lazy', 'string_concat', 'activate', 'deactivate',
@@ -39,7 +40,7 @@ def delayed_loader(*args, **kwargs):
             g['real_%s' % name] = getattr(trans, name)
 
     # Make the originally requested function call on the way out the door.
-    return g[caller](*args, **kwargs)
+    return g['real_%s' % caller](*args, **kwargs)
 
 g = globals()
 for name in __all__:
@@ -63,14 +64,10 @@ def ugettext(message):
 def ungettext(singular, plural, number):
     return real_ungettext(singular, plural, number)
 
-def string_concat(*strings):
-    return real_string_concat(*strings)
-
 ngettext_lazy = lazy(ngettext, str)
 gettext_lazy = lazy(gettext, str)
 ungettext_lazy = lazy(ungettext, unicode)
 ugettext_lazy = lazy(ugettext, unicode)
-string_concat = lazy(string_concat, unicode)
 
 def activate(language):
     return real_activate(language)
@@ -108,3 +105,10 @@ def templatize(src):
 def deactivate_all():
     return real_deactivate_all()
 
+def string_concat(*strings):
+    """
+    Lazy variant of string concatenation, needed for translations that are
+    constructed from multiple parts.
+    """
+    return u''.join([force_unicode(s) for s in strings])
+string_concat = lazy(string_concat, unicode)
diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py
index e3f89567a5..771a80e99c 100644
--- a/django/utils/translation/trans_null.py
+++ b/django/utils/translation/trans_null.py
@@ -13,7 +13,6 @@ ngettext_lazy = ngettext
 def ungettext(singular, plural, number):
     return force_unicode(ngettext(singular, plural, number))
 
-string_concat = lambda *strings: u''.join([force_unicode(el) for el in strings])
 activate = lambda x: None
 deactivate = deactivate_all = install = lambda: None
 get_language = lambda: settings.LANGUAGE_CODE
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 5fff1ea63a..250af04e8c 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -516,9 +516,3 @@ def templatize(src):
                 out.write(blankout(t.contents, 'X'))
     return out.getvalue()
 
-def string_concat(*strings):
-    """"
-    Lazy variant of string concatenation, needed for translations that are
-    constructed from multiple parts.
-    """
-    return u''.join([force_unicode(s) for s in strings])