Permalink
Browse files

Merge commit '32239cb5ff18e9e29ed5d2a6ffb5d230c61d8db2'

  • Loading branch information...
2 parents b9bbddb + 32239cb commit f1432077a7d666630a91bfae13b8a8703daa3300 @ojii ojii committed Jun 29, 2012
Showing with 11,474 additions and 3,200 deletions.
  1. +16 −1 AUTHORS
  2. +1 −1 cms/__init__.py
  3. +3 −2 cms/appresolver.py
  4. +3 −0 cms/conf/__init__.py
  5. BIN cms/locale/bg/LC_MESSAGES/django.mo
  6. +214 −248 cms/locale/bg/LC_MESSAGES/django.po
  7. BIN cms/locale/bg/LC_MESSAGES/djangojs.mo
  8. +13 −13 cms/locale/bg/LC_MESSAGES/djangojs.po
  9. BIN cms/locale/ca/LC_MESSAGES/django.mo
  10. +92 −158 cms/locale/ca/LC_MESSAGES/django.po
  11. BIN cms/locale/ca/LC_MESSAGES/djangojs.mo
  12. +10 −10 cms/locale/ca/LC_MESSAGES/djangojs.po
  13. BIN cms/locale/da/LC_MESSAGES/django.mo
  14. +429 −416 cms/locale/da/LC_MESSAGES/django.po
  15. BIN cms/locale/da/LC_MESSAGES/djangojs.mo
  16. +10 −7 cms/locale/da/LC_MESSAGES/djangojs.po
  17. BIN cms/locale/de/LC_MESSAGES/django.mo
  18. +82 −229 cms/locale/de/LC_MESSAGES/django.po
  19. BIN cms/locale/es/LC_MESSAGES/django.mo
  20. +115 −255 cms/locale/es/LC_MESSAGES/django.po
  21. BIN cms/locale/es_AR/LC_MESSAGES/django.mo
  22. +58 −70 cms/locale/es_AR/LC_MESSAGES/django.po
  23. BIN cms/locale/es_BO/LC_MESSAGES/django.mo
  24. +1,838 −0 cms/locale/es_BO/LC_MESSAGES/django.po
  25. BIN cms/locale/es_BO/LC_MESSAGES/djangojs.mo
  26. +40 −0 cms/locale/es_BO/LC_MESSAGES/djangojs.po
  27. BIN cms/locale/fr/LC_MESSAGES/django.mo
  28. +79 −221 cms/locale/fr/LC_MESSAGES/django.po
  29. BIN cms/locale/hr/LC_MESSAGES/django.mo
  30. +1,836 −0 cms/locale/hr/LC_MESSAGES/django.po
  31. BIN cms/locale/hr/LC_MESSAGES/djangojs.mo
  32. +39 −0 cms/locale/hr/LC_MESSAGES/djangojs.po
  33. BIN cms/locale/it/LC_MESSAGES/djangojs.mo
  34. +11 −14 cms/locale/it/LC_MESSAGES/djangojs.po
  35. BIN cms/locale/ja/LC_MESSAGES/django.mo
  36. +46 −97 cms/locale/ja/LC_MESSAGES/django.po
  37. BIN cms/locale/ja/LC_MESSAGES/djangojs.mo
  38. +8 −6 cms/locale/ja/LC_MESSAGES/djangojs.po
  39. BIN cms/locale/ka/LC_MESSAGES/django.mo
  40. +1,834 −0 cms/locale/ka/LC_MESSAGES/django.po
  41. BIN cms/locale/ku_IQ/LC_MESSAGES/django.mo
  42. +1,835 −0 cms/locale/ku_IQ/LC_MESSAGES/django.po
  43. BIN cms/locale/nl/LC_MESSAGES/django.mo
  44. +115 −251 cms/locale/nl/LC_MESSAGES/django.po
  45. BIN cms/locale/nl/LC_MESSAGES/djangojs.mo
  46. +11 −12 cms/locale/nl/LC_MESSAGES/djangojs.po
  47. BIN cms/locale/pl/LC_MESSAGES/django.mo
  48. +110 −188 cms/locale/pl/LC_MESSAGES/django.po
  49. BIN cms/locale/pl/LC_MESSAGES/djangojs.mo
  50. +11 −11 cms/locale/pl/LC_MESSAGES/djangojs.po
  51. BIN cms/locale/pt_BR/LC_MESSAGES/django.mo
  52. +95 −171 cms/locale/pt_BR/LC_MESSAGES/django.po
  53. BIN cms/locale/pt_BR/LC_MESSAGES/djangojs.mo
  54. +12 −15 cms/locale/pt_BR/LC_MESSAGES/djangojs.po
  55. BIN cms/locale/sl_SI/LC_MESSAGES/django.mo
  56. +88 −155 cms/locale/sl_SI/LC_MESSAGES/django.po
  57. BIN cms/locale/sl_SI/LC_MESSAGES/djangojs.mo
  58. +12 −14 cms/locale/sl_SI/LC_MESSAGES/djangojs.po
  59. BIN cms/locale/sr@latin/LC_MESSAGES/django.mo
  60. +1,836 −0 cms/locale/sr@latin/LC_MESSAGES/django.po
  61. BIN cms/locale/sr@latin/LC_MESSAGES/djangojs.mo
  62. +38 −0 cms/locale/sr@latin/LC_MESSAGES/djangojs.po
  63. BIN cms/locale/sv/LC_MESSAGES/django.mo
  64. +83 −141 cms/locale/sv/LC_MESSAGES/django.po
  65. BIN cms/locale/tr/LC_MESSAGES/django.mo
  66. +48 −86 cms/locale/tr/LC_MESSAGES/django.po
  67. BIN cms/locale/zh_CN/LC_MESSAGES/django.mo
  68. +57 −161 cms/locale/zh_CN/LC_MESSAGES/django.po
  69. +10 −0 cms/test_utils/project/sampleapp/templates/sampleapp/extra.html
  70. +5 −3 cms/test_utils/project/sampleapp/urls.py
  71. +9 −0 cms/test_utils/project/sampleapp/urls_extra.py
  72. +4 −0 cms/test_utils/project/sampleapp/views.py
  73. +31 −0 cms/tests/admin.py
  74. +43 −0 cms/tests/apphooks.py
  75. +4 −4 docs/advanced/cli.rst
  76. +5 −5 docs/advanced/i18n.rst
  77. +13 −13 docs/advanced/templatetags.rst
  78. +7 −7 docs/concepts/menu_system.rst
  79. +25 −20 docs/concepts/multiple_languages.rst
  80. +6 −6 docs/contribution.rst
  81. +4 −4 docs/extending_cms/api_references.rst
  82. +13 −13 docs/extending_cms/app_integration.rst
  83. +38 −39 docs/extending_cms/custom_plugins.rst
  84. +22 −22 docs/extending_cms/extending_examples.rst
  85. +8 −8 docs/extending_cms/placeholders.rst
  86. +2 −2 docs/extending_cms/searchdocs.rst
  87. +16 −16 docs/getting_started/configuration.rst
  88. +7 −11 docs/getting_started/installation.rst
  89. +5 −5 docs/getting_started/navigation.rst
  90. +11 −11 docs/getting_started/plugin_reference.rst
  91. +32 −31 docs/getting_started/tutorial.rst
  92. +7 −7 docs/getting_started/using_south.rst
  93. +1 −1 docs/upgrade/2.1.rst
  94. +8 −8 docs/upgrade/2.2.rst
  95. +8 −10 docs/upgrade/2.3.rst
  96. +2 −1 runtests.py
View
@@ -26,6 +26,8 @@ Contributors (in alphabetical order):
* Alberto Paro
* Alessandro Ronchi
* Aleš Kocjančič
+* Alexandre Leray
+* Alexey Subbotin
* Alvin Mites
* Andrew Cassidy
* Andrew Schoen
@@ -42,7 +44,9 @@ Contributors (in alphabetical order):
* beshrkayali
* Bob Karreman
* Bouke Haarsma
+* Braden MacDonald
* brightwhitefox
+* Calvin Cheng
* Chanita Siridechkun
* Charpentier Johan
* Cheng-Chia Tseng
@@ -51,7 +55,6 @@ Contributors (in alphabetical order):
* Chris Wesseling
* Christof Hagedorn
* Conrado Bührer
-* Daniele Procida
* DaNmarner
* Darryl Woods
* David Jean Louis
@@ -63,15 +66,22 @@ Contributors (in alphabetical order):
* Egor V. Nazarkin
* Ekrem Seren
* Erik Allik
+* Eugen MechanisM
* Evandro Miquelito
+* F. Gabriel Gosselin
* f4nt
* fcurella
* Filip Kazimierczak
* Frank Bieniek
+* Gabe Jackson
* Gabriel Hurley
* GaretJax
+* Geoffrey Hing
* George Marshall
* Gerard Świderski
+* guandalino
+* hedberg
+* Herbert Poul
* homebrew79
* hysia
* Iacopo Spalletti
@@ -133,6 +143,7 @@ Contributors (in alphabetical order):
* mrlundis
* MW
* neoprolog
+* Nickolay V. Shmyrev
* Orne Brocaar
* padelt
* Paolo
@@ -153,7 +164,9 @@ Contributors (in alphabetical order):
* Rebecca Breu
* Remco Wendt
* Restless Being
+* Robert Clark
* Robert Pogorzelski
+* Robin Lewis
* Rodolfo Carvalho
* rtpm
* Samuel Lüscher
@@ -173,11 +186,13 @@ Contributors (in alphabetical order):
* ssteinerX
* Stavros Korokithakis
* Stephan Jaekel
+* Stephen Muss
* Steve R. Jones
* Steve Steiner
* Tanel Külaots
* Thomas Parslow
* timesong
+* Tim Davies
* Tino de Bruijn
* tiret
* Ulrich Petri
View
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-__version__ = '2.3rc2'
+__version__ = '2.3'
# patch settings
try:
View
@@ -76,8 +76,9 @@ def recurse_patterns(path, pattern_list, page_id):
newpatterns = []
for pattern in pattern_list:
app_pat = pattern.regex.pattern
- if app_pat.startswith('^'):
- app_pat = app_pat[1:]
+ # make sure we don't get patterns that start with more than one '^'!
+ app_pat = app_pat.lstrip('^')
+ path = path.lstrip('^')
regex = r'^%s%s' % (path, app_pat)
if isinstance(pattern, RegexURLResolver):
# this is an 'include', recurse!
@@ -18,6 +18,9 @@ def patch_settings():
if getattr(settings, 'CMS_FLAT_URLS', False):
warnings.warn("CMS_FLAT_URLS are deprecated and will be removed in django CMS 2.4!", DeprecationWarning)
+ if getattr(settings, 'CMS_MODERATOR', False):
+ warnings.warn("CMS_MODERATOR will be removed and replaced in django CMS 2.4!", DeprecationWarning)
+
from cms.conf import global_settings
# patch settings
Binary file not shown.
Oops, something went wrong.

0 comments on commit f143207

Please sign in to comment.