Changeset 1248
- Timestamp:
- 11/15/05 10:57:18 (3 years ago)
- Files:
-
- django/branches/new-admin/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
- django/branches/new-admin/django/conf/locale/de/LC_MESSAGES/django.po (modified) (5 diffs)
- django/branches/new-admin/django/contrib/admin/views/main.py (modified) (3 diffs)
- django/branches/new-admin/django/contrib/comments/models/comments.py (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/new-admin/django/conf/locale/de/LC_MESSAGES/django.po
r1246 r1248 8 8 "Project-Id-Version: Django 1.0\n" 9 9 "Report-Msgid-Bugs-To: \n" 10 "POT-Creation-Date: 2005-11-15 1 7:39+0100\n"10 "POT-Creation-Date: 2005-11-15 18:00+0100\n" 11 11 "PO-Revision-Date: 2005-10-08 00:03+0200\n" 12 12 "Last-Translator: Georg Bauer <gb@bofh.ms>\n" … … 15 15 "Content-Transfer-Encoding: 8bit\n" 16 16 17 #: contrib/comments/models/comments.py:8 18 #: contrib/comments/models/comments.py:161 19 msgid "object ID" 20 msgstr "Objekt ID" 21 22 #: contrib/comments/models/comments.py:9 23 msgid "headline" 24 msgstr "Überschrift" 25 26 #: contrib/comments/models/comments.py:10 27 #: contrib/comments/models/comments.py:162 28 msgid "comment" 29 msgstr "Kommentar" 30 31 #: contrib/comments/models/comments.py:11 32 msgid "rating #1" 33 msgstr "Bewertung #1" 34 35 #: contrib/comments/models/comments.py:12 36 msgid "rating #2" 37 msgstr "Bewertung #2" 38 39 #: contrib/comments/models/comments.py:13 40 msgid "rating #3" 41 msgstr "Bewertung #3" 42 43 #: contrib/comments/models/comments.py:14 44 msgid "rating #4" 45 msgstr "Bewertung #4" 46 47 #: contrib/comments/models/comments.py:15 48 msgid "rating #5" 49 msgstr "Bewertung #5" 50 51 #: contrib/comments/models/comments.py:16 52 msgid "rating #6" 53 msgstr "Bewertung #6" 54 55 #: contrib/comments/models/comments.py:17 56 msgid "rating #7" 57 msgstr "Bewertung #7" 58 59 #: contrib/comments/models/comments.py:18 60 msgid "rating #8" 61 msgstr "Bewertung #8" 62 63 #: contrib/comments/models/comments.py:23 64 msgid "is valid rating" 65 msgstr "ist eine Bewertung" 66 67 #: contrib/comments/models/comments.py:24 68 #: contrib/comments/models/comments.py:164 69 msgid "date/time submitted" 70 msgstr "Datum/Zeit Erstellung" 71 72 #: contrib/comments/models/comments.py:25 73 #: contrib/comments/models/comments.py:165 74 msgid "is public" 75 msgstr "ist öffentlich" 76 77 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 78 msgid "IP address" 79 msgstr "IP-Adresse" 80 81 #: contrib/comments/models/comments.py:27 82 msgid "is removed" 83 msgstr "ist gelöscht" 84 85 #: contrib/comments/models/comments.py:27 86 msgid "" 87 "Check this box if the comment is inappropriate. A \"This comment has been " 88 "removed\" message will be displayed instead." 89 msgstr "" 90 "Hier einen Haken setzen, wenn der Kommentar unpassend ist. Es wird dann eine " 91 "\"Dieser Kommentar wurde entfernt\" Meldung statt dessen angezeigt." 92 93 #: contrib/comments/models/comments.py:31 94 msgid "Comment" 95 msgstr "Kommentar" 96 97 #: contrib/comments/models/comments.py:32 98 msgid "Comments" 99 msgstr "Kommentare" 100 101 #: contrib/comments/models/comments.py:85 102 #: contrib/comments/models/comments.py:204 103 msgid "Content object" 104 msgstr "Inhaltsobjekt" 105 106 #: contrib/comments/models/comments.py:113 107 #, python-format 108 msgid "" 109 "Posted by %(user)s at %(date)s\n" 110 "\n" 111 "%(comment)s\n" 112 "\n" 113 "http://%(domain)s%(url)s" 114 msgstr "" 115 "Geschrieben von %(user)s am %(date)s\n" 116 "\n" 117 "%(comment)s\n" 118 "\n" 119 "http://%(domain)s%(url)s" 120 121 #: contrib/comments/models/comments.py:163 122 msgid "person's name" 123 msgstr "Autorname" 124 125 #: contrib/comments/models/comments.py:166 126 msgid "ip address" 127 msgstr "IP-Adresse" 128 129 #: contrib/comments/models/comments.py:168 130 msgid "approved by staff" 131 msgstr "Bestätigt vom Betreiber" 132 133 #: contrib/comments/models/comments.py:172 134 msgid "Free comment" 135 msgstr "Freier Kommentar" 136 137 #: contrib/comments/models/comments.py:173 138 msgid "Free comments" 139 msgstr "Freie Kommentare" 140 141 #: contrib/comments/models/comments.py:209 142 msgid "score" 143 msgstr "Bewertung" 144 145 #: contrib/comments/models/comments.py:210 146 msgid "score date" 147 msgstr "Bewertungsdatum" 148 149 #: contrib/comments/models/comments.py:213 150 msgid "Karma score" 151 msgstr "Karma Bewertung" 152 153 #: contrib/comments/models/comments.py:214 154 msgid "Karma scores" 155 msgstr "Karma Bewertungen" 156 157 #: contrib/comments/models/comments.py:223 158 #, python-format 159 msgid "%(score)d rating by %(user)s" 160 msgstr "%(score)d Bewertung von %(user)s" 161 162 #: contrib/comments/models/comments.py:248 163 msgid "flag date" 164 msgstr "Kennzeichnungsdatum" 165 166 #: contrib/comments/models/comments.py:251 167 msgid "User flag" 168 msgstr "Benutzerkennzeichnung" 169 170 #: contrib/comments/models/comments.py:252 171 msgid "User flags" 172 msgstr "Benutzerkennzeichnungen" 173 174 #: contrib/comments/models/comments.py:256 175 #, python-format 176 msgid "Flag by %r" 177 msgstr "Gekennzeichnet von %r" 178 179 #: contrib/comments/models/comments.py:271 180 #, python-format 181 msgid "" 182 "This comment was flagged by %(user)s:\n" 183 "\n" 184 "%(text)s" 185 msgstr "" 186 "Dieser Kommentar ist von %(user)s markiert:\n" 187 "\n" 188 "%(text)s" 189 190 #: contrib/comments/models/comments.py:278 191 msgid "deletion date" 192 msgstr "Löschdatum" 193 194 #: contrib/comments/models/comments.py:281 195 msgid "Moderator deletion" 196 msgstr "Löschung vom Moderator" 197 198 #: contrib/comments/models/comments.py:282 199 msgid "Moderator deletions" 200 msgstr "Löschungen vom Moderator" 201 202 #: contrib/comments/models/comments.py:286 203 #, python-format 204 msgid "Moderator deletion by %r" 205 msgstr "Vom Moderator %r gelöscht" 206 17 207 #: contrib/comments/views/karma.py:18 18 208 msgid "Anonymous users cannot vote" … … 153 343 "versuchen." 154 344 345 #: contrib/admin/views/main.py:50 346 msgid "Site administration" 347 msgstr "Website Verwaltung" 348 155 349 #: contrib/admin/views/main.py:84 156 350 #, python-format … … 163 357 164 358 #: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131 359 #: contrib/admin/views/main.py:186 165 360 msgid "All" 166 361 msgstr "Alle" 362 363 #: contrib/admin/views/main.py:152 364 msgid "Any date" 365 msgstr "Alle Daten" 366 367 #: contrib/admin/views/main.py:153 368 msgid "Today" 369 msgstr "Heute" 370 371 #: contrib/admin/views/main.py:156 372 msgid "Past 7 days" 373 msgstr "Letzte 7 Tage" 374 375 #: contrib/admin/views/main.py:158 376 msgid "This month" 377 msgstr "Diesen Monat" 378 379 #: contrib/admin/views/main.py:160 380 msgid "This year" 381 msgstr "Dieses Jahr" 382 383 #: contrib/admin/views/main.py:186 384 msgid "Yes" 385 msgstr "Ja" 386 387 #: contrib/admin/views/main.py:186 388 msgid "No" 389 msgstr "Nein" 167 390 168 391 #: contrib/admin/views/main.py:194 … … 303 526 msgid "Decimal number" 304 527 msgstr "Dezimalzahl" 305 306 #: contrib/admin/views/doc.py:274307 msgid "IP address"308 msgstr "IP-Adresse"309 528 310 529 #: contrib/admin/views/doc.py:276 django/branches/new-admin/django/contrib/admin/views/main.py
r1235 r1248 48 48 49 49 def index(request): 50 return render_to_response('admin/index', {'title': 'Site administration'}, context_instance=Context(request))50 return render_to_response('admin/index', {'title': _('Site administration')}, context_instance=Context(request)) 51 51 index = staff_member_required(index) 52 52 … … 150 150 151 151 self.links = ( 152 ( 'Any date', {}),153 ( 'Today', {'%s__year' % self.field.name: str(today.year),152 (_('Any date'), {}), 153 (_('Today'), {'%s__year' % self.field.name: str(today.year), 154 154 '%s__month' % self.field.name: str(today.month), 155 155 '%s__day' % self.field.name: str(today.day)}), 156 ( 'Past 7 days', {'%s__gte' % self.field.name: one_week_ago.strftime('%Y-%m-%d'),156 (_('Past 7 days'), {'%s__gte' % self.field.name: one_week_ago.strftime('%Y-%m-%d'), 157 157 '%s__lte' % f.name: today_str}), 158 ( 'This month', {'%s__year' % self.field.name: str(today.year),158 (_('This month'), {'%s__year' % self.field.name: str(today.year), 159 159 '%s__month' % f.name: str(today.month)}), 160 ( 'This year', {'%s__year' % self.field.name: str(today.year)})160 (_('This year'), {'%s__year' % self.field.name: str(today.year)}) 161 161 ) 162 162 … … 184 184 185 185 def choices(self, cl): 186 for k, v in (( 'All', None), ('Yes', '1'), ('No', '0')):186 for k, v in ((_('All'), None), (_('Yes'), '1'), (_('No'), '0')): 187 187 yield { 'selected' : self.lookup_val == v and not self.lookup_val2, 188 188 'query_string' : cl.get_query_string( {self.lookup_kwarg: v}, [self.lookup_kwarg2]), django/branches/new-admin/django/contrib/comments/models/comments.py
r549 r1248 1 1 from django.core import meta 2 2 from django.models import auth, core 3 from django.utils.translation import gettext_lazy as _ 3 4 4 5 class Comment(meta.Model): 5 6 user = meta.ForeignKey(auth.User, raw_id_admin=True) 6 7 content_type = meta.ForeignKey(core.ContentType) 7 object_id = meta.IntegerField( 'object ID')8 headline = meta.CharField( maxlength=255, blank=True)9 comment = meta.TextField( maxlength=3000)10 rating1 = meta.PositiveSmallIntegerField( 'rating #1', blank=True, null=True)11 rating2 = meta.PositiveSmallIntegerField( 'rating #2', blank=True, null=True)12 rating3 = meta.PositiveSmallIntegerField( 'rating #3', blank=True, null=True)13 rating4 = meta.PositiveSmallIntegerField( 'rating #4', blank=True, null=True)14 rating5 = meta.PositiveSmallIntegerField( 'rating #5', blank=True, null=True)15 rating6 = meta.PositiveSmallIntegerField( 'rating #6', blank=True, null=True)16 rating7 = meta.PositiveSmallIntegerField( 'rating #7', blank=True, null=True)17 rating8 = meta.PositiveSmallIntegerField( 'rating #8', blank=True, null=True)8 object_id = meta.IntegerField(_('object ID')) 9 headline = meta.CharField(_('headline'), maxlength=255, blank=True) 10 comment = meta.TextField(_('comment'), maxlength=3000) 11 rating1 = meta.PositiveSmallIntegerField(_('rating #1'), blank=True, null=True) 12 rating2 = meta.PositiveSmallIntegerField(_('rating #2'), blank=True, null=True) 13 rating3 = meta.PositiveSmallIntegerField(_('rating #3'), blank=True, null=True) 14 rating4 = meta.PositiveSmallIntegerField(_('rating #4'), blank=True, null=True) 15 rating5 = meta.PositiveSmallIntegerField(_('rating #5'), blank=True, null=True) 16 rating6 = meta.PositiveSmallIntegerField(_('rating #6'), blank=True, null=True) 17 rating7 = meta.PositiveSmallIntegerField(_('rating #7'), blank=True, null=True) 18 rating8 = meta.PositiveSmallIntegerField(_('rating #8'), blank=True, null=True) 18 19 # This field designates whether to use this row's ratings in aggregate 19 20 # functions (summaries). We need this because people are allowed to post 20 21 # multiple reviews on the same thing, but the system will only use the 21 22 # latest one (with valid_rating=True) in tallying the reviews. 22 valid_rating = meta.BooleanField( 'is valid rating')23 submit_date = meta.DateTimeField( 'date/time submitted', auto_now_add=True)24 is_public = meta.BooleanField( )25 ip_address = meta.IPAddressField( 'IP address', blank=True, null=True)26 is_removed = meta.BooleanField( help_text='Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead.')23 valid_rating = meta.BooleanField(_('is valid rating')) 24 submit_date = meta.DateTimeField(_('date/time submitted'), auto_now_add=True) 25 is_public = meta.BooleanField(_('is public')) 26 ip_address = meta.IPAddressField(_('IP address'), blank=True, null=True) 27 is_removed = meta.BooleanField(_('is removed'), help_text=_('Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead.')) 27 28 site = meta.ForeignKey(core.Site) 28 29 class META: 29 30 db_table = 'comments' 31 verbose_name = _('Comment') 32 verbose_name_plural = _('Comments') 30 33 module_constants = { 31 34 # min. and max. allowed dimensions for photo resizing (in pixels) … … 80 83 return None 81 84 82 get_content_object.short_description = 'Content object'85 get_content_object.short_description = _('Content object') 83 86 84 87 def _fill_karma_cache(self): … … 108 111 109 112 def get_as_text(self): 110 return 'Posted by %s at %s\n\n%s\n\nhttp://%s%s'% \111 (self.get_user().username,self.submit_date,112 self.comment, self.get_site().domain, self.get_absolute_url())113 return _('Posted by %(user)s at %(date)s\n\n%(comment)s\n\nhttp://%(domain)s%(url)s') % \ 114 {'user': self.get_user().username, 'date': self.submit_date, 115 'comment': self.comment, 'domain': self.get_site().domain, 'url': self.get_absolute_url()} 113 116 114 117 def _module_get_security_hash(options, photo_options, rating_options, target): … … 156 159 # A FreeComment is a comment by a non-registered user. 157 160 content_type = meta.ForeignKey(core.ContentType) 158 object_id = meta.IntegerField( 'object ID')159 comment = meta.TextField( maxlength=3000)160 person_name = meta.CharField( "person's name", maxlength=50)161 submit_date = meta.DateTimeField( 'date/time submitted', auto_now_add=True)162 is_public = meta.BooleanField( )163 ip_address = meta.IPAddressField( )161 object_id = meta.IntegerField(_('object ID')) 162 comment = meta.TextField(_('comment'), maxlength=3000) 163 person_name = meta.CharField(_("person's name"), maxlength=50) 164 submit_date = meta.DateTimeField(_('date/time submitted'), auto_now_add=True) 165 is_public = meta.BooleanField(_('is public')) 166 ip_address = meta.IPAddressField(_('ip address')) 164 167 # TODO: Change this to is_removed, like Comment 165 approved = meta.BooleanField( 'approved by staff')168 approved = meta.BooleanField(_('approved by staff')) 166 169 site = meta.ForeignKey(core.Site) 167 170 class META: 168 171 db_table = 'comments_free' 172 verbose_name = _('Free comment') 173 verbose_name_plural = _('Free comments') 169 174 ordering = ('-submit_date',) 170 175 admin = meta.Admin( … … 197 202 return None 198 203 199 get_content_object.short_description = 'Content object'204 get_content_object.short_description = _('Content object') 200 205 201 206 class KarmaScore(meta.Model): 202 207 user = meta.ForeignKey(auth.User) 203 208 comment = meta.ForeignKey(Comment) 204 score = meta.SmallIntegerField( db_index=True)205 scored_date = meta.DateTimeField( auto_now=True)209 score = meta.SmallIntegerField(_('score'), db_index=True) 210 scored_date = meta.DateTimeField(_('score date'), auto_now=True) 206 211 class META: 207 212 module_name = 'karma' 213 verbose_name = _('Karma score') 214 verbose_name_plural = _('Karma scores') 208 215 unique_together = (('user', 'comment'),) 209 216 module_constants = { … … 214 221 215 222 def __repr__(self): 216 return "%d rating by %s" % (self.score, self.get_user())223 return _("%(score)d rating by %(user)s") % {'score': self.score, 'user': self.get_user()} 217 224 218 225 def _module_vote(user_id, comment_id, score): … … 239 246 user = meta.ForeignKey(auth.User) 240 247 comment = meta.ForeignKey(Comment) 241 flag_date = meta.DateTimeField( auto_now_add=True)248 flag_date = meta.DateTimeField(_('flag date'), auto_now_add=True) 242 249 class META: 243 250 db_table = 'comments_user_flags' 251 verbose_name = _('User flag') 252 verbose_name_plural = _('User flags') 244 253 unique_together = (('user', 'comment'),) 245 254 246 255 def __repr__(self): 247 return "Flag by %r"% self.get_user()256 return _("Flag by %r") % self.get_user() 248 257 249 258 def _module_flag(comment, user): … … 260 269 from django.core.mail import mail_managers 261 270 f = UserFlag(None, user.id, comment.id, None) 262 message = 'This comment was flagged by %s:\n\n%s' % (user.username, comment.get_as_text())271 message = _('This comment was flagged by %(user)s:\n\n%(text)s') % {'user': user.username, 'text': comment.get_as_text()} 263 272 mail_managers('Comment flagged', message, fail_silently=True) 264 273 f.save() … … 267 276 user = meta.ForeignKey(auth.User, verbose_name='moderator') 268 277 comment = meta.ForeignKey(Comment) 269 deletion_date = meta.DateTimeField( auto_now_add=True)278 deletion_date = meta.DateTimeField(_('deletion date'), auto_now_add=True) 270 279 class META: 271 280 db_table = 'comments_moderator_deletions' 281 verbose_name = _('Moderator deletion') 282 verbose_name_plural = _('Moderator deletions') 272 283 unique_together = (('user', 'comment'),) 273 284 274 285 def __repr__(self): 275 return "Moderator deletion by %r" % self.get_user() 286 return _("Moderator deletion by %r") % self.get_user() 287
