@@ -1,4 +1,4 @@ -VERSION = (1, 0, 1, 'final', 0) +VERSION = (1, 0, 2, 'final', 0) def get_version(): version = '%s.%s' % (VERSION[0], VERSION[1]) __init__.py conf/locale/da/LC_MESSAGES/django.mo @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-05 21:55+0100\n" +"POT-Creation-Date: 2008-11-16 20:27+0100\n" "PO-Revision-Date: 2008-11-07 20:41+0200\n" "Last-Translator: Finn Gruwier Larsen<finn@gruwier.dk>\n" "Language-Team: \n" @@ -99,114 +99,122 @@ msgid "Hebrew" msgstr "Hebræisk" #: conf/global_settings.py:65 +msgid "Hindi" +msgstr "Hindi" + +#: conf/global_settings.py:66 msgid "Croatian" msgstr "Kroatisk" -#: conf/global_settings.py:66 +#: conf/global_settings.py:67 msgid "Icelandic" msgstr "Islandsk" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Italian" msgstr "Italiensk" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Japanese" msgstr "Japansk" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Georgian" msgstr "Georgisk" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Korean" msgstr "Koreansk" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Khmer" msgstr "Khmer" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Kannada" msgstr "Kannada" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Latvian" msgstr "Lettisk" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Lithuanian" msgstr "Litauisk" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Macedonian" msgstr "Makedonsk" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Dutch" msgstr "Hollandsk" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "Norwegian" msgstr "Norsk" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Polish" msgstr "Polsk" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Portuguese" msgstr "Portugisisk" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Brazilian Portuguese" msgstr "Brasiliansk portugisisk" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Romanian" msgstr "Rumænsk" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Russian" msgstr "Russisk" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Slovak" msgstr "Slovakisk" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Slovenian" msgstr "Slovensk" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Serbian" msgstr "Serbisk" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Swedish" msgstr "Svensk" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 msgid "Tamil" msgstr "Tamil" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Telugu" msgstr "Telugu" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 +msgid "Thai" +msgstr "Thai" + +#: conf/global_settings.py:91 msgid "Turkish" msgstr "Tyrkisk" -#: conf/global_settings.py:90 +#: conf/global_settings.py:92 msgid "Ukrainian" msgstr "Ukrainsk" -#: conf/global_settings.py:91 +#: conf/global_settings.py:93 msgid "Simplified Chinese" msgstr "Forenklet kinesisk" -#: conf/global_settings.py:92 +#: conf/global_settings.py:94 msgid "Traditional Chinese" msgstr "Traditionelt kinesisk" @@ -348,6 +356,11 @@ msgstr "%(name)s \"%(obj)s\" blev tilføjet. Du kan redigere det igen herunder." msgid "Add %s" msgstr "Tilføj %s" +#: contrib/admin/options.py:559 contrib/admin/options.py:673 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "Der findes ikke et %(name)s-objekt med primærnøgle %(key)r." + #: contrib/admin/options.py:606 #, python-format msgid "Change %s" @@ -462,7 +475,7 @@ msgstr "Vi beklager, men den ønskede side kunne ikke findes" #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:31 +#: contrib/admin/templates/admin/base.html:33 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:8 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -506,18 +519,18 @@ msgstr "" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:28 msgid "Welcome," msgstr "Velkommen," -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:28 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentation" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:28 #: contrib/admin/templates/admin/auth/user/change_password.html:13 #: contrib/admin/templates/admin/auth/user/change_password.html:46 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -525,7 +538,7 @@ msgstr "Dokumentation" msgid "Change password" msgstr "Skift adgangskode" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:28 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -664,7 +677,7 @@ msgstr "Funktion" #: contrib/admin/templates/admin/object_history.html:30 #: utils/translation/trans_real.py:404 msgid "DATETIME_FORMAT" -msgstr "DATETIME_FORMAT" +msgstr "j. F Y H:i" #: contrib/admin/templates/admin/object_history.html:38 msgid "" @@ -1499,7 +1512,8 @@ msgstr "Tak for godkendelsen" msgid "" "Thanks for taking the time to improve the quality of discussion on our site" msgstr "" -"Tak fordi du tog dig tid til at højne kvaliteten af diskussionen på vores website." +"Tak fordi du tog dig tid til at højne kvaliteten af diskussionen på vores " +"website" #: contrib/comments/templates/comments/delete.html:4 msgid "Remove a comment" @@ -3796,11 +3810,11 @@ msgstr "Der må højst være %s decimalpladser." msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Der må maksimalt være %s cifre før decimaltegnet." -#: forms/fields.py:287 forms/fields.py:848 +#: forms/fields.py:287 forms/fields.py:849 msgid "Enter a valid date." msgstr "Indtast en gyldig dato." -#: forms/fields.py:321 forms/fields.py:849 +#: forms/fields.py:321 forms/fields.py:850 msgid "Enter a valid time." msgstr "Indtast en gyldig tid." @@ -3843,15 +3857,15 @@ msgstr "" "Marker en gyldigt valgmulighed; '%(value)s' er ikke en af de tilgængelige " "valgmuligheder." -#: forms/fields.py:697 forms/fields.py:758 forms/models.py:720 +#: forms/fields.py:697 forms/fields.py:758 forms/models.py:714 msgid "Enter a list of values." msgstr "Indtast en liste af værdier." -#: forms/fields.py:877 +#: forms/fields.py:878 msgid "Enter a valid IPv4 address." msgstr "Indtast en gyldig IPv4-adresse." -#: forms/fields.py:887 +#: forms/fields.py:888 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" @@ -3866,44 +3880,44 @@ msgstr "Rækkefølge" msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s med dette %(field_label)s eksisterer allerede." -#: forms/models.py:587 +#: forms/models.py:581 msgid "The inline foreign key did not match the parent instance primary key." -msgstr "" +msgstr "Den indlejrede fremmednøgle passede ikke med forælderinstansens primærnøgle." -#: forms/models.py:650 +#: forms/models.py:644 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Marker en gyldig valgmulighed. Det valg, du har foretaget, er ikke blandt de " "tilgængelige valgmuligheder." -#: forms/models.py:721 +#: forms/models.py:715 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "" "Marker et gyldigt valg. %s er ikke en af de tilgængelige valgmuligheder." -#: template/defaultfilters.py:706 +#: template/defaultfilters.py:743 msgid "yes,no,maybe" msgstr "ja,nej,måske" -#: template/defaultfilters.py:737 +#: template/defaultfilters.py:774 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d byte" msgstr[1] "%(size)d bytes" -#: template/defaultfilters.py:739 +#: template/defaultfilters.py:776 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:741 +#: template/defaultfilters.py:778 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:742 +#: template/defaultfilters.py:779 #, python-format msgid "%.1f GB" msgstr "%.1f GB" @@ -3990,51 +4004,51 @@ msgstr "Søn" #: utils/dates.py:18 msgid "January" -msgstr "Januar" +msgstr "januar" #: utils/dates.py:18 msgid "February" -msgstr "Februar" +msgstr "februar" #: utils/dates.py:18 utils/dates.py:31 msgid "March" -msgstr "Marts" +msgstr "marts" #: utils/dates.py:18 utils/dates.py:31 msgid "April" -msgstr "April" +msgstr "april" #: utils/dates.py:18 utils/dates.py:31 msgid "May" -msgstr "Maj" +msgstr "maj" #: utils/dates.py:18 utils/dates.py:31 msgid "June" -msgstr "Juni" +msgstr "juni" #: utils/dates.py:19 utils/dates.py:31 msgid "July" -msgstr "Juli" +msgstr "juli" #: utils/dates.py:19 msgid "August" -msgstr "August" +msgstr "august" #: utils/dates.py:19 msgid "September" -msgstr "September" +msgstr "september" #: utils/dates.py:19 msgid "October" -msgstr "Oktober" +msgstr "oktober" #: utils/dates.py:19 msgid "November" -msgstr "November" +msgstr "november" #: utils/dates.py:20 msgid "December" -msgstr "December" +msgstr "december" #: utils/dates.py:23 msgid "jan" @@ -4168,19 +4182,19 @@ msgstr ", %(number)d %(type)s" #: utils/translation/trans_real.py:403 msgid "DATE_FORMAT" -msgstr "DATE_FORMAT" +msgstr "j. F Y" #: utils/translation/trans_real.py:405 msgid "TIME_FORMAT" -msgstr "TIME_FORMAT" +msgstr "H:i" #: utils/translation/trans_real.py:421 msgid "YEAR_MONTH_FORMAT" -msgstr "YEAR_MONTH_FORMAT" +msgstr "F Y" #: utils/translation/trans_real.py:422 msgid "MONTH_DAY_FORMAT" -msgstr "MONTH_DAY_FORMAT" +msgstr "j. F" #: views/generic/create_update.py:114 #, python-format conf/locale/da/LC_MESSAGES/django.po conf/locale/he/LC_MESSAGES/django.mo @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-04 01:50-0500\n" -"PO-Revision-Date: 2008-11-04 02:05-0500\n" +"POT-Creation-Date: 2008-11-14 02:20-0500\n" +"PO-Revision-Date: 2008-11-14 02:21-0500\n" "Last-Translator: Alex <alex.gaynor@gmail.com>\n" "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -100,114 +100,122 @@ msgid "Hebrew" msgstr "עברית" #: conf/global_settings.py:65 +msgid "Hindi" +msgstr "הינדי" + +#: conf/global_settings.py:66 msgid "Croatian" msgstr "קרואטית" -#: conf/global_settings.py:66 +#: conf/global_settings.py:67 msgid "Icelandic" msgstr "איסלנדית" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Italian" msgstr "איטלקית" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Japanese" msgstr "יפנית" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Georgian" msgstr "גיאורגית" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Korean" msgstr "קוריאנית" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Khmer" msgstr "חמר" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Kannada" msgstr "קנדית" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Latvian" msgstr "לטבית" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Lithuanian" msgstr "ליטאית" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Macedonian" msgstr "מקדונית" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Dutch" msgstr "הולנדית" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "Norwegian" msgstr "נורווגית" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Polish" msgstr "פולנית" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Portuguese" msgstr "פורטוגזית" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Brazilian Portuguese" msgstr "פורטוגזית ברזילאית" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Romanian" msgstr "רומנית" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Russian" msgstr "רוסית" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Slovak" msgstr "סלובקית" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Slovenian" msgstr "סלובנית" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Serbian" msgstr "סרבית" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Swedish" msgstr "שוודית" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 msgid "Tamil" msgstr "טמילית" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Telugu" msgstr "טלגו" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 +msgid "Thai" +msgstr "תאילנדית" + +#: conf/global_settings.py:91 msgid "Turkish" msgstr "טורקית" -#: conf/global_settings.py:90 +#: conf/global_settings.py:92 msgid "Ukrainian" msgstr "אוקראינית" -#: conf/global_settings.py:91 +#: conf/global_settings.py:93 msgid "Simplified Chinese" msgstr "סינית פשוטה" -#: conf/global_settings.py:92 +#: conf/global_settings.py:94 msgid "Traditional Chinese" msgstr "סינית מסורתית" @@ -248,17 +256,17 @@ msgid "This year" msgstr "השנה" #: contrib/admin/filterspecs.py:146 -#: forms/widgets.py:391 +#: forms/widgets.py:390 msgid "Yes" msgstr "כן" #: contrib/admin/filterspecs.py:146 -#: forms/widgets.py:391 +#: forms/widgets.py:390 msgid "No" msgstr "לא" #: contrib/admin/filterspecs.py:153 -#: forms/widgets.py:391 +#: forms/widgets.py:390 msgid "Unknown" msgstr "לא ידוע" @@ -303,7 +311,7 @@ msgstr "%s שונה." #: contrib/admin/options.py:338 #: contrib/admin/options.py:348 #: contrib/comments/templates/comments/preview.html:15 -#: forms/models.py:278 +#: forms/models.py:288 msgid "and" msgstr "ו" @@ -359,6 +367,12 @@ msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לער msgid "Add %s" msgstr "הוספת %s" +#: contrib/admin/options.py:559 +#: contrib/admin/options.py:673 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "" + #: contrib/admin/options.py:606 #, python-format msgid "Change %s" @@ -471,7 +485,7 @@ msgstr "אנו מצטערים, לא ניתן למצוא את הדף המבוקש #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:30 +#: contrib/admin/templates/admin/base.html:31 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:8 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -511,18 +525,18 @@ msgstr "התרחשה שגיאה. היא דווחה למנהלי האתר בדו msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 msgid "Welcome," msgstr "שלום," -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "תיעוד" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/admin/auth/user/change_password.html:13 #: contrib/admin/templates/admin/auth/user/change_password.html:46 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -530,7 +544,7 @@ msgstr "תיעוד" msgid "Change password" msgstr "שינוי סיסמה" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -1134,7 +1148,7 @@ msgstr "שינוי סיסמה: %s" #: contrib/auth/forms.py:15 #: contrib/auth/forms.py:48 -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:127 msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)." msgstr "דורש 30 תווים או פחות. תווים אלפאנומריים בלבד (אותיות, ספרות וקווים תחתונים)." @@ -1194,106 +1208,106 @@ msgstr "סיסמה ישנה" msgid "Your old password was entered incorrectly. Please enter it again." msgstr "סיסמתך הישנה הוזנה בצורה שגויה. נא להזינה שוב." -#: contrib/auth/models.py:72 -#: contrib/auth/models.py:95 +#: contrib/auth/models.py:63 +#: contrib/auth/models.py:86 msgid "name" msgstr "שם" -#: contrib/auth/models.py:74 +#: contrib/auth/models.py:65 msgid "codename" msgstr "שם קוד" -#: contrib/auth/models.py:77 +#: contrib/auth/models.py:68 msgid "permission" msgstr "הרשאה" -#: contrib/auth/models.py:78 -#: contrib/auth/models.py:96 +#: contrib/auth/models.py:69 +#: contrib/auth/models.py:87 msgid "permissions" msgstr "הרשאות" -#: contrib/auth/models.py:99 +#: contrib/auth/models.py:90 msgid "group" msgstr "קבוצה" -#: contrib/auth/models.py:100 -#: contrib/auth/models.py:146 +#: contrib/auth/models.py:91 +#: contrib/auth/models.py:137 msgid "groups" msgstr "קבוצות" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:127 msgid "username" msgstr "שם משתמש" -#: contrib/auth/models.py:137 +#: contrib/auth/models.py:128 msgid "first name" msgstr "שם פרטי" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:129 msgid "last name" msgstr "שם משפחה" -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:130 msgid "e-mail address" msgstr "כתובת דוא\"ל" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:131 msgid "password" msgstr "סיסמה" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:131 msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>." msgstr "יש להזין '[algo]$[salt]$[hexdigest]' או להשתמש ב<a href=\"password/\">טופס שינוי הסיסמה</a>." -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:132 msgid "staff status" msgstr "סטטוס איש צוות" -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:132 msgid "Designates whether the user can log into this admin site." msgstr "מציין האם המשתמש יכול להתחבר לאתר הניהול." -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:133 msgid "active" msgstr "פעיל" -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:133 msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות משתמשים." -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:134 msgid "superuser status" msgstr "סטטוס משתמש על" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:134 msgid "Designates that this user has all permissions without explicitly assigning them." msgstr "מציין שלמשתמש זה יש את כל ההרשאות ללא הצורך המפורש בהענקתן." -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:135 msgid "last login" msgstr "כניסה אחרונה" -#: contrib/auth/models.py:145 +#: contrib/auth/models.py:136 msgid "date joined" msgstr "תאריך הצטרפות" -#: contrib/auth/models.py:147 +#: contrib/auth/models.py:138 msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." msgstr "בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש גם כל ההרשאות של כל קבוצה המשוייכת אליו." -#: contrib/auth/models.py:148 +#: contrib/auth/models.py:139 msgid "user permissions" msgstr "הרשאות משתמש" -#: contrib/auth/models.py:152 +#: contrib/auth/models.py:143 msgid "user" msgstr "משתמש" -#: contrib/auth/models.py:153 +#: contrib/auth/models.py:144 msgid "users" msgstr "משתמשים" -#: contrib/auth/models.py:308 +#: contrib/auth/models.py:300 msgid "message" msgstr "הודעה" @@ -3684,12 +3698,12 @@ msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "נא לוודא שאין יותר מ-%s ספרות לפני הנקודה העשרונית" #: forms/fields.py:287 -#: forms/fields.py:848 +#: forms/fields.py:849 msgid "Enter a valid date." msgstr "יש להזין תאריך חוקי." #: forms/fields.py:321 -#: forms/fields.py:849 +#: forms/fields.py:850 msgid "Enter a valid time." msgstr "יש להזין שעה חוקית." @@ -3729,15 +3743,15 @@ msgstr "יש לבחור אפשרות חוקית. %(value)s אינו בין הא #: forms/fields.py:697 #: forms/fields.py:758 -#: forms/models.py:710 +#: forms/models.py:720 msgid "Enter a list of values." msgstr "יש להזין רשימת ערכים" -#: forms/fields.py:877 +#: forms/fields.py:878 msgid "Enter a valid IPv4 address." msgstr "יש להזין כתובת IPv4 חוקית." -#: forms/fields.py:887 +#: forms/fields.py:888 msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים תחתונים ומקפים בלבד." @@ -3746,47 +3760,47 @@ msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים msgid "Order" msgstr "מיון" -#: forms/models.py:271 -#: forms/models.py:280 +#: forms/models.py:281 +#: forms/models.py:290 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s·עם·%(field_label)s·זה קיימת כבר." -#: forms/models.py:577 +#: forms/models.py:587 msgid "The inline foreign key did not match the parent instance primary key." msgstr "הרצופות מפתח זר לא תאם את האב מופע המפתח העיקרי." -#: forms/models.py:640 +#: forms/models.py:650 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "יש לבחור אפשרות חוקית; '%(data)s' אינו בין %(choices)s." -#: forms/models.py:711 +#: forms/models.py:721 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "יש לבחור אפשרות חוקית. %s אינו בין האפשרויות הזמינות." -#: template/defaultfilters.py:706 +#: template/defaultfilters.py:741 msgid "yes,no,maybe" msgstr "כן,לא,אולי" -#: template/defaultfilters.py:737 +#: template/defaultfilters.py:772 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d בית" msgstr[1] "%(size)d בתים" -#: template/defaultfilters.py:739 +#: template/defaultfilters.py:774 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:741 +#: template/defaultfilters.py:776 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:742 +#: template/defaultfilters.py:777 #, python-format msgid "%.1f GB" msgstr "%.1f GB" conf/locale/he/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ {% for field in form %} <tr> <th>{{ field.label }}:</th> -<td>{{ field.data|escape }}</td> +<td>{{ field.data }}</td> </tr> {% endfor %} </table> contrib/formtools/templates/formtools/preview.html @@ -2,11 +2,11 @@ {% block vars %}var {{ module }} = {}; {{ module }}.map = null; {{ module }}.controls = null; {{ module }}.panel = null; {{ module }}.re = new RegExp("^SRID=\d+;(.+)", "i"); {{ module }}.layers = {}; {{ module }}.wkt_f = new OpenLayers.Format.WKT(); -{{ module }}.is_collection = {% if is_collection %}true{% else %}false{% endif %}; +{{ module }}.is_collection = {{ is_collection|yesno:"true,false" }}; {{ module }}.collection_type = '{{ collection_type }}'; -{{ module }}.is_linestring = {% if is_linestring %}true{% else %}false{% endif %}; -{{ module }}.is_polygon = {% if is_polygon %}true{% else %}false{% endif %}; -{{ module }}.is_point = {% if is_point %}true{% else %}false{% endif %}; +{{ module }}.is_linestring = {{ is_linestring|yesno:"true,false" }}; +{{ module }}.is_polygon = {{ is_polygon|yesno:"true,false" }}; +{{ module }}.is_point = {{ is_point|yesno:"true,false" }}; {% endblock %} {{ module }}.get_ewkt = function(feat){return 'SRID={{ srid }};' + {{ module }}.wkt_f.write(feat);} {{ module }}.read_wkt = function(wkt){ @@ -147,7 +147,7 @@ {% if scale_text %}{{ module }}.map.addControl(new OpenLayers.Control.Scale());{% endif %} {% if layerswitcher %}{{ module }}.map.addControl(new OpenLayers.Control.LayerSwitcher());{% endif %} // Then add optional behavior controls - {% if scrollable %}{% else %}{{ module }}.map.getControlsByClass('OpenLayers.Control.Navigation')[0].disableZoomWheel();{% endif %} + {% if not scrollable %}{{ module }}.map.getControlsByClass('OpenLayers.Control.Navigation')[0].disableZoomWheel();{% endif %} {% endblock %} if (wkt){ {{ module }}.enableEditing(); contrib/gis/templates/gis/admin/openlayers.js @@ -29,6 +29,7 @@ from django.db.backends.mysql.client import DatabaseClient from django.db.backends.mysql.creation import DatabaseCreation from django.db.backends.mysql.introspection import DatabaseIntrospection from django.db.backends.mysql.validation import DatabaseValidation +from django.utils.safestring import SafeString, SafeUnicode # Raise exceptions for database warnings if DEBUG is on from django.conf import settings @@ -39,12 +40,11 @@ if settings.DEBUG: DatabaseError = Database.DatabaseError IntegrityError = Database.IntegrityError -# MySQLdb-1.2.1 supports the Python boolean type, and only uses datetime -# module for time-related columns; older versions could have used mx.DateTime -# or strings if there were no datetime module. However, MySQLdb still returns -# TIME columns as timedelta -- they are more like timedelta in terms of actual -# behavior as they are signed and include days -- and Django expects time, so -# we still need to override that. +# MySQLdb-1.2.1 returns TIME columns as timedelta -- they are more like +# timedelta in terms of actual behavior as they are signed and include days -- +# and Django expects time, so we still need to override that. We also need to +# add special handling for SafeUnicode and SafeString as MySQLdb's type +# checking is too tight to catch those (see Django ticket #6052). django_conversions = conversions.copy() django_conversions.update({ FIELD_TYPE.TIME: util.typecast_time, @@ -174,7 +174,7 @@ class DatabaseOperations(BaseDatabaseOperations): def value_to_db_datetime(self, value): if value is None: return None - + # MySQL doesn't support tz-aware datetimes if value.tzinfo is not None: raise ValueError("MySQL backend does not support timezone-aware datetimes.") @@ -185,11 +185,11 @@ class DatabaseOperations(BaseDatabaseOperations): def value_to_db_time(self, value): if value is None: return None - + # MySQL doesn't support tz-aware datetimes if value.tzinfo is not None: raise ValueError("MySQL backend does not support timezone-aware datetimes.") - + # MySQL doesn't support microseconds return unicode(value.replace(microsecond=0)) @@ -260,6 +260,8 @@ class DatabaseWrapper(BaseDatabaseWrapper): kwargs['port'] = int(settings.DATABASE_PORT) kwargs.update(self.options) self.connection = Database.connect(**kwargs) + self.connection.encoders[SafeUnicode] = self.connection.encoders[unicode] + self.connection.encoders[SafeString] = self.connection.encoders[str] cursor = CursorWrapper(self.connection.cursor()) return cursor db/backends/mysql/base.py @@ -101,7 +101,7 @@ class DatabaseOperations(BaseDatabaseOperations): return [first % value, second % value] class DatabaseWrapper(BaseDatabaseWrapper): - + # SQLite requires LIKE statements to include an ESCAPE clause if the value # being escaped has a percent or underscore in it. # See http://www.sqlite.org/lang_expr.html for an explanation. @@ -124,7 +124,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): def __init__(self, *args, **kwargs): super(DatabaseWrapper, self).__init__(*args, **kwargs) - + self.features = DatabaseFeatures() self.ops = DatabaseOperations() self.client = DatabaseClient() @@ -179,6 +179,8 @@ class SQLiteCursorWrapper(Database.Cursor): return query % tuple("?" * num_params) def _sqlite_extract(lookup_type, dt): + if dt is None: + return None try: dt = util.typecast_timestamp(dt) except (ValueError, TypeError): db/backends/sqlite3/base.py @@ -266,7 +266,11 @@ class Model(object): signals.post_init.send(sender=self.__class__, instance=self) def __repr__(self): - return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self))) + try: + u = unicode(self) + except (UnicodeEncodeError, UnicodeDecodeError): + u = '[Bad Unicode data]' + return smart_str(u'<%s: %s>' % (self.__class__.__name__, u)) def __str__(self): if hasattr(self, '__unicode__'): db/models/base.py 75c5d10f3ab46befa3615b37a8452304ff064a0c Myles Braithwaite me@mylesbraithwaite.com http://github.com/myles/django/commit/0ad826706a4e14d9c1e775c0052de85ec4b305e9 0ad826706a4e14d9c1e775c0052de85ec4b305e9 2008-11-19T07:50:34-08:00 2008-11-19T07:50:34-08:00 Django 1.0.2 457a93afa5b5276577ae66607fe5e3a2e7fd39d9 Myles Braithwaite me@mylesbraithwaite.com