Changeset 2494

Show
Ignore:
Timestamp:
01/19/10 13:06:45 (8 weeks ago)
Author:
JensDiemer
Message:
  • change all string operations, if more than one placeholder (Needed for 'django-admin.py makemessages')
  • correct some "# coding:utf - 8" -> "# coding: utf-8" :(
Location:
branches/0.9/pylucid_project
Files:
10 modified

Legend:

Unmodified
Added
Removed

  • branches/0.9/pylucid_project/apps/pylucid/models/log.py

    r2434 r2494  
    6969 
    7070        if last_actions >= ban_limit: 
    71             msg = _("Add ban entry, because %s request for %s in the last %ssec.") % ( 
    72                 last_actions, app_label, min_pause 
    73             ) 
     71            msg = _( 
     72                "Add ban entry, because %(last_actions)s request for %(app_label)s" 
     73                " in the last %(min_pause)ssec." 
     74            ) % { 
     75                "last_actions": last_actions, 
     76                "app_label": app_label, 
     77                "min_pause": min_pause, 
     78            } 
    7479            self.log_action(app_label=app_label, action="ban ip", message=msg) 
     80 
    7581            from pylucid.models import BanEntry 
    7682            BanEntry.objects.add(request) # raise 404 after adding the client IP! 

  • branches/0.9/pylucid_project/apps/pylucid/system/auth_backends.py

    r2467 r2494  
    9696                return 
    9797        except User.DoesNotExist, err: 
    98             msg = _("User %s doesn't exist: %s") % (username, err) 
     98            msg = _("User %(username)s doesn't exist: %(err)s") % {"username": username, "err":err} 
    9999            LogEntry.objects.log_action( 
    100100                app_label="pylucid", action="auth_backends", message=msg, 

  • branches/0.9/pylucid_project/pylucid_plugins/auth/views.py

    r2449 r2494  
    120120        except UserProfile.DoesNotExist, err: 
    121121            # User profile doesn't generally not exist for this user. e.g. Update from v0.8.x ? 
    122             msg = _("There exist no UserProfile for user %r: %s") % (user, err) 
     122            msg = _("There exist no UserProfile for user %(user)r: %(err)s") % {"user":user, "err":err} 
    123123        else: 
    124124            # A UserProfile exist -> User can't access *this* site. 
    125             msg = _("User %r can't access this site: %r") % (user, Site.objects.get_current()) 
     125            site = Site.objects.get_current() 
     126            msg = _("User %(user)r can't access this site: %(site)r") % {"user":user, "site": site} 
    126127 
    127128        LogEntry.objects.log_action( 

  • branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views

    • Property svn:ignore set to
      *.pyc
      *.log
      *.db3
      PyLucid.egg-info

  • branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views/bulk_editor.py

    r2475 r2494  
    1 # coding:utf - 8 
     1# coding: utf-8 
    22 
    33from django import http 
    … …  
    6161                            id_list = ", ".join([repr(item.pk) for item in instances]) 
    6262 
    63                         request.page_msg(_("%s items saved (IDs: %s)") % (len(instances), id_list)) 
     63                        request.page_msg(_("%(count)s items saved (IDs: %(ids)s)") % { 
     64                            "count": len(instances), "ids": id_list 
     65                        }) 
    6466                        if settings.DEBUG: 
    6567                            request.page_msg("Debug saved items:") 

  • branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views/convert_markup.py

    r2477 r2494  
    44    Convert PageContent markup. 
    55""" 
    6  
    7 # coding:utf - 8 
    86 
    97from django import http 

  • branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views/edit_page.py

    r2475 r2494  
    1 # coding:utf - 8 
     1# coding:utf-8 
    22 
    33from django import http 

  • branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views/new_plugin_page.py

    r2475 r2494  
    1 # coding:utf - 8 
     1# coding:utf-8 
    22 
    33from django import http 

  • branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views/tag_list.py

    r2475 r2494  
    1 # coding:utf - 8 
     1# coding:utf-8 
    22 
    33""" 
    … …  
    5656                    if not example.startswith("{%% lucidTag %s " % plugin_name): 
    5757                        request.page_msg( 
    58                             _("Info: lucidTag %s has wrong tag example: %r") % (plugin_name, example) 
     58                            _("Info: lucidTag %(plugin_name)s has wrong tag example: %(example)r") % { 
     59                                "plugin_name": plugin_name, "example": example 
     60                            } 
    5961                        ) 
    6062 

  • branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views/translate_page.py

    r2475 r2494  
    1 # coding:utf - 8 
     1# coding:utf-8 
    22 
    33""" 
    … …  
    4949                }) 
    5050        context.update({ 
    51             "title": _("Translate page '%s' (%s) - Select destination language") % ( 
    52                 source_pagemeta.name, source_pagemeta.language.description 
    53             ), 
     51            "title": _("Translate page '%(name)s' (%(desc_lang)s) - Select destination language") % { 
     52                "name": source_pagemeta.name, 
     53                "desc_lang": source_pagemeta.language.description 
     54            }, 
    5455            "template_name": "page_admin/select_translate_language.html", 
    5556            "form": form, 
    … …  
    101102 
    102103    context.update({ 
    103         "title": _("Translate page '%s' (%s) into %s.") % ( 
    104             source_pagemeta.name, source_pagemeta.language.description, dest_language.description 
    105         ), 
     104        "title": _("Translate page '%(name)s' (%(source_lang)s) into %(dest_lang)s.") % { 
     105            "name": source_pagemeta.name, 
     106            "source_lang": source_pagemeta.language.description, 
     107            "dest_lang": dest_language.description, 
     108        }, 
    106109        "template_name": "page_admin/translate_page.html", 
    107110    })