Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Tweaked a bit the release notes document.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 12b5152233b145dbcb9061da781107d1a696b54e 1 parent e494f88
Ramiro Morales authored March 14, 2011

Showing 1 changed file with 21 additions and 21 deletions. Show diff stats Hide diff stats

  1. 42  docs/releases/1.3.txt
42  docs/releases/1.3.txt
@@ -211,7 +211,7 @@ The GeoDjango test suite is now included when
211 211
 when using :ref:`spatial database backends <spatial-backends>`.
212 212
 
213 213
 ``MEDIA_URL`` and ``STATIC_URL`` must end in a slash
214  
-----------------------------------------------------
  214
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
215 215
 
216 216
 Previously, the ``MEDIA_URL`` setting only required a trailing slash if it
217 217
 contained a suffix beyond the domain name.
@@ -555,9 +555,9 @@ test case.
555 555
 Changed priority of translation loading
556 556
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
557 557
 
558  
-Work has been done to homogeneize, simplify, rationalize and properly document
559  
-the algorithm used by Django at runtime to build translations from the
560  
-differents translations found on disk, namely:
  558
+Work has been done to simplify, rationalize and properly document the algorithm
  559
+used by Django at runtime to build translations from the differents translations
  560
+found on disk, namely:
561 561
 
562 562
 For translatable literals found in Python code and templates (``'django'``
563 563
 gettext domain):
@@ -592,11 +592,11 @@ domain):
592 592
    :ref:`javascript_catalog view <javascript_catalog-view>`.  Paths listed first
593 593
    have higher precedence than the ones listed later.
594 594
 
595  
- * Translations under the ``locale`` sbdirectory of the *project directory* have
596  
-   never been taken in account for JavaScript translations and remain in the
597  
-   same situation considering the deprecation of such location.
  595
+ * Translations under the ``locale`` subdirectory of the *project directory*
  596
+   have never been taken in account for JavaScript translations and remain in
  597
+   the same situation considering the deprecation of such location.
598 598
 
599  
-.. _corresponding deprecated features section: loading_of_translations_from_the_project_directory_
  599
+.. _corresponding deprecated features section: loading_of_project_level_translations_
600 600
 
601 601
 Transaction management
602 602
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -812,16 +812,16 @@ which was a bug-fix wrapper around the standard library ``SimpleCookie``. As the
812 812
 fixes are moving upstream, this is now deprecated - you should use ``from
813 813
 django.http import SimpleCookie`` instead.
814 814
 
815  
-.. _loading_of_translations_from_the_project_directory:
  815
+.. _loading_of_project_level_translations:
816 816
 
817  
-Loading of translations from the project directory
818  
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  817
+Loading of *project-level* translations
  818
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
819 819
 
820 820
 This release of Django starts the deprecation process for inclusion of
821  
-translations located under the *project path* in the translation building
822  
-process performed at runtime. The :setting:`LOCALE_PATHS` setting can be used
823  
-for the same task by including in it the filesystem path to the ``locale``
824  
-directory containing project-level translations.
  821
+translations located under the so-called *project path* in the translation
  822
+building process performed at runtime. The :setting:`LOCALE_PATHS` setting can
  823
+be used for the same task by adding the filesystem path to a ``locale``
  824
+directory containing project-level translations to the value of that setting.
825 825
 
826 826
 Rationale for this decision:
827 827
 
@@ -835,17 +835,17 @@ Rationale for this decision:
835 835
    scenario is more complex than the basic one. e.g. it fails when the settings
836 836
    module is a directory (ticket #10765).
837 837
 
838  
- * Potential for strange development- and deployment-time problems like the
  838
+ * There are potential strange development- and deployment-time problems like the
839 839
    fact that the ``project_dir/locale/`` subdir can generate spurious error
840  
-   messages when the project directory is included in the Python path (default
841  
-   behavior of ``manage.py runserver``) and then it clashes with the equally
842  
-   named standard library module, this is a typical warming message::
  840
+   messages when the project directory is added to the Python path (``manage.py
  841
+   runserver`` does this) and then it clashes with the equally named standard
  842
+   library module, this is a typical warning message::
843 843
 
844  
-     /usr/lib/python2.6/gettext.py:49: ImportWarning: Not importing directory '/path/to/project/dir/locale': missing __init__.py.
  844
+     /usr/lib/python2.6/gettext.py:49: ImportWarning: Not importing directory '/path/to/project/locale': missing __init__.py.
845 845
      import locale, copy, os, re, struct, sys
846 846
 
847 847
  * This location wasn't included in the translation building process for
848  
-   JavaScript literals.
  848
+   JavaScript literals. This deprecation removes such inconsistency.
849 849
 
850 850
 ``PermWrapper`` moved to ``django.contrib.auth.context_processors``
851 851
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 notes on commit 12b5152

Please sign in to comment.
Something went wrong with that request. Please try again.