From 3b479bfc563d3b3d768640ff5963947c56ee042b Mon Sep 17 00:00:00 2001 From: Boulder Sprinters Date: Fri, 27 Apr 2007 20:21:28 +0000 Subject: [PATCH] boulder-oracle-sprint: Merged to [5113] git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5114 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 6 +- django/conf/locale/el/LC_MESSAGES/django.mo | Bin 15668 -> 15638 bytes django/conf/locale/el/LC_MESSAGES/django.po | 6 +- django/conf/locale/no/LC_MESSAGES/django.mo | Bin 27472 -> 31943 bytes django/conf/locale/no/LC_MESSAGES/django.po | 225 ++++++++---------- django/conf/locale/no/LC_MESSAGES/djangojs.mo | Bin 1492 -> 1540 bytes django/conf/locale/no/LC_MESSAGES/djangojs.po | 15 +- django/core/management.py | 4 + django/newforms/forms.py | 9 +- django/template/__init__.py | 45 ++-- docs/email.txt | 14 +- docs/forms.txt | 20 +- docs/settings.txt | 5 +- tests/regressiontests/forms/localflavor.py | 54 +++++ tests/regressiontests/forms/tests.py | 21 ++ tests/regressiontests/templates/tests.py | 59 +++-- 16 files changed, 293 insertions(+), 190 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1c33bb9a7b..564cd0a139 100644 --- a/AUTHORS +++ b/AUTHORS @@ -42,6 +42,7 @@ people who have submitted patches, reported bugs, added translations, helped answer newbie questions, and generally made Django that much better: adurdin@gmail.com + alang@bright-green.com Daniel Alves Barbosa de Oliveira Vaz Andreas andy@jadedplanet.net @@ -164,11 +165,11 @@ answer newbie questions, and generally made Django that much better: Robin Munn Robert Myers Nebojša Dorđević + Gopal Narayanan Fraser Nevett Sam Newman Neal Norwitz oggie rob - onaiort@gmail.com Jay Parlar pavithran s Barry Pederson @@ -187,9 +188,11 @@ answer newbie questions, and generally made Django that much better: Brian Ray remco@diji.biz rhettg@gmail.com + Henrique Romano Armin Ronacher Oliver Rutherfurd Ivan Sagalaev (Maniac) + Vinay Sajip David Schein scott@staplefish.com serbaut@gmail.com @@ -213,6 +216,7 @@ answer newbie questions, and generally made Django that much better: torne-django@wolfpuppy.org.uk Karen Tracey Makoto Tsuyuki + tt@gurgle.no Amit Upadhyay Geert Vanderkelen viestards.lists@gmail.com diff --git a/django/conf/locale/el/LC_MESSAGES/django.mo b/django/conf/locale/el/LC_MESSAGES/django.mo index 4a7d8e41f0dc284ebbe17c274f756adb542238c8..a048d879760739d23c973c6e4f56cf9da27a3101 100644 GIT binary patch delta 1653 zcmXZbYiP}J9LMqRDQ1pgW*0MY*k(J-n9G>Wb;z$6{w_}}p_CD^ zA}p6un@g(|X;CCBw{0#DTw=uo9#|CbPyb(?_WFIlJOA(R`}_WXr>&u>;YLZEH!WZm z9cz|uW*5ep1+fDY@gXYz21nvg9EF2IW^ow8EX=_bSnlFesOLLy3_ig@*oR5@6Q^R_ zc=IfkMd5g};aGv0xDms+A2aYO4#fvZul54F@R!R!oM4ts{1WxOzc?6!6jP(gs5k>v zHyhPJWv1tE;E_lmaR$|C3nt?YWDn~^o#>0p|3)=7l;am-81?;4s153HG&bWTY{&Wd z2~|IfZgucHkA*fU#XO9lMsys9;YBRRHdF(FiDm;Z2~#i)m7jttJRjA_GSu@MoI6~; z9`#C(y4Y(`BEY-Cdj9b$$E*QY<@yC4qwYixF2&C-pT{wE!eZ2&Sch>~jXKCKHE>)X-#9!NoWox1dIS68YFQ z{%GXAF5idR$fo&|D@E07#1Yu4nEkDj#bEq_+NdA-SYm;{;UeU%*k)XShfy0n!T@%= zxEBu*_n|hfrOOj|8<$|k4F4`2$7RIt(JNyyai%}A8k|GijB4aH?!zCbcU&{e|CKbN z-gOglFYT<$-^U>FQ&fXJ&Tpva`*9a075cBPv5@)ei?>LmVJE8aTjUpJAF&+cXPd3W zwYVBDVLSHY8Em8LG+bH4VQ?F&&M{<9YjW{pXBURZcNa1L1Qvfta33swu3u;tsz3#5 z^lMza7gLE3;&42TDR>3b@h<9)bffD1#dr)C`%cG!#Koxki#)ejjw)2?jJW(B%piZj z#ph5by@(^R!^O{>U!8#x|9k1q0%w`C3X^$$QauZP8Fm!aQ9Ek%_fRMLggWuRlGgPJ zH?XgfrRdi={U8tnmj~6=gw?ol|pKR2sENDQD;(%3;`)y~%{4kv{6g z$wpQ=W}1zd7kUO?w51A zqpzcRSf8%AdrNnnp&&{An z3TB`h&3ADTs_t@B10NQ7!313-Qb~M|>a+*5Z~&RZuA^2o?($l;8q3BStU^7%2Q|R~ z%)>aA;xD)XAEWA*)2$X>?J>{Rtl#7<1Y zPf!avh+G#thidG1)WU{c{C5z0HpW1gB*Z@L!9}R8>B8Cg4TkY7vU}E#+WJ3H6HTIa zu&69(cq2xMx1#c$cpQJg0j%Jq*YP24YNF)IVCU*k^-khk98}EwcAY^AK0!?ssxo6}^HCGNjhu=# z;j4HGHPJAJ@PUg*@pIw{)Wo0BhKa{e4L)-w*97n9;K$@EQAZcAVgL2uEfP66f+{?P z{L}1()j`J*+(Nt`-^X9^66VnD*LV|iuyw6j1dpNWoJV@FJ{Lc7{)>g=pRQ&9wW8ct zf{r4nLLZ-NoHFkN7*Bg9Dh2zhN%kMIG5w)C%*~asK$0a|_NS-j1rj%X5Q| zP=#8Yoi6_sE+Bu##Y3nDuVNGPYtlHrB0_SSyW@n?*!z|t}{gMIy4Eqt)(I2R- zzlU1Ui|d0GFI?ZdBeg%HbYHBsZGT~NtTEOaYhqOUe\n" +"Last-Translator: Orestis Markou \n" "Language-Team: Greek\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -164,9 +164,9 @@ msgid "" "\n" "%(text)s" msgstr "" -"Αυτο το σχόλιο σημειώθηκε απο %(χρήστη)ες\n" +"Αυτο το σχόλιο σημειώθηκε απο %(user)s\n" "\n" -"%(κείμενο)α" +"%(text)s" #: contrib/comments/models.py:265 msgid "flag date" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index 1dc12ae50efae7a0972653254b471c18b42b7e20..7048e3079dedfe6426fb9051367689fc9e578236 100644 GIT binary patch delta 12808 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, Nov 2005. @@ -6,74 +6,73 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:12+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Espen Grndhaug \n" -"Language-Team: Norwegian\n" +"PO-Revision-Date: 2007-04-27 06:48+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" #: contrib/comments/models.py:67 contrib/comments/models.py:166 -#, fuzzy msgid "object ID" -msgstr "Vis objekt ID" +msgstr "objekt ID" #: contrib/comments/models.py:68 msgid "headline" -msgstr "" +msgstr "overskrift" #: contrib/comments/models.py:69 contrib/comments/models.py:90 #: contrib/comments/models.py:167 -#, fuzzy msgid "comment" -msgstr "innhold" +msgstr "kommentar" #: contrib/comments/models.py:70 msgid "rating #1" -msgstr "" +msgstr "rangering #1 " #: contrib/comments/models.py:71 msgid "rating #2" -msgstr "" +msgstr "rangering #2" #: contrib/comments/models.py:72 msgid "rating #3" -msgstr "" +msgstr "rangering #3" #: contrib/comments/models.py:73 msgid "rating #4" -msgstr "" +msgstr "rangering #4" #: contrib/comments/models.py:74 msgid "rating #5" -msgstr "" +msgstr "rangering #5" #: contrib/comments/models.py:75 msgid "rating #6" -msgstr "" +msgstr "rangering #6" #: contrib/comments/models.py:76 msgid "rating #7" -msgstr "" +msgstr "rangering #7" #: contrib/comments/models.py:77 msgid "rating #8" -msgstr "" +msgstr "rangering #8" #: contrib/comments/models.py:82 msgid "is valid rating" -msgstr "" +msgstr "er gyldig rangering" #: contrib/comments/models.py:83 contrib/comments/models.py:169 msgid "date/time submitted" -msgstr "" +msgstr "dato/tid for innsendelse" #: contrib/comments/models.py:84 contrib/comments/models.py:170 msgid "is public" -msgstr "" +msgstr "er tilgjengelig for alle" #: contrib/comments/models.py:85 contrib/admin/views/doc.py:289 msgid "IP address" @@ -81,23 +80,21 @@ msgstr "IP adresse" #: contrib/comments/models.py:86 msgid "is removed" -msgstr "" +msgstr "er fjernet" #: contrib/comments/models.py:86 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." -msgstr "" +msgstr "Aktiver denne avkryssningsboksen hvis kommentaren er upasende. Beskjeden \"Denne kommentaren er blitt fjernet\" vil bli vist istedet." #: contrib/comments/models.py:91 -#, fuzzy msgid "comments" -msgstr "innhold" +msgstr "kommentarer" #: contrib/comments/models.py:131 contrib/comments/models.py:207 -#, fuzzy msgid "Content object" -msgstr "innholds type" +msgstr "innholdsobjekt" #: contrib/comments/models.py:159 #, python-format @@ -108,101 +105,97 @@ msgid "" "\n" "http://%(domain)s%(url)s" msgstr "" +"Sendt av %(user)s på %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" #: contrib/comments/models.py:168 -#, fuzzy msgid "person's name" -msgstr "fornavn" +msgstr "personens navn" #: contrib/comments/models.py:171 -#, fuzzy msgid "ip address" msgstr "IP adresse" #: contrib/comments/models.py:173 msgid "approved by staff" -msgstr "" +msgstr "godkjent av moderator" #: contrib/comments/models.py:176 -#, fuzzy msgid "free comment" -msgstr "tillat kommentarer" +msgstr "åpen kommentar" #: contrib/comments/models.py:177 -#, fuzzy msgid "free comments" -msgstr "tillat kommentarer" +msgstr "åpne kommentarer" #: contrib/comments/models.py:233 msgid "score" -msgstr "" +msgstr "poeng" #: contrib/comments/models.py:234 -#, fuzzy msgid "score date" -msgstr "utløpsdato" +msgstr "poeng dato" #: contrib/comments/models.py:237 msgid "karma score" -msgstr "" +msgstr "karma poeng" #: contrib/comments/models.py:238 msgid "karma scores" -msgstr "" +msgstr "karma poeng" #: contrib/comments/models.py:242 #, python-format msgid "%(score)d rating by %(user)s" -msgstr "" +msgstr "%(score)d rangering av %(user)s" #: contrib/comments/models.py:258 -#, fuzzy, python-format +#, python-format msgid "" "This comment was flagged by %(user)s:\n" "\n" "%(text)s" msgstr "" -"Denne kommentaren er skrevet med lite omtanke:\n" +"Denne kommentaren er flagget av %(user)s:\n" "\n" "%(text)s" #: contrib/comments/models.py:265 -#, fuzzy msgid "flag date" -msgstr "flatside" +msgstr "flagg dato" #: contrib/comments/models.py:268 -#, fuzzy msgid "user flag" -msgstr "Bruker" +msgstr "brukerflag" #: contrib/comments/models.py:269 -#, fuzzy msgid "user flags" -msgstr "Brukere" +msgstr "brukerflag" #: contrib/comments/models.py:273 #, python-format msgid "Flag by %r" -msgstr "" +msgstr "Flagg med %r" #: contrib/comments/models.py:278 -#, fuzzy msgid "deletion date" -msgstr "sesjon data" +msgstr "fjernet dato" #: contrib/comments/models.py:280 msgid "moderator deletion" -msgstr "" +msgstr "fjernet av moderator" #: contrib/comments/models.py:281 msgid "moderator deletions" -msgstr "" +msgstr "fjernet av moderator" #: contrib/comments/models.py:285 #, python-format msgid "Moderator deletion by %r" -msgstr "" +msgstr "Fjernet av moderator med %r" #: contrib/comments/views/karma.py:19 msgid "Anonymous users cannot vote" @@ -214,16 +207,14 @@ msgstr "Ikke gyldig kommentar ID" #: contrib/comments/views/karma.py:25 msgid "No voting for yourself" -msgstr "Du kan ikke stemme selv" +msgstr "Du kan ikke stemme på deg selv" #: contrib/comments/views/comments.py:28 -#, fuzzy -msgid "" -"This rating is required because you've entered at least one other rating." -msgstr "Denne bla bla.." +msgid "This rating is required because you've entered at least one other rating." +msgstr "Denne rangeringen er påkrevd fordi du har rangert en eller flere ting fra før " #: contrib/comments/views/comments.py:112 -#, fuzzy, python-format +#, python-format msgid "" "This comment was posted by a user who has posted fewer than %(count)s " "comment:\n" @@ -246,13 +237,13 @@ msgstr[1] "" "%(text)s" #: contrib/comments/views/comments.py:117 -#, fuzzy, python-format +#, python-format msgid "" "This comment was posted by a sketchy user:\n" "\n" "%(text)s" msgstr "" -"Denne kommentaren er skrevet med lite omtanke:\n" +"Denne kommentaren er skrevet av en upålitelig bruker:\n" "\n" "%(text)s" @@ -281,8 +272,7 @@ msgstr "Skjemaet hadde en ugyldig verdi - objekt IDen var ugyldig" #: contrib/comments/views/comments.py:257 #: contrib/comments/views/comments.py:321 msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "" -"Kommentar skjemaet returnerte ikke et 'forhåndsvisning' eller 'post' objekt" +msgstr "Kommentar skjemaet returnerte ikke et 'forhåndsvisning' eller 'post' objekt" #: contrib/comments/templates/comments/form.html:6 #: contrib/comments/templates/comments/form.html:8 @@ -296,9 +286,8 @@ msgid "Password:" msgstr "Passord:" #: contrib/comments/templates/comments/form.html:6 -#, fuzzy msgid "Forgotten your password?" -msgstr "Endre passord" +msgstr "Har du glemt passordet ditt ?" #: contrib/comments/templates/comments/form.html:8 #: contrib/admin/templates/admin/object_history.html:3 @@ -323,38 +312,35 @@ msgstr "Log ut" #: contrib/comments/templates/comments/form.html:12 msgid "Ratings" -msgstr "" +msgstr "Rangeringer" #: contrib/comments/templates/comments/form.html:12 #: contrib/comments/templates/comments/form.html:23 msgid "Required" -msgstr "" +msgstr "Påkrevd" #: contrib/comments/templates/comments/form.html:12 #: contrib/comments/templates/comments/form.html:23 msgid "Optional" -msgstr "" +msgstr "Valgfri" #: contrib/comments/templates/comments/form.html:23 msgid "Post a photo" -msgstr "" +msgstr "Send et foto" #: contrib/comments/templates/comments/form.html:27 #: contrib/comments/templates/comments/freeform.html:5 -#, fuzzy msgid "Comment:" -msgstr "tillat kommentarer" +msgstr "Kommentar:" #: contrib/comments/templates/comments/form.html:32 #: contrib/comments/templates/comments/freeform.html:9 -#, fuzzy msgid "Preview comment" -msgstr "tillat kommentarer" +msgstr "Forhåndvis kommentar" #: contrib/comments/templates/comments/freeform.html:4 -#, fuzzy msgid "Your name:" -msgstr "brukernavn" +msgstr "Ditt navn:" #: contrib/admin/filterspecs.py:40 #, python-format @@ -416,7 +402,7 @@ msgstr "objekt repr" #: contrib/admin/models.py:21 msgid "action flag" -msgstr "handlings flagg" +msgstr "handlingsflagg" #: contrib/admin/models.py:22 msgid "change message" @@ -424,11 +410,11 @@ msgstr "endre melding" #: contrib/admin/models.py:25 msgid "log entry" -msgstr "logg notis" +msgstr "logg post" #: contrib/admin/models.py:26 msgid "log entries" -msgstr "logg innlegg" +msgstr "logg poster" #: contrib/admin/templatetags/admin_list.py:228 msgid "All dates" @@ -440,8 +426,8 @@ msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Vær snill å angi korrekt brukernavn og passord. La merke til at små og " -"store bokstaver er betraktet ulik." +"Vennligst angi korrekt brukernavn og passord. Merk at små og " +"store bokstaver er betraktet ulikt." #: contrib/admin/views/decorators.py:23 #: contrib/admin/templates/admin/login.html:25 @@ -452,18 +438,15 @@ msgstr "Logg inn" msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." -msgstr "" -"Du må logge inn igjen, fordi sesjonen din har gått ut på dato, men ikke ikke " -"bekjymr deg informasjonen du sendte ble lagret." +msgstr "Du må logge inn igjen, fordi økten din har gått ut, men innlegget ditt ble lagret." #: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." msgstr "" -"Det ser ut som om nettleseren din ikke vill ta i mot informasjonskapsler " -"('cookies'). Vennligst omkonfigurer nettleseren din, last siden på ny og " -"prøv igjen." +"Det ser ut som om nettleseren din ikke støtter informasjonskapsler " +"('cookies'). Vennligst konfigurer nettleseren din, og prøv igjen." #: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." @@ -500,7 +483,7 @@ msgstr "Ny %s" #: contrib/admin/views/main.py:336 #, python-format msgid "Added %s." -msgstr "Lagt til %s" +msgstr "La til %s" #: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338 #: contrib/admin/views/main.py:340 @@ -528,8 +511,7 @@ msgstr "%(name)s \"%(obj)s\" ble endret." #: contrib/admin/views/main.py:354 #, python-format -msgid "" -"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under." #: contrib/admin/views/main.py:392 @@ -742,8 +724,8 @@ msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." msgstr "" -"Det har vært en feil. Feilen er blitt rapportert til administrator via e-" -"mail, og vill bli fikset snart. Takk for din tålmodighet." +"Det har oppstått en feil. Feilen er blitt rapportert til administrator via e-" +"post, og vil bli fikset snart. Takk for din tålmodighet." #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -909,7 +891,7 @@ msgstr "Tilbakestill mitt passord" #: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." -msgstr "Takk for å bruke tid på internett siden i dag." +msgstr "Takk for at du valgte å bruke kvalitetstid på nettstedet idag." #: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" @@ -954,8 +936,7 @@ msgstr "Endre passord" #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" -msgstr "" -"Du har mottatt denne e-posten fordi du ba om å tilbakestille passordet ditt" +msgstr "Du har mottatt denne e-posten fordi du ba om å tilbakestille passordet ditt" #: contrib/admin/templates/registration/password_reset_email.html:3 #, python-format @@ -1002,6 +983,12 @@ msgid "" "as \"internal\" (talk to your system administrator if you aren't sure if\n" "your computer is \"internal\").

\n" msgstr "" +"\n" +"

For å installere bokmerker, dra linken til verktøylinja\n" +"for bokmerker, eller høyreklikk og legg til i bokmerker. Nå kan du du velge\n" +"bokmerket fra hvilken som helst side på nettstedet. Noen av disse\n" +"bokmerkene krever at datamaskinen du bruker er markert som \"intern\"\n" +"(kontakt din systemadministrator hvis du er usikker på om maskinen din er \"intern\").

\n" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "Documentation for this page" @@ -1033,8 +1020,7 @@ msgstr "Endre dette objektet (åpnes i dette vinduet)" #: contrib/admin/templates/admin_doc/bookmarklets.html:26 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "" -"Hopp til administrasjonsiden for sidene som representerer et enkelt objekt." +msgstr "Hopp til administrasjonsiden for sidene som representerer et enkelt objekt." #: contrib/admin/templates/admin_doc/bookmarklets.html:28 msgid "Edit this object (new window)" @@ -1069,7 +1055,7 @@ msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -"Denne burde vær en fullstendig sti, uten domene navnet. Foreksempel: '/" +"Dette burde vært en fullstendig sti, uten domene navnet. Foreksempel: '/" "nyheter/les/" #: contrib/redirects/models.py:9 @@ -1081,7 +1067,7 @@ msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -"Denne kan enten være en fullstendig sti (som over), eller en hel " +"Dette kan enten være en fullstendig sti (som over), eller en hel " "internettadresse som starter med 'http://'" #: contrib/redirects/models.py:12 @@ -1093,10 +1079,8 @@ msgid "redirects" msgstr "omadresserelser" #: contrib/flatpages/models.py:8 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstrek forran og bak." +msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstrek forran og bak." #: contrib/flatpages/models.py:9 msgid "title" @@ -1186,7 +1170,7 @@ msgstr "passord" #: contrib/auth/models.py:59 msgid "Use '[algo]$[salt]$[hexdigest]'" -msgstr "" +msgstr "Bruk '[algo]$[salt]$[hexdigest]'" #: contrib/auth/models.py:60 msgid "staff status" @@ -1256,7 +1240,7 @@ msgstr "Melding" msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." -msgstr "" +msgstr "Din nettleser ser ikkeut til å støtte informasjonskapsler (cookies). Informasjonskapsler er påkrevd for å logge inn." #: contrib/contenttypes/models.py:25 msgid "python model class name" @@ -1698,8 +1682,7 @@ msgstr "Internettadressen %s peker ikke til et godkjent bilde." #: core/validators.py:159 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -msgstr "" -"Telefon nummeret må være i XXX-XXX-XXXX format. \"%s\" er ikke godkjent." +msgstr "Telefon nummeret må være i XXX-XXX-XXXX format. \"%s\" er ikke godkjent." #: core/validators.py:167 #, python-format @@ -1784,30 +1767,26 @@ msgstr "Vennligst skriv inn et godkjent desimal tall." #: core/validators.py:349 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "" -"Please enter a valid decimal number with at most %s total digits." +msgid_plural "Please enter a valid decimal number with at most %s total digits." msgstr[0] "Skriv inn et desimal tall med maksimum %s total antall tall." msgstr[1] "Skriv inn et desimal tall med maksimum %s total antall tall." #: core/validators.py:352 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "" -"Please enter a valid decimal number with at most %s decimal places." +msgid_plural "Please enter a valid decimal number with at most %s decimal places." msgstr[0] "Skriv inn et desimal tall med maksimum %s tall bak komma. " msgstr[1] "Skriv inn et desimal tall med maksimum %s tall bak komma. " #: core/validators.py:362 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." -msgstr "" -"Vær sikker på at fila du prøver å laste opp er minimum %s bytes stor." +msgstr "Vær sikker på at fila du prøver å laste opp er minimum %s bytes stor." #: core/validators.py:363 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "" -"Vær sikker på at fila du prøver å laste opp er maksimum %s bytes stor." +msgstr "Vær sikker på at fila du prøver å laste opp er maksimum %s bytes stor." #: core/validators.py:376 msgid "The format for this field is wrong." @@ -1824,8 +1803,7 @@ msgstr "Klarte ikke å motta noe fra %s." #: core/validators.py:429 #, python-format -msgid "" -"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" "Internettadressen %(url)s returnerte en ikke godkjent Content-Type '%" "(contenttype)s'." @@ -1926,16 +1904,13 @@ msgid "Separate multiple IDs with commas." msgstr "Separer Id-ene med kommaer." #: db/models/fields/related.py:581 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "" -"Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en." +msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en." #: db/models/fields/related.py:625 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "" -"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." msgstr[0] "Skriv inn gyldige %(self)s ID-er. Verdien %(value)r er ikke gyldig." msgstr[1] "Skriv inn gyldige %(self)s ID-er. Verdiene %(value)r er ikke gyldige." diff --git a/django/conf/locale/no/LC_MESSAGES/djangojs.mo b/django/conf/locale/no/LC_MESSAGES/djangojs.mo index 4b23aba4e0013b2c5fce91d32d64172297a67f4a..da2854f72e52e166ab19361fe14fa7757377ea91 100644 GIT binary patch delta 718 zcmZ9}O>5Lp6vpv8Gif{R)KBk6bIE%wLhjqN`<`?l4M_yXfI-Try_cyyZfLj@-mC zs?kqW;}cY2-SlAuRp2_#VjER>4OOQ=HQvIjEMnKqf8ZrbnSDHqAF)n<^MwmF`sOAM zPz8>$fxnQ$^wUMpHBb$koECA+jh{N#k)Gzc8^1s;Up`0{(|PT<%)BpwpYJPMfIHCQH+om$N>%hi}P-L8nt?b78P9Nq_1g`3T@FSc}4?5 zJE2|p8)c<>bD&pPKTgxV`RcVweR(y`lHO`jKC3-gm<+?2AZ!PdGk!STnTjSt?hM_J zi;bY0$61la8@;^ab0iN3_{efAoaKOuWkmjD0& delta 673 zcmXxhO-ma=7{KvKvc{OCzNUH+x}|tfi6AIQ6m@Nv7_6pEqM!$5(YOj`BY8RJq6a}J zxcCJ;cx(@fH$6z{p^#hXMeyLs&rm%0f68>&XMQ{L?94N}dlYZQ8jrokxuOjagG7sX zN1O)eXpx{&VeG&Vc4Hh97{T{CKZ0)l^A?CvH&++@loy zg|cB2O?*Jv;032Jz{9d}3gsa4D1|dP$>H-lf5IY`sBhSZXDH8KVwn2shfdsJjKpu` zQh(^=AP*>oo-l{cdOXdf%v*HSQfWP2LOJ+X9KtP>{4q}83391Bx(M~vPi~}86XmOS z6LJt~U4)!gHtZp&{jc?F6IyxmC?UV5laM!+qSB;TJJCx>owtNE`Q?&RL4P=CUDbm_ zfvzvs$0aLmn`?G1pUJNH7oq&lx^3l>%h}{7%UsN+mNTOp*%dqb*{Rl&g^J@<51d-L zk}~b;VbL?wm3?n#&#AlSOi?Dr-2W5vZpqm{7~3wFW?AgHb;m6x3q_}tGQF}tWlV, 2006. # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: djangojs\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Espen Grindhaug \n" -"Language-Team: no\n" +"PO-Revision-Date: 2007-04-27 06:51+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format @@ -21,7 +22,6 @@ msgid "Available %s" msgstr "%s er tilgjengelige" #: contrib/admin/media/js/SelectFilter2.js:41 -#, fuzzy msgid "Choose all" msgstr "Velg alle" @@ -116,3 +116,4 @@ msgstr "I går" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:164 msgid "Tomorrow" msgstr "I morgen" + diff --git a/django/core/management.py b/django/core/management.py index d696794fc6..4a08b1e54d 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -173,6 +173,8 @@ def _get_sql_model_create(model, known_models=set()): for f in opts.fields: if isinstance(f, (models.ForeignKey, models.OneToOneField)): rel_field = f.rel.get_related_field() + while isinstance(rel_field, (models.ForeignKey, models.OneToOneField)): + rel_field = rel_field.rel.get_related_field() data_type = get_rel_data_type(rel_field) else: rel_field = f @@ -1377,6 +1379,8 @@ def load_data(fixture_labels, verbosity=1): from django.conf import settings import sys + disable_termcolors() + # Keep a count of the installed objects and fixtures count = [0,0] models = set() diff --git a/django/newforms/forms.py b/django/newforms/forms.py index 3df7a9e834..9fafd20787 100644 --- a/django/newforms/forms.py +++ b/django/newforms/forms.py @@ -122,7 +122,14 @@ class BaseForm(StrAndUnicode): else: if errors_on_separate_row and bf_errors: output.append(error_row % bf_errors) - label = bf.label and bf.label_tag(escape(bf.label + ':')) or '' + if bf.label: + label = escape(bf.label) + # Only add a colon if the label does not end in punctuation. + if label[-1] not in ':?.!': + label += ':' + label = bf.label_tag(label) or '' + else: + label = '' if field.help_text: help_text = help_text_html % field.help_text else: diff --git a/django/template/__init__.py b/django/template/__init__.py index a592765db6..6478636889 100644 --- a/django/template/__init__.py +++ b/django/template/__init__.py @@ -193,18 +193,27 @@ class Lexer(object): def tokenize(self): "Return a list of tokens from a given template_string" - # remove all empty strings, because the regex has a tendency to add them - bits = filter(None, tag_re.split(self.template_string)) - return map(self.create_token, bits) + in_tag = False + result = [] + for bit in tag_re.split(self.template_string): + if bit: + result.append(self.create_token(bit, in_tag)) + in_tag = not in_tag + return result - def create_token(self,token_string): - "Convert the given token string into a new Token object and return it" - if token_string.startswith(VARIABLE_TAG_START): - token = Token(TOKEN_VAR, token_string[len(VARIABLE_TAG_START):-len(VARIABLE_TAG_END)].strip()) - elif token_string.startswith(BLOCK_TAG_START): - token = Token(TOKEN_BLOCK, token_string[len(BLOCK_TAG_START):-len(BLOCK_TAG_END)].strip()) - elif token_string.startswith(COMMENT_TAG_START): - token = Token(TOKEN_COMMENT, '') + def create_token(self, token_string, in_tag): + """ + Convert the given token string into a new Token object and return it. + If tag is True, we are processing something that matched a tag, + otherwise it should be treated as a literal string. + """ + if in_tag: + if token_string.startswith(VARIABLE_TAG_START): + token = Token(TOKEN_VAR, token_string[len(VARIABLE_TAG_START):-len(VARIABLE_TAG_END)].strip()) + elif token_string.startswith(BLOCK_TAG_START): + token = Token(TOKEN_BLOCK, token_string[len(BLOCK_TAG_START):-len(BLOCK_TAG_END)].strip()) + elif token_string.startswith(COMMENT_TAG_START): + token = Token(TOKEN_COMMENT, '') else: token = Token(TOKEN_TEXT, token_string) return token @@ -215,21 +224,21 @@ class DebugLexer(Lexer): def tokenize(self): "Return a list of tokens from a given template_string" - token_tups, upto = [], 0 + result, upto = [], 0 for match in tag_re.finditer(self.template_string): start, end = match.span() if start > upto: - token_tups.append( (self.template_string[upto:start], (upto, start)) ) + result.append(self.create_token(self.template_string[upto:start], (upto, start), False)) upto = start - token_tups.append( (self.template_string[start:end], (start,end)) ) + result.append(self.create_token(self.template_string[start:end], (start, end), True)) upto = end last_bit = self.template_string[upto:] if last_bit: - token_tups.append( (last_bit, (upto, upto + len(last_bit))) ) - return [self.create_token(tok, (self.origin, loc)) for tok, loc in token_tups] + result.append(self.create_token(last_bit, (upto, upto + len(last_bit)), False)) + return result - def create_token(self, token_string, source): - token = super(DebugLexer, self).create_token(token_string) + def create_token(self, token_string, source, in_tag): + token = super(DebugLexer, self).create_token(token_string, in_tag) token.source = source return token diff --git a/docs/email.txt b/docs/email.txt index 1f4ce4ef42..cbe909c03c 100644 --- a/docs/email.txt +++ b/docs/email.txt @@ -19,13 +19,23 @@ In two lines:: send_mail('Subject here', 'Here is the message.', 'from@example.com', ['to@example.com'], fail_silently=False) - + +Mail will be sent using the SMTP host and port specified in the `EMAIL_HOST`_ +and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_ +settings, if set, will be used to authenticate to the +SMTP server. + .. note:: The character set of email sent with ``django.core.mail`` will be set to the value of your `DEFAULT_CHARSET setting`_. - + .. _DEFAULT_CHARSET setting: ../settings/#DEFAULT_CHARSET +.. _EMAIL_HOST: ../settings/#EMAIL_HOST +.. _EMAIL_PORT: ../settings/#EMAIL_PORT +.. _EMAIL_HOST_USER: ../settings/#EMAIL_HOST_USER +.. _EMAIL_HOST_PASSWORD: ../settings/#EMAIL_HOST_PASSWORD + send_mail() =========== diff --git a/docs/forms.txt b/docs/forms.txt index 144b70f13b..329e84a1b1 100644 --- a/docs/forms.txt +++ b/docs/forms.txt @@ -517,7 +517,7 @@ to put punctuation at the end of your validation messages. When are validators called? --------------------------- -After a form has been submitted, Django validates each field in turn. First, +After a form has been submitted, Django validates each field in turn. First, if the field is required, Django checks that it is present and non-empty. Then, if that test passes *and the form submission contained data* for that field, all the validators for that field are called in turn. The emphasized portion in the @@ -615,15 +615,19 @@ fails. If no message is passed in, a default message is used. ``other_value``, then the validators in ``validator_list`` are all run against the current field. +``RequiredIfOtherFieldGiven`` + Takes a field name of the current field is only required if the other + field has a value. + +``RequiredIfOtherFieldsGiven`` + Similar to ``RequiredIfOtherFieldGiven``, except that it takes a list of + field names and if any one of the supplied fields has a value provided, + the current field being validated is required. + ``RequiredIfOtherFieldNotGiven`` Takes the name of the other field and this field is only required if the other field has no value. -``RequiredIfOtherFieldsNotGiven`` - Similar to ``RequiredIfOtherFieldNotGiven``, except that it takes a list - of field names and if any one of the supplied fields does not have a value - provided, the field being validated is required. - ``RequiredIfOtherFieldEquals`` and ``RequiredIfOtherFieldDoesNotEqual`` Each of these validator classes takes a field name and a value (in that order). If the given field does (or does not have, in the latter case) the @@ -650,8 +654,8 @@ fails. If no message is passed in, a default message is used. ``NumberIsInRange`` Takes two boundary numbers, ``lower`` and ``upper``, and checks that the field is greater than ``lower`` (if given) and less than ``upper`` (if - given). - + given). + Both checks are inclusive. That is, ``NumberIsInRange(10, 20)`` will allow values of both 10 and 20. This validator only checks numeric values (e.g., float and integer values). diff --git a/docs/settings.txt b/docs/settings.txt index 9ab5f5ff82..583c258bd3 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -395,8 +395,9 @@ EMAIL_HOST_PASSWORD Default: ``''`` (Empty string) -Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty, -Django won't attempt authentication. +Password to use for the SMTP server defined in ``EMAIL_HOST``. This setting is +used in conjunction with EMAIL_HOST_USER when authenticating to the SMTP server. +If either of these settings is empty, Django won't attempt authenticaion. See also ``EMAIL_HOST_USER``. diff --git a/tests/regressiontests/forms/localflavor.py b/tests/regressiontests/forms/localflavor.py index 0efec8cfa8..f725fb38b7 100644 --- a/tests/regressiontests/forms/localflavor.py +++ b/tests/regressiontests/forms/localflavor.py @@ -874,6 +874,60 @@ ValidationError: [u'This field requires only numbers.'] >>> f.clean('') u'' +# BRCPFField ################################################################# + +>>> from django.contrib.localflavor.br.forms import BRCPFField +>>> f = BRCPFField() +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('489.294.654-54') +Traceback (most recent call last): +... +ValidationError: [u'Invalid CPF number.'] +>>> f.clean('295.669.575-98') +Traceback (most recent call last): +... +ValidationError: [u'Invalid CPF number.'] +>>> f.clean('539.315.127-22') +Traceback (most recent call last): +... +ValidationError: [u'Invalid CPF number.'] +>>> f.clean('663.256.017-26') +u'663.256.017-26' +>>> f.clean('66325601726') +u'66325601726' +>>> f.clean('375.788.573-20') +u'375.788.573-20' +>>> f.clean('84828509895') +u'84828509895' +>>> f.clean('375.788.573-XX') +Traceback (most recent call last): +... +ValidationError: [u'This field requires only numbers.'] +>>> f.clean('375.788.573-000') +Traceback (most recent call last): +... +ValidationError: [u'Ensure this value has at most 14 characters.'] +>>> f.clean('123.456.78') +Traceback (most recent call last): +... +ValidationError: [u'Ensure this value has at least 11 characters.'] +>>> f.clean('123456789555') +Traceback (most recent call last): +... +ValidationError: [u'This field requires at most 11 digits or 14 characters.'] +>>> f = BRCPFField(required=False) +>>> f.clean('') +u'' +>>> f.clean(None) +u'' + # BRPhoneNumberField ######################################################### >>> from django.contrib.localflavor.br.forms import BRPhoneNumberField diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py index e0d05a2c89..0d3a65277c 100644 --- a/tests/regressiontests/forms/tests.py +++ b/tests/regressiontests/forms/tests.py @@ -2601,6 +2601,27 @@ underscores converted to spaces, and the initial letter capitalized.
  • Password1:
  • Password (again):
    • +Labels for as_* methods will only end in a colon if they don't end in other +punctuation already. +>>> class Questions(Form): +... q1 = CharField(label='The first question') +... q2 = CharField(label='What is your name?') +... q3 = CharField(label='The answer to life is:') +... q4 = CharField(label='Answer this question!') +... q5 = CharField(label='The last question. Period.') +>>> print Questions(auto_id=False).as_p() +

    The first question:

    +

    What is your name?

    +

    The answer to life is:

    +

    Answer this question!

    +

    The last question. Period.

    +>>> print Questions().as_p() +

    +

    +

    +

    +

    + A label can be a Unicode object or a bytestring with special characters. >>> class UserRegistration(Form): ... username = CharField(max_length=10, label='ŠĐĆŽćžšđ') diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index f996f63049..4e321b2d2b 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -127,6 +127,18 @@ class Templates(unittest.TestCase): # Fail silently when accessing a non-simple method 'basic-syntax20': ("{{ var.method2 }}", {"var": SomeClass()}, ("","INVALID")), + # Don't get confused when parsing something that is almost, but not + # quite, a template tag. + 'basic-syntax21': ("a {{ moo %} b", {}, "a {{ moo %} b"), + 'basic-syntax22': ("{{ moo #}", {}, "{{ moo #}"), + + # Will try to treat "moo #} {{ cow" as the variable. Not ideal, but + # costly to work around, so this triggers an error. + 'basic-syntax23': ("{{ moo #} {{ cow }}", {"cow": "cow"}, template.TemplateSyntaxError), + + # Embedded newlines make it not-a-tag. + 'basic-syntax24': ("{{ moo\n }}", {}, "{{ moo\n }}"), + # List-index syntax allows a template to access a certain item of a subscriptable object. 'list-index01': ("{{ var.1 }}", {"var": ["first item", "second item"]}, "second item"), @@ -151,60 +163,61 @@ class Templates(unittest.TestCase): 'list-index07': ("{{ var.1 }}", {"var": {'1': "hello", 1: "world"}}, "hello"), # Basic filter usage - 'basic-syntax21': ("{{ var|upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"), + 'filter-syntax01': ("{{ var|upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"), # Chained filters - 'basic-syntax22': ("{{ var|upper|lower }}", {"var": "Django is the greatest!"}, "django is the greatest!"), + 'filter-syntax02': ("{{ var|upper|lower }}", {"var": "Django is the greatest!"}, "django is the greatest!"), # Raise TemplateSyntaxError for space between a variable and filter pipe - 'basic-syntax23': ("{{ var |upper }}", {}, template.TemplateSyntaxError), + 'filter-syntax03': ("{{ var |upper }}", {}, template.TemplateSyntaxError), # Raise TemplateSyntaxError for space after a filter pipe - 'basic-syntax24': ("{{ var| upper }}", {}, template.TemplateSyntaxError), + 'filter-syntax04': ("{{ var| upper }}", {}, template.TemplateSyntaxError), # Raise TemplateSyntaxError for a nonexistent filter - 'basic-syntax25': ("{{ var|does_not_exist }}", {}, template.TemplateSyntaxError), + 'filter-syntax05': ("{{ var|does_not_exist }}", {}, template.TemplateSyntaxError), # Raise TemplateSyntaxError when trying to access a filter containing an illegal character - 'basic-syntax26': ("{{ var|fil(ter) }}", {}, template.TemplateSyntaxError), + 'filter-syntax06': ("{{ var|fil(ter) }}", {}, template.TemplateSyntaxError), # Raise TemplateSyntaxError for invalid block tags - 'basic-syntax27': ("{% nothing_to_see_here %}", {}, template.TemplateSyntaxError), + 'filter-syntax07': ("{% nothing_to_see_here %}", {}, template.TemplateSyntaxError), # Raise TemplateSyntaxError for empty block tags - 'basic-syntax28': ("{% %}", {}, template.TemplateSyntaxError), + 'filter-syntax08': ("{% %}", {}, template.TemplateSyntaxError), # Chained filters, with an argument to the first one - 'basic-syntax29': ('{{ var|removetags:"b i"|upper|lower }}', {"var": "Yes"}, "yes"), + 'filter-syntax09': ('{{ var|removetags:"b i"|upper|lower }}', {"var": "Yes"}, "yes"), # Escaped string as argument - 'basic-syntax30': (r'{{ var|default_if_none:" endquote\" hah" }}', {"var": None}, ' endquote" hah'), + 'filter-syntax10': (r'{{ var|default_if_none:" endquote\" hah" }}', {"var": None}, ' endquote" hah'), # Variable as argument - 'basic-syntax31': (r'{{ var|default_if_none:var2 }}', {"var": None, "var2": "happy"}, 'happy'), + 'filter-syntax11': (r'{{ var|default_if_none:var2 }}', {"var": None, "var2": "happy"}, 'happy'), # Default argument testing - 'basic-syntax32': (r'{{ var|yesno:"yup,nup,mup" }} {{ var|yesno }}', {"var": True}, 'yup yes'), + 'filter-syntax12': (r'{{ var|yesno:"yup,nup,mup" }} {{ var|yesno }}', {"var": True}, 'yup yes'), - # Fail silently for methods that raise an exception with a "silent_variable_failure" attribute - 'basic-syntax33': (r'1{{ var.method3 }}2', {"var": SomeClass()}, ("12", "1INVALID2")), + # Fail silently for methods that raise an exception with a + # "silent_variable_failure" attribute + 'filter-syntax13': (r'1{{ var.method3 }}2', {"var": SomeClass()}, ("12", "1INVALID2")), - # In methods that raise an exception without a "silent_variable_attribute" set to True, - # the exception propagates - 'basic-syntax34': (r'1{{ var.method4 }}2', {"var": SomeClass()}, SomeOtherException), + # In methods that raise an exception without a + # "silent_variable_attribute" set to True, the exception propagates + 'filter-syntax14': (r'1{{ var.method4 }}2', {"var": SomeClass()}, SomeOtherException), # Escaped backslash in argument - 'basic-syntax35': (r'{{ var|default_if_none:"foo\bar" }}', {"var": None}, r'foo\bar'), + 'filter-syntax15': (r'{{ var|default_if_none:"foo\bar" }}', {"var": None}, r'foo\bar'), # Escaped backslash using known escape char - 'basic-syntax35': (r'{{ var|default_if_none:"foo\now" }}', {"var": None}, r'foo\now'), + 'filter-syntax16': (r'{{ var|default_if_none:"foo\now" }}', {"var": None}, r'foo\now'), # Empty strings can be passed as arguments to filters - 'basic-syntax36': (r'{{ var|join:"" }}', {'var': ['a', 'b', 'c']}, 'abc'), + 'filter-syntax17': (r'{{ var|join:"" }}', {'var': ['a', 'b', 'c']}, 'abc'), - # If a variable has a __str__() that returns a Unicode object, the value - # will be converted to a bytestring. - 'basic-syntax37': (r'{{ var }}', {'var': UnicodeInStrClass()}, '\xc5\xa0\xc4\x90\xc4\x86\xc5\xbd\xc4\x87\xc5\xbe\xc5\xa1\xc4\x91'), + # If a variable has a __str__() that returns a Unicode object, the + # value will be converted to a bytestring. + 'basic-syntax18': (r'{{ var }}', {'var': UnicodeInStrClass()}, '\xc5\xa0\xc4\x90\xc4\x86\xc5\xbd\xc4\x87\xc5\xbe\xc5\xa1\xc4\x91'), ### COMMENT SYNTAX ######################################################## 'comment-syntax01': ("{# this is hidden #}hello", {}, "hello"),