Django

Code

Changeset 1873

Show
Ignore:
Timestamp:
01/08/06 18:55:23 (3 years ago)
Author:
adrian
Message:

magic-removal: Merged to [1872]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/AUTHORS

    r1854 r1873  
    9696    wojtek 
    9797    ye7cakf02@sneakemail.com 
     98    Cheng Zhang 
    9899 
    99100A big THANK YOU goes to: 

  • django/branches/magic-removal/django/conf/locale/ru/LC_MESSAGES/djangojs.po

    r1794 r1873  
    2020#, perl-format 
    2121msgid "Available %s" 
    22 msgstr "äÏÓÔÕÐÅÎ %s" 
     22msgstr "äÏÓÔÕÐÎÙÅ %s" 
    2323 
    2424#: contrib/admin/media/js/SelectFilter2.js:41 
    …… 
    3737#, perl-format 
    3838msgid "Chosen %s" 
    39 msgstr "÷ÙÂÒÁÎ %s" 
     39msgstr "÷ÙÂÒÁÎÎÙÅ %s" 
    4040 
    4141#: contrib/admin/media/js/SelectFilter2.js:54 
    …… 
    5252"January February March April May June July August September October November " 
    5353"December" 
    54 msgstr "ñÎ×ÁÒØ æÅ×ÒÁÌØ íÁÒÔ áÐÒÅÌØ íÁÊ éÀÎØ éÀÌØ á×ÇÕÓÔ óÅÎÔÑÂÒØ ïËÔÑÂÒØ îÏÑÂÒØ " 
     54msgstr "" 
     55"ñÎ×ÁÒØ æÅ×ÒÁÌØ íÁÒÔ áÐÒÅÌØ íÁÊ éÀÎØ éÀÌØ á×ÇÕÓÔ óÅÎÔÑÂÒØ ïËÔÑÂÒØ îÏÑÂÒØ " 
    5556"äÅËÁÂÒØ" 
    5657 

  • django/branches/magic-removal/django/conf/locale/ru/LC_MESSAGES/django.po

    r1854 r1873  
    3232#: contrib/comments/models/comments.py:11 
    3333msgid "rating #1" 
    34 msgstr "" 
     34msgstr "ÒÅÊÔÉÎÇ #1" 
    3535 
    3636#: contrib/comments/models/comments.py:12 
    3737msgid "rating #2" 
    38 msgstr "" 
     38msgstr "ÒÅÊÔÉÎÇ #2" 
    3939 
    4040#: contrib/comments/models/comments.py:13 
    4141msgid "rating #3" 
    42 msgstr "" 
     42msgstr "ÒÅÊÔÉÎÇ #3" 
    4343 
    4444#: contrib/comments/models/comments.py:14 
    4545msgid "rating #4" 
    46 msgstr "" 
     46msgstr "ÒÅÊÔÉÎÇ #4" 
    4747 
    4848#: contrib/comments/models/comments.py:15 
    4949msgid "rating #5" 
    50 msgstr "" 
     50msgstr "ÒÅÊÔÉÎÇ #5" 
    5151 
    5252#: contrib/comments/models/comments.py:16 
    5353msgid "rating #6" 
    54 msgstr "" 
     54msgstr "ÒÅÊÔÉÎÇ #6" 
    5555 
    5656#: contrib/comments/models/comments.py:17 
    5757msgid "rating #7" 
    58 msgstr "" 
     58msgstr "ÒÅÊÔÉÎÇ #7" 
    5959 
    6060#: contrib/comments/models/comments.py:18 
    6161msgid "rating #8" 
    62 msgstr "" 
     62msgstr "ÒÅÊÔÉÎÇ #8" 
    6363 
    6464#: contrib/comments/models/comments.py:23 
    6565msgid "is valid rating" 
    66 msgstr "" 
     66msgstr "ÄÏÓÔÕÐÎÙÊ ÒÅÊÔÉÎÇ" 
    6767 
    6868#: contrib/comments/models/comments.py:24 
    6969#: contrib/comments/models/comments.py:164 
    7070msgid "date/time submitted" 
    71 msgstr "" 
     71msgstr "ÄÁÔÁ/×ÒÅÍÑ ÄÏÂÁ×ÌÅÎÉÑ" 
    7272 
    7373#: contrib/comments/models/comments.py:25 
    7474#: contrib/comments/models/comments.py:165 
    7575msgid "is public" 
    76 msgstr "" 
     76msgstr "ÐÕÂÌÉÞÎÙÊ" 
    7777 
    7878#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256 
    …… 
    140140#: contrib/comments/models/comments.py:209 
    141141msgid "score" 
    142 msgstr "" 
     142msgstr "ÓÞ£Ô" 
    143143 
    144144#: contrib/comments/models/comments.py:210 
    145145msgid "score date" 
    146 msgstr "" 
     146msgstr "ÓÞ£Ô ×ÒÅÍÅÎÉ" 
    147147 
    148148#: contrib/comments/models/comments.py:213 
    …… 
    164164 
    165165#: contrib/comments/models/comments.py:251 
    166 #, fuzzy 
    167166msgid "User flag" 
    168 msgstr "ðÏÌØÚÏ×ÁÔÅÌØ" 
     167msgstr "ðÒÉÚÎÁË ÐÏÌØÚÏ×ÁÔÅÌÑ" 
    169168 
    170169#: contrib/comments/models/comments.py:252 
    171 #, fuzzy 
    172170msgid "User flags" 
    173 msgstr "ðÏÌØÚÏ×ÁÔÅÌØ" 
     171msgstr "ðÒÉÚÎÁËÉ ÏÌØÚÏ×ÁÔÅÌÑ" 
    174172 
    175173#: contrib/comments/models/comments.py:256 
    176174#, python-format 
    177175msgid "Flag by %r" 
    178 msgstr "" 
     176msgstr "ïÔÍÅÞÅÎ %r" 
    179177 
    180178#: contrib/comments/models/comments.py:271 
    …… 
    185183"%(text)s" 
    186184msgstr "" 
     185"üÔÏÔ ËÏÍÍÅÎÔÁÒÉÊ ÂÙÌ ÏÔÍÅÞÅÎ %(user)s:\n" 
     186"\n" 
     187"%(text)s" 
    187188 
    188189#: contrib/comments/models/comments.py:278 
    …… 
    967968 
    968969#: contrib/admin/templates/widget/date_time.html:4 
    969 #, fuzzy 
    970970msgid "Time:" 
    971 msgstr "÷ÒÅÍÑ" 
     971msgstr "÷ÒÅÍÑ:" 
    972972 
    973973#: contrib/admin/templates/widget/file.html:2 
    974974msgid "Currently:" 
    975 msgstr "" 
     975msgstr "óÏ×ÒÅÍÅÎÎÏ:" 
    976976 
    977977#: contrib/admin/templates/widget/file.html:3 
    978 #, fuzzy 
    979978msgid "Change:" 
    980 msgstr "éÚÍÅÎÉÔØ" 
     979msgstr "éÚÍÅÎÉÔØ:" 
    981980 
    982981#: contrib/redirects/models/redirects.py:7 
    …… 
    10101009#: contrib/redirects/models/redirects.py:13 
    10111010msgid "redirects" 
    1012 msgstr "ÐÅÒÅÎÁÐÒÏ×ÌÅÎÉÑ" 
     1011msgstr "ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ" 
    10131012 
    10141013#: contrib/flatpages/models/flatpages.py:7 
    …… 
    10461045#: contrib/flatpages/models/flatpages.py:13 
    10471046msgid "If this is checked, only logged-in users will be able to view the page." 
    1048 msgstr "åÓÌÉ ÏÔÍÅÞÅÎÏ, ÔÏÌØËÏ ×ÏÛÅÄÛÉÅ ÐÏÌØÚÏ×ÁÔÅÌÉ ÓÍÏÇÕÔ ×ÉÄÅÔØ ÓÔÒÁÎÉÃÕ" 
     1047msgstr "åÓÌÉ ÏÔÍÅÞÅÎÏ, ÔÏÌØËÏ ×ÏÛÅÄÛÉÅ ÐÏÌØÚÏ×ÁÔÅÌÉ ÓÍÏÇÕÔ ×ÉÄÅÔØ ÓÔÒÁÎÉÃÕ." 
    10491048 
    10501049#: contrib/flatpages/models/flatpages.py:17 
    …… 
    17771776#: core/template/defaultfilters.py:371 
    17781777msgid "yes,no,maybe" 
    1779 msgstr "" 
     1778msgstr "ÄÁ,ÎÅÔ,ÍÏÖÅÔ ÂÙÔØ" 
    17801779 
    17811780#: parts/auth/formfields.py:27 

  • django/branches/magic-removal/django/core/formfields.py

    r1800 r1873  
    787787class TimeField(TextField): 
    788788    """A FormField that automatically converts its data to a datetime.time object. 
    789     The data should be in the format HH:MM:SS.""" 
     789    The data should be in the format HH:MM:SS or HH:MM:SS.mmmmmm.""" 
    790790    def __init__(self, field_name, is_required=False, validator_list=[]): 
    791791        validator_list = [self.isValidTime] + validator_list 
    …… 
    803803        import time, datetime 
    804804        try: 
     805            part_list = data.split('.') 
    805806            try: 
    806                 time_tuple = time.strptime(data, '%H:%M:%S') 
     807                time_tuple = time.strptime(part_list[0], '%H:%M:%S') 
    807808            except ValueError: # seconds weren't provided 
    808                 time_tuple = time.strptime(data, '%H:%M') 
    809             return datetime.time(*time_tuple[3:6]) 
     809                time_tuple = time.strptime(part_list[0], '%H:%M') 
     810            t = datetime.time(*time_tuple[3:6]) 
     811            if (len(part_list) == 2): 
     812                t = t.replace(microsecond=int(part_list[1])) 
     813            return t 
    810814        except (ValueError, TypeError): 
    811815            return None 

  • django/branches/magic-removal/django/core/management.py

    r1864 r1873  
    787787                        from PIL import Image 
    788788                    except ImportError: 
    789                         e.add(opts, '"%s" field: To use ImageFields, you need to install the Python Imaging Library. Get it at http://www.pythonware.com/products/pil/ .') 
     789                        e.add(opts, '"%s" field: To use ImageFields, you need to install the Python Imaging Library. Get it at http://www.pythonware.com/products/pil/ .' % f.name) 
    790790                if f.prepopulate_from is not None and type(f.prepopulate_from) not in (list, tuple): 
    791791                    e.add(opts, '"%s" field: prepopulate_from should be a list or tuple.' % f.name) 

  • django/branches/magic-removal/docs/contributing.txt

    r1775 r1873  
    1818      patches`_, below, for details on how to submit a patch. 
    1919 
    20     * Join the `django-dev`_ mailing list and share your ideas for how to improve 
    21       Django.  We're always open to suggestions, although we're likely to be skeptical 
    22       of large-scale suggestions without some code to back it up. 
     20    * Join the `django-developers`_ mailing list and share your ideas for how 
     21      to improve Django.  We're always open to suggestions, although we're 
     22      likely to be skeptical of large-scale suggestions without some code to 
     23      back it up. 
    2324 
    2425That's all you need to know if you'd like to join the Django development 
    …… 
    5152 
    5253    * **Don't** use the ticket system to make large-scale feature requests. 
    53       We like to discuss any big changes to Django's core on the `django-dev`_ 
     54      We like to discuss any big changes to Django's core on the `django-developers`_ 
    5455      list before actually working on them. 
    5556 
    5657    * **Don't** reopen issues that have been marked "wontfix". This mark means 
    5758      that the decision has been made that we can't or won't fix this particular 
    58       issue.  If you're not sure why, please ask on `django-dev`_. 
     59      issue.  If you're not sure why, please ask on `django-developers`_. 
    5960 
    6061    * **Don't** use the ticket tracker for lengthy discussions, because they're 
    6162      likely to get lost. If a particular ticket is controversial, please move 
    62       discussion to `django-dev`_. 
     63      discussion to `django-developers`_. 
    6364 
    6465Reporting security issues 
    …… 
    168169          {{foo}} 
    169170 
     171Committing code 
     172=============== 
     173 
     174Please follow these guidelines when committing code to Django's Subversion 
     175repository: 
     176 
     177    * For any medium-to-big changes, where "medium-to-big" is according to your 
     178      judgment, please bring things up on the `django-developers`_ mailing list 
     179      before making the change. 
     180 
     181    * Write detailed commit messages in the past tense, not present tense. 
     182 
     183          * Good: "Fixed Unicode bug in RSS API." 
     184          * Bad: "Fixes Unicode bug in RSS API." 
     185          * Bad: "Fixing Unicode bug in RSS API." 
     186 
     187    * For commits to a branch, prefix the commit message with the branch name. 
     188      For example: "magic-removal: Added support for mind reading." 
     189 
     190    * Limit commits to the most granular change that makes sense. This means, 
     191      use frequent small commits rather than infrequent large commits. For 
     192      example, if implementing feature X requires a small change to library Y, 
     193      first commit the change to library Y, then commit feature X in a separate 
     194      commit. This goes a *long way* in helping all core Django developers 
     195      follow your changes. 
     196 
     197    * If your commit closes a ticket in the Django `ticket tracker`_, begin 
     198      your commit message with the text "Fixed #abc", where "abc" is the number 
     199      of the ticket your commit fixes. Example: "Fixed #123 -- Added support 
     200      for foo". We've rigged Subversion and Trac so that any commit message 
     201      in that format will automatically close the referenced ticket and post a 
     202      comment to it with the full commit message. 
     203 
     204      If your commit closes a ticket and is in a branch, use the branch name 
     205      first, then the "Fixed #abc." For example: 
     206      "magic-removal: Fixed #123 -- Added whizbang feature." 
     207 
     208    * If your commit references a ticket in the Django `ticket tracker`_ but 
     209      does *not* close the ticket, include the phrase "Refs #abc", where "abc" 
     210      is the number of the ticket your commit references. We've rigged 
     211      Subversion and Trac so that any commit message in that format will 
     212      automatically post a comment to the appropriate ticket. 
     213 
    170214Requesting features 
    171215=================== 
    …… 
    174218part of that. Here are some tips on how to most effectively make a request: 
    175219 
    176     * Request the feature on `django-dev`_, not in the ticket tracker; it'll get 
    177       read more closely if it's on the mailing list. 
     220    * Request the feature on `django-developers`_, not in the ticket tracker; 
     221      it'll get read more closely if it's on the mailing list. 
    178222 
    179223    * Describe clearly and concisely what the missing feature is and how you'd 
    …… 
    202246encapsulated in a single patch, or changes that need multiple eyes on them -- 
    203247will have dedicated branches. See, for example, the `i18n branch`_. If you 
    204 have a change of this nature that you'd like to work on, ask on `django-dev`_ for 
    205 a branch to be created for you. We'll create a branch for pretty much any kind of 
    206 experimenting you'd like to do. 
     248have a change of this nature that you'd like to work on, ask on 
     249`django-developers`_ for a branch to be created for you. We'll create a branch 
     250for pretty much any kind of experimenting you'd like to do. 
    207251 
    208252We will only branch entire copies of the Django tree, even if work is only 
    …… 
    214258 
    215259Once the branch is stable and ready to be merged into the trunk, alert 
    216 `django-dev`_. 
     260`django-developers`_. 
    217261 
    218262After a branch has been merged, it should be considered "dead"; write access to 
    …… 
    286330 
    287331Whenever possible, we strive for a rough consensus. To that end, we'll often 
    288 have informal votes on django-dev about a feature. In these votes we follow the 
    289 voting style invented by Apache and used on Python itself, where votes are given 
    290 as +1, +0, -0, or -1.  Roughly translated, these votes mean: 
     332have informal votes on `django-developers`_ about a feature. In these votes we 
     333follow the voting style invented by Apache and used on Python itself, where 
     334votes are given as +1, +0, -0, or -1.  Roughly translated, these votes mean: 
    291335 
    292336    * +1: "I love the idea and I'm strongly committed to it." 
    …… 
    299343      into reality." 
    300344 
    301 Although these votes on django-dev are informal, they'll be taken very 
     345Although these votes on django-developers are informal, they'll be taken very 
    302346seriously. After a suitable voting period, if an obvious consensus arises 
    303347we'll follow the votes. 
    …… 
    338382.. _community page: http://www.djangoproject.com/community/ 
    339383.. _ticket tracker: http://code.djangoproject.com/newticket 
    340 .. _django-dev: http://groups.google.com/group/django-developers 
     384.. _django-developers: http://groups.google.com/group/django-developers 
    341385.. _FAQ: http://www.djangoproject.com/documentation/faq/ 
    342386.. _search the tracker: http://code.djangoproject.com/search 

  • django/branches/magic-removal/docs/db-api.txt

    r1794 r1873  
    313313 
    314314In the above example, each ``Place`` will have a ``get_restaurant()`` method, 
    315 and each ``Restaurant`` will have a ``get_theplace()`` method. 
     315and each ``Restaurant`` will have a ``get_the_place()`` method. 
    316316 
    317317Many-to-one relations 

  • django/branches/magic-removal/docs/forms.txt

    r1794 r1873  
    2727 
    2828    class Place(meta.Model): 
    29         name = meta.CharField(maxlength=100), 
    30         address = meta.CharField(maxlength=100, blank=True), 
    31         city = meta.CharField(maxlength=50, blank=True), 
    32         state = meta.USStateField(), 
    33         zip_code = meta.CharField(maxlength=5, blank=True), 
     29        name = meta.CharField(maxlength=100) 
     30        address = meta.CharField(maxlength=100, blank=True) 
     31        city = meta.CharField(maxlength=50, blank=True) 
     32        state = meta.USStateField() 
     33        zip_code = meta.CharField(maxlength=5, blank=True) 
    3434        place_type = meta.IntegerField(choices=PLACE_TYPES) 
    3535        class Meta: 

  • django/branches/magic-removal/docs/request_response.txt

    r1818 r1873  
    150150      (a Python list whose single element is ``value``). Note that this, as 
    151151      other dictionary functions that have side effects, can only be called on 
    152       an immutable ``QueryDict`` (one that was created via ``copy()``). 
     152      a mutable ``QueryDict`` (one that was created via ``copy()``). 
    153153 
    154154    * ``__contains__(key)`` -- **New in Django development version.** Returns 

  • django/branches/magic-removal/docs/templates_python.txt

    r1810 r1873  
    472472 
    473473        * ``/path/to/myproject/polls/templates/foo.html`` 
    474         * ``/path/to/myproject/music/templates/music.html`` 
     474        * ``/path/to/myproject/music/templates/foo.html`` 
    475475 
    476476    Note that the loader performs an optimization when it is first imported: