Commit 079d9f37 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[1.1.X] Fixed #11384 - Make sure translations in the project directory really...

[1.1.X] Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs.

Backport of r12447.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b698d776
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -176,9 +176,6 @@ def translation(language):
            if os.path.isdir(localepath):
                res = _merge(localepath)

        if projectpath and os.path.isdir(projectpath):
            res = _merge(projectpath)

        for appname in settings.INSTALLED_APPS:
            app = import_module(appname)
            apppath = os.path.join(os.path.dirname(app.__file__), 'locale')
@@ -186,6 +183,9 @@ def translation(language):
            if os.path.isdir(apppath):
                res = _merge(apppath)

        if projectpath and os.path.isdir(projectpath):
            res = _merge(projectpath)

        if res is None:
            if fallback is not None:
                res = fallback
+469 B

File added.

No diff preview for this file type.

+22 −0
Original line number Diff line number Diff line
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-02-14 17:33+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

#: models.py:3
msgid "Date/time"
msgstr "Datum/Zeit (LOCALE_PATHS)"
+0 −0

Empty file added.

+460 B

File added.

No diff preview for this file type.

Loading