Commit 184cf9ab authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge branch 'master' into schema-alteration

parents c4b2a326 72755762

django/conf/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ class UserSettingsHolder(BaseSettings): 
        return getattr(self.default_settings, name)



    def __dir__(self):

        return self.__dict__.keys() + dir(self.default_settings)

        return list(self.__dict__) + dir(self.default_settings)



    # For Python < 2.6:

    __members__ = property(lambda self: self.__dir__())

django/conf/locale/fi/formats.py

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ from __future__ import unicode_literals 
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date

DATE_FORMAT = 'j. E Y'

TIME_FORMAT = 'G.i.s'

# DATETIME_FORMAT = 

DATETIME_FORMAT = r'j. E Y \k\e\l\l\o G.i.s'

YEAR_MONTH_FORMAT = 'F Y'

MONTH_DAY_FORMAT = 'j. F'

SHORT_DATE_FORMAT = 'j.n.Y'

django/conf/locale/gl/formats.py

+8 −7
Original line number Diff line number Diff line 
# -*- encoding: utf-8 -*-

# This file is distributed under the same license as the Django package.

#

from __future__ import unicode_literals



# The *_FORMAT strings use the Django date format syntax,

# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date

DATE_FORMAT = 'd F Y'

DATE_FORMAT = r'j \d\e F \d\e Y'

TIME_FORMAT = 'H:i:s'

# DATETIME_FORMAT = 

YEAR_MONTH_FORMAT = 'F Y'

MONTH_DAY_FORMAT = 'j F'

SHORT_DATE_FORMAT = 'j M, Y'

# SHORT_DATETIME_FORMAT = 

# FIRST_DAY_OF_WEEK = 

DATETIME_FORMAT = r'j \d\e F \d\e Y \á\s H:i'

YEAR_MONTH_FORMAT = r'F \d\e Y'

MONTH_DAY_FORMAT = r'j \d\e F'

SHORT_DATE_FORMAT = 'd-m-Y'

SHORT_DATETIME_FORMAT = 'd-m-Y, H:i'

FIRST_DAY_OF_WEEK = 1 # Monday



# The *_INPUT_FORMATS strings use the Python strftime format syntax,

# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior

django/conf/urls/i18n.py

+2 −2
Original line number Diff line number Diff line 
from django.conf import settings

from django.conf.urls import patterns

from django.conf.urls import patterns, url

from django.core.urlresolvers import LocaleRegexURLResolver



def i18n_patterns(prefix, *args):
@@ -16,5 +16,5 @@ def i18n_patterns(prefix, *args): 




urlpatterns = patterns('',

    (r'^setlang/$', 'django.views.i18n.set_language'),

    url(r'^setlang/$', 'django.views.i18n.set_language', name='set_language'),

)

django/contrib/admin/actions.py

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ from django.contrib.admin import helpers 
from django.contrib.admin.util import get_deleted_objects, model_ngettext

from django.db import router

from django.template.response import TemplateResponse

from django.utils.encoding import force_unicode

from django.utils.encoding import force_text

from django.utils.translation import ugettext_lazy, ugettext as _



def delete_selected(modeladmin, request, queryset):
@@ -42,7 +42,7 @@ def delete_selected(modeladmin, request, queryset): 
        n = queryset.count()

        if n:

            for obj in queryset:

                obj_display = force_unicode(obj)

                obj_display = force_text(obj)

                modeladmin.log_deletion(request, obj, obj_display)

            queryset.delete()

            modeladmin.message_user(request, _("Successfully deleted %(count)d %(items)s.") % {
@@ -52,9 +52,9 @@ def delete_selected(modeladmin, request, queryset): 
        return None



    if len(queryset) == 1:

        objects_name = force_unicode(opts.verbose_name)

        objects_name = force_text(opts.verbose_name)

    else:

        objects_name = force_unicode(opts.verbose_name_plural)

        objects_name = force_text(opts.verbose_name_plural)



    if perms_needed or protected:

        title = _("Cannot delete %(name)s") % {"name": objects_name}