Django

Code

Changeset 8393

Show
Ignore:
Timestamp:
08/15/08 16:08:11 (4 months ago)
Author:
gwilson
Message:

Fixed #5270 -- Allow template tags and filters to accept an emtpy string, patch from jdunck.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/template/__init__.py

    r7580 r8393  
    486486            if var == None: 
    487487                var, constant, i18n_constant = match.group("var", "constant", "i18n_constant") 
    488                 if i18n_constant: 
    489                     var = '"%s"' %  _(i18n_constant.replace(r'\"', '"')) 
    490                 elif constant: 
     488                if i18n_constant is not None: 
     489                    # Don't pass the empty string to gettext, because the empty 
     490                    # string translates to meta information. 
     491                    if i18n_constant == "": 
     492                        var = '""' 
     493                    else: 
     494                        var = '"%s"' %  _(i18n_constant.replace(r'\"', '"')) 
     495                elif constant is not None: 
    491496                    var = '"%s"' % constant.replace(r'\"', '"') 
    492497                upto = match.end() 

  • django/trunk/tests/regressiontests/templates/tests.py

    r8211 r8393  
    366366            # Numbers as filter arguments should work 
    367367            'filter-syntax19': ('{{ var|truncatewords:1 }}', {"var": "hello world"}, "hello ..."), 
     368             
     369            #filters should accept empty string constants 
     370            'filter-syntax20': ('{{ ""|default_if_none:"was none" }}', {}, ""), 
    368371 
    369372            ### COMMENT SYNTAX ######################################################## 
    …… 
    771774            'i18n15': ('{{ absent|default:_("Password") }}', {'LANGUAGE_CODE': 'de', 'absent': ""}, 'Passwort'), 
    772775            'i18n16': ('{{ _("<") }}', {'LANGUAGE_CODE': 'de'}, '<'), 
     776            'i18n17': ('{{ _("") }}', {'LANGUAGE_CODE': 'de'}, ''), 
    773777 
    774778            # Escaping inside blocktrans works as if it was directly in the 
    775779            # template. 
    776             'i18n17': ('{% load i18n %}{% blocktrans with anton|escape as berta %}{{ berta }}{% endblocktrans %}', {'anton': 'α & β'}, u'α &amp; β'), 
    777             'i18n18': ('{% load i18n %}{% blocktrans with anton|force_escape as berta %}{{ berta }}{% endblocktrans %}', {'anton': 'α & β'}, u'α &amp; β'), 
     780            'i18n18': ('{% load i18n %}{% blocktrans with anton|escape as berta %}{{ berta }}{% endblocktrans %}', {'anton': 'α & β'}, u'α &amp; β'), 
     781            'i18n19': ('{% load i18n %}{% blocktrans with anton|force_escape as berta %}{{ berta }}{% endblocktrans %}', {'anton': 'α & β'}, u'α &amp; β'), 
    778782 
    779783            ### HANDLING OF TEMPLATE_STRING_IF_INVALID ###################################