Changeset 731:ecb0716ced56 in hatta-dev

Timestamp:

01/22/10 15:56:31 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

localize forbidden pages

File:

• hatta.py (modified) (8 diffs)

hatta.py

@@ -411 +411 @@
         file_path = self._file_path(title)
         if os.path.islink(file_path):
-            raise werkzeug.exceptions.Forbidden(u"Can't edit symbolic links")
+            raise werkzeug.exceptions.Forbidden(_(u"Can't edit symbolic links"))
         mercurial.util.rename(file_name, file_path)
         changectx = self._changectx()
@@ -482 +482 @@
         file_path = self._file_path(title)
         if os.path.islink(file_path):
-            raise werkzeug.exceptions.Forbidden(u"Can't edit symbolic links")
+            raise werkzeug.exceptions.Forbidden(_(u"Can't edit symbolic links"))
         try:
             os.unlink(file_path)
@@ -495 +495 @@
         file_path = self._file_path(title)
         if os.path.islink(file_path):
-            raise werkzeug.exceptions.Forbidden(u"Can't read symbolic links")
+            raise werkzeug.exceptions.Forbidden(_(u"Can't read symbolic links"))
         try:
             return open(file_path, "rb")
@@ -1912 +1912 @@
             rev = -1
         except werkzeug.exceptions.Forbidden:
-            yield werkzeug.html.p(werkzeug.html(_(u"Can't edit a symbolic link.")))
+            yield werkzeug.html.p(
+                werkzeug.html(_(u"Can't edit symbolic links")))
             return
         if preview:
@@ -2573 +2574 @@
         ]
         if self.read_only:
-            raise werkzeug.exceptions.Forbidden(_("This site is read-only."))
+            raise werkzeug.exceptions.Forbidden(_(u"This site is read-only."))
         if title in restricted_pages:
-            raise werkzeug.exceptions.Forbidden(_("""Can't edit this page.
+            raise werkzeug.exceptions.Forbidden(_(u"""Can't edit this page.
 It can only be edited by the site admin directly on the disk."""))
         if title in self.index.page_links(self.locked_page):
-            raise werkzeug.exceptions.Forbidden(_("This page is locked."))
+            raise werkzeug.exceptions.Forbidden(_(u"This page is locked."))
 
     def save(self, request, title):
@@ -2609 +2610 @@
                     for link, label in page.extract_links(text):
                         if title == link:
-                            raise werkzeug.exceptions.Forbidden()
+                            raise werkzeug.exceptions.Forbidden(
+                                _(u"This page is locked."))
                 if u'href="' in comment or u'http:' in comment:
                     raise werkzeug.exceptions.Forbidden()
@@ -3175 +3177 @@
 
         if not self.config.get_bool('hgweb', False):
-            raise werkzeug.exceptions.Forbidden('Repository access disabled.')
+            raise werkzeug.exceptions.Forbidden(
+                _(u'Repository access disabled.'))
         app = mercurial.hgweb.request.wsgiapplication(
             lambda: mercurial.hgweb.hgweb(self.storage.repo, self.site_name))
@@ -3191 +3194 @@
 
         if not request.remote_addr.startswith('127.'):
-            raise werkzeug.exceptions.Forbidden()
+            raise werkzeug.exceptions.Forbidden(
+                _(u'This URL can only be called locally.'))
         def agony():
             yield u'Oh dear!'