summaryrefslogtreecommitdiff
path: root/django/utils/text.py
Commit message (Collapse)AuthorAgeFilesLines
* [soc2010/query-refactor] Merged up to trunk r13556, resolved merge conflictsarchive/soc2010/query-refactorsoc2010/query-refactorAlex Gaynor2010-08-091-3/+9
| | | | git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #12119. Changed smart_split to stop splitting on whitespace in quotes. ↵Joseph Kocherhans2010-02-241-3/+8
| | | | | | Thanks, emulbreh. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #6799 - added an `end_text` argument to ↵Jacob Kaplan-Moss2010-02-141-14/+16
| | | | | | | | | | | | `truncate_words`/`truncate_html_words`. This allows customizing the standard "..." end text. Yes, this is technically a feature sneaking in after the deadline, but I just couldn't bring myself to punt it again: we already used that excuse for not getting it into 1.1. Thanks to Adam Fast and Travis Cline for work on this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #12613 -- Added Q and Z to the list of characters supported by the ↵Russell Keith-Magee2010-02-131-6/+6
| | | | | | phone2numeric filter. Thanks to gabrielhurley for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Changed a whole bunch of places to raise exception instances instead of ↵Adrian Holovaty2010-01-101-1/+1
| | | | | | old-style raising exception classes plus a comma. Good for the future Python 3 conversion git-svn-id: http://code.djangoproject.com/svn/django/trunk@12180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #9315 -- Handle spaces in URL tag arguments.Malcolm Tredinnick2009-04-101-1/+7
| | | | | | Thanks Natalia Bidart and Matías Bordese for most of this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #10254: Changed the regex in get_valid_filename to allow unicode ↵Karen Tracey2009-04-041-3/+3
| | | | | | alphanumerics (thanks gulliver). Also updated the file_uploads test for this case to check the name after saving the uploaded file. As it was the test ensured that files with unicode characters in their names could be uploaded, but it wasn't actually ensuring that the unicode characters were preserved through save. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #10655 -- Who uses 5-space indentation anyways? Thanks to Andrew Badr ↵Justin Bronn2009-03-301-18/+17
| | | | | | for the ticket & patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Added consistent support for double- and single-quote delimiters in templates.Malcolm Tredinnick2009-03-231-12/+28
| | | | | | | | | Some template filters and tags understood single-quoted arguments, others didn't. This makes everything consistent. Based on a patch from akaihola. Fixed #7295. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #8710: removed a few stray tabs. Thanks, gkelly.Jacob Kaplan-Moss2008-08-301-4/+4
| | | | git-svn-id: http://code.djangoproject.com/svn/django/trunk@8746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #2070: refactored Django's file upload capabilities.Jacob Kaplan-Moss2008-07-011-0/+24
| | | | | | | | | A description of the new features can be found in the new [http://www.djangoproject.com/documentation/upload_handing/ upload handling documentation]; the executive summary is that Django will now happily handle uploads of large files without issues. This changes the representation of uploaded files from dictionaries to bona fide objects; see BackwardsIncompatibleChanges for details. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Refs #7297 -- Corrected some doctest strings internal to the utils.text ↵Russell Keith-Magee2008-06-061-9/+13
| | | | | | module. Thanks, akaihola. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #5156 -- Added some translation calls to a couple of missed words. ↵Malcolm Tredinnick2007-08-151-1/+2
| | | | | | Based on a patch from dAniel hAhler. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Merged Unicode branch into trunk (r4952:5608). This should be fullyMalcolm Tredinnick2007-07-041-20/+34
| | | | | | | | | backwards compatible for all practical purposes. Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702 git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Removed some trailing whitespace that had smuggled itself aboard in [4870].Malcolm Tredinnick2007-03-301-2/+2
| | | | git-svn-id: http://code.djangoproject.com/svn/django/trunk@4871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #3733 -- Fixed up quote parsing in smart_split(). Thanks, Ivan Chelubeev.Malcolm Tredinnick2007-03-301-4/+5
| | | | git-svn-id: http://code.djangoproject.com/svn/django/trunk@4870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #3714 -- Fixed handling of indented text in wordwrap template filter. ↵Russell Keith-Magee2007-03-201-1/+1
| | | | | | Thanks for the fix, Ian Clelland. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #2027 -- added truncatewords_html filter that respects HTML tags whilstMalcolm Tredinnick2007-02-101-0/+60
| | | | | | | truncating. Patch from SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Vastly improved performance of django.utils.text.wrap. Thanks to GvR for ↵Jacob Kaplan-Moss2006-12-151-10/+21
| | | | | | the impetus and Micael Radziej for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Fixed #2657 -- Made some tweaks to Javascript quoting. Thanks, Alex Dedul.Malcolm Tredinnick2006-09-221-1/+5
| | | | git-svn-id: http://code.djangoproject.com/svn/django/trunk@3782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Changed django.utils.text.smart_split to return strings, not tuplesAdrian Holovaty2006-06-081-3/+11
| | | | git-svn-id: http://code.djangoproject.com/svn/django/trunk@3111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Added django.utils.text.smart_split. Thanks, ckknightAdrian Holovaty2006-06-071-0/+10
| | | | git-svn-id: http://code.djangoproject.com/svn/django/trunk@3101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly ↵Adrian Holovaty2006-05-021-2/+2
| | | | | | backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* fixed #1221 - changed usage of wrong settings variable DEFAULT_ENCODING to ↵Georg Bauer2006-01-131-1/+1
| | | | | | the correct DEFAULT_CHARSET. git-svn-id: http://code.djangoproject.com/svn/django/trunk@1953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* added infrastructure code for later javascript translating (currently not ↵Georg Bauer2005-12-041-0/+19
| | | | | | active) git-svn-id: http://code.djangoproject.com/svn/django/trunk@1529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Merged i18n branch into the trunk! Fixes #65, and perhaps some others. NB: ↵Jacob Kaplan-Moss2005-11-041-1/+1
| | | | | | this means that the i18n branch is now obsolete and will be made read-only. git-svn-id: http://code.djangoproject.com/svn/django/trunk@1068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Removed Lawrence-specific stuff in utils.text.recapitalize. Refs #467Adrian Holovaty2005-09-131-4/+4
| | | | git-svn-id: http://code.djangoproject.com/svn/django/trunk@638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Removed utils.text.fix_microsoft_characters, which didn't actually do ↵Adrian Holovaty2005-09-131-29/+0
| | | | | | anything. Refs #467. git-svn-id: http://code.djangoproject.com/svn/django/trunk@637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Refactored meta.py -- created a django.core.meta package, with init.py and ↵Adrian Holovaty2005-08-011-0/+3
| | | | | | fields.py git-svn-id: http://code.djangoproject.com/svn/django/trunk@378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Moved django.views.decorators.cache.compress_string into django.utils.textAdrian Holovaty2005-07-181-0/+10
| | | | git-svn-id: http://code.djangoproject.com/svn/django/trunk@175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
* Imported Django from private SVN repository (created from r. 8825)Adrian Holovaty2005-07-131-0/+108
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3 bcc190cf-cafb-0310-a4f2-bffc1f526a37
View Lorry Controller Status