Commit 917100ee authored by Dmitry Dygalo's avatar Dmitry Dygalo Committed by Tim Graham
Browse files

Simplified dict initialization in two places.

parent 7a48f9ab

django/db/models/expressions.py

+4 −2
Original line number Diff line number Diff line
@@ -982,8 +982,10 @@ class OrderBy(BaseExpression): 
    def as_sql(self, compiler, connection):

        connection.ops.check_expression_support(self)

        expression_sql, params = compiler.compile(self.expression)

        placeholders = {'expression': expression_sql}

        placeholders['ordering'] = 'DESC' if self.descending else 'ASC'

        placeholders = {

            'expression': expression_sql,

            'ordering': 'DESC' if self.descending else 'ASC',

        }

        return (self.template % placeholders).rstrip(), params



    def get_group_by_cols(self):

django/template/context_processors.py

+5 −8
Original line number Diff line number Diff line
@@ -49,18 +49,15 @@ def debug(request): 


def i18n(request):

    from django.utils import translation



    context_extras = {}

    context_extras['LANGUAGES'] = settings.LANGUAGES

    context_extras['LANGUAGE_CODE'] = translation.get_language()

    context_extras['LANGUAGE_BIDI'] = translation.get_language_bidi()



    return context_extras

    return {

        'LANGUAGES': settings.LANGUAGES,

        'LANGUAGE_CODE': translation.get_language(),

        'LANGUAGE_BIDI': translation.get_language_bidi(),

    }





def tz(request):

    from django.utils import timezone



    return {'TIME_ZONE': timezone.get_current_timezone_name()}