~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/error_ui.py

  • Committer: Martin Albisetti
  • Date: 2008-10-25 19:26:49 UTC
  • mfrom: (232 trunk)
  • mto: This revision was merged to the branch mainline in revision 233.
  • Revision ID: martin.albisetti@canonical.com-20081025192649-7r5g6vyyqh2p748t
Merge from trunk, resolved conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
from loggerhead.controllers import TemplatedBranchView
23
23
from loggerhead import util
24
24
 
 
25
 
25
26
class ErrorUI(TemplatedBranchView):
26
27
 
27
28
    template_path = 'loggerhead.templates.error'
41
42
                'changes'))
42
43
        return {
43
44
            'branch': self._branch,
44
 
            'error_title': 'An unexpected error occurred while proccesing the request:',
 
45
            'error_title': ('An unexpected error occurred while'
 
46
                            'proccesing the request:'),
45
47
            'error_description': description.getvalue(),
46
48
            'directory_breadcrumbs': directory_breadcrumbs,
47
49
        }