innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
14,030 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

78 Commits

Author SHA1 Message Date
Aymeric Augustin a44531ae15 Fixed #18862 -- Honored script prefix in FlatPage.get_absolute_url. 2013-02-24 13:27:13 +01:00
Aymeric Augustin 4b01ee7a50 URL-encoded URLs in FlatPage.get_absolute_url. 2013-02-24 13:27:13 +01:00
vanschelven 5e3b99d4cf Update django/contrib/flatpages/forms.py 
Translate before passing in the variables (i.e. close the bracket earlier).
If you translate after passing in the variables the translated value will contain the actual values for 'url' and 'site' and will therefore not be translated.

(I'm not actually using django's flatpages, but I ran into this apparent error when doing a global grep on my own project)
 2012-11-15 22:53:08 +01:00
Claude Paroz 58365401c9 Updated base translation files 2012-10-15 11:17:06 +02:00
Claude Paroz 1ce4aedcef Prevented flatpage view from directly accessing settings.SITE_ID 
Refs #15089
 2012-10-01 14:19:33 +02:00
Claude Paroz 6c2faaceb0 Made more extensive use of get_current_site 
Refs #15089
 2012-09-28 20:33:05 +02:00
Aymeric Augustin d4a0b27838 [py3] Refactored __unicode__ to __str__. 
* Renamed the __unicode__ methods
* Applied the python_2_unicode_compatible decorator
* Removed the StrAndUnicode mix-in that is superseded by
  python_2_unicode_compatible
* Kept the __unicode__ methods in classes that specifically
  test it under Python 2
 2012-08-12 14:44:40 +02:00
Ben Spaulding 24dec9edaa Add reST role to templates named in some view docs. 
This makes the templates link up correctly in the admindocs.
 2012-06-26 21:45:45 -05:00
Claude Paroz 4a103086d5 Fixed #18269 -- Applied unicode_literals for Python 3 compatibility. 
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
 2012-06-07 18:08:47 +02:00
Jens Page ba10be7032 Fixed #18408 -- Isolated flatpages tests from existing sites. 
Resolves Flatpages test issues by:
 - Creating an example_site fixture
 - Overriding project SITE_ID setting to 1
 - Normalizing the use of the hardcoded (1) site_id to settings.SITE_ID
 2012-05-31 18:03:49 +02:00
Karen Tracey 75743c189d Fixed #18234: Avoided exception on flatpage add 2012-04-28 19:44:14 -04:00
Aymeric Augustin 98e9d1c6ab Used the override_settings decorator in the tests of auth, flatpages, and formtools. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 16:03:09 +00:00
Claude Paroz 9383a2761c Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 08:02:08 +00:00
Jannis Leidel 122086032b Pulled flatpages translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:59:34 +00:00
Jannis Leidel 9d1d1f06db Added Tatar translation. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:15:31 +00:00
Jannis Leidel e540f27475 Added Swahili translation. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:14:48 +00:00
Jannis Leidel 830900c24a Added Nepali translation. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:14:07 +00:00
Jannis Leidel 661139a29e Added Kazakh translation. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:13:24 +00:00
Jannis Leidel e47b92dad7 Added Esperanto to the list of languages. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:12:43 +00:00
Jannis Leidel 0a32209add Pulled the flatpages translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:00:35 +00:00
Jannis Leidel bf6ccebef7 Updated flatpages base translation files with new strings. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-05 02:24:06 +00:00
Aymeric Augustin 4a3aceed3f Added __future__ import for Python 2.5 forgotten in r17402. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-28 20:37:05 +00:00
Aymeric Augustin 6b16580aaa Fixed #12972 -- Validated that flatpages URLs start and (when appropriate) end with a slash. Thanks jabapyth, claudep and kmtracey. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-28 20:27:23 +00:00
Jannis Leidel 4c376852fe Updated English base translation files in preparation of the alpha release so Transifex can pick them up. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 23:02:28 +00:00
Jannis Leidel 0e9b1041d7 Fixed a broken translation string in the flatpages' forms module. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 23:01:53 +00:00
Carl Meyer 62afd58c87 Fixed #17057 -- Corrected flatpage url uniqueness validation to account for flatpage editing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 00:56:32 +00:00
Carl Meyer 3f3010014b Fixed #14678 -- Added validation to catch flatpages with the same URL on the same site. Thanks seler for the report, and joni, graham_king, and j4nu5 for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 15:45:52 +00:00
Ramiro Morales 26b8122087 Fixed #14675 -- Completed removal of `from django.conf.urls.default import *` usage. 
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 22:36:16 +00:00
Jannis Leidel 32bd953e63 Minor renaming for consistency. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 17:05:06 +00:00
Jannis Leidel 0b1a061881 Replaced old-style with new-style decorator syntax. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-01 16:46:02 +00:00
Luke Plant 26cda43012 Switched to HTML5 doctype in all Django supplied templates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-20 17:40:53 +00:00
Jannis Leidel 196ac8f8b3 Fixed #6213 -- Updated the flatpages app to only append a slash if the flatpage actually exist. 
The FlatpageFallbackMiddleware (and the view) now only add a trailing slash and redirect if the resulting URL refers to an existing flatpage. Previously requesting /notaflatpageoravalidurl would redirect to /notaflatpageoravalidurl/, which would then raise a 404. Requesting /notaflatpageoravalidurl now will immediately raise a 404. Also, Redirects returned by flatpages are now permanent (301 status code) to match the behaviour of the CommonMiddleware.

Thanks to Steve Losh for the initial work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-20 14:41:47 +00:00
Russell Keith-Magee d60ae0b721 Removed deprecated 'no' translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-02 08:43:43 +00:00
Jannis Leidel 2cb2674048 Copied "Norwegian Bokmål (nb)" translation to old "Norwegian (no)" translation for backwards compatibility. 
This change slightly extends what was decided in #11068 (to not update the "no" translation due to complicated maintenance, but only "nb"). Thanks, Transifex!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-20 22:16:35 +00:00
Jannis Leidel ada8e2a6fa Pulled translation updates from Transifex again. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-20 22:16:14 +00:00
Ramiro Morales 5347bbd514 Fixed plural forms formula for the Croatian (hr) localization by manually overriding the header of affected .po files and re-generating .mo files, this seems to be a quirck in Transifex export to PO functionality. Thanks bmihelac fot the report. Refs #15634. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-17 22:56:10 +00:00
Jannis Leidel f7c8ce1d39 Pulled flatpages translation updates from Transifex. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-15 20:08:36 +00:00
Ian Kelly f17fc56602 Fixed a bunch more tests that were failing in Oracle due to false assumptions about the primary keys of objects. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-09 23:46:28 +00:00
Jannis Leidel 90564a156c Fixed Hungarian, Russian, Serbian and Ukranian plural forms introduced in r15680. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:07:11 +00:00
Jannis Leidel c11140d04b Fixed plural forms of Irish translation introduced in r15680. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:05:10 +00:00
Jannis Leidel 53b2a25396 Fixed plural forms of Welsh translation introduced in r15680. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:04:31 +00:00
Jannis Leidel bef353873e Fixed plural forms of Bosnian translation introduced in r15680. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:03:14 +00:00
Russell Keith-Magee afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +00:00
Jannis Leidel c6c54bbf66 Updated flatpages translations from transifex.net. Refs #15300. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-01 09:01:01 +00:00
Russell Keith-Magee 7536f63b32 Fixed #14768 -- Added an es_MX locale and initial translation. Thanks to Alonso Bautista Villalobos and the rest of the Mexican translation team. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-06 06:06:29 +00:00
Jannis Leidel 3238b6866f Added new translation files to formtools contrib app. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-21 18:31:00 +00:00
Alex Gaynor 791cc62d4c Don't mark a TemplateSyntaxError in flatpages as being translatable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 17:54:20 +00:00
Luke Plant 86031bf59d Fixed #14252 - django.contrib.flatpages unit tests assume default value for settings.LOGIN_URL 
Thanks to pmclanahan for report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-13 23:09:56 +00:00
Russell Keith-Magee 72a7167439 Fixed #5192 -- Modified flatpage admin form to allow ~ and . characters in flatpage names. Thanks to marco.giusti@gmail.com for the report, Idan Gazit for summarizing the issue on the ticket, and ctrochalakis for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 12:25:54 +00:00
Russell Keith-Magee e1e2726957 Fixed #6932 -- Added a template tag that gives a list of available flatpages for a given user. Thanks to Dmitri Fedortchenko for the suggestion, and to Mnewman, faldridge and Simon Meers for their work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 11:59:14 +00:00