diff options
| author | Olivier Dony <odo@openerp.com> | 2012-12-11 18:01:19 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-12-11 18:01:19 +0100 |
| commit | 5b56a77add9a4f92b5cf2f84d419caff9b0dc4e6 (patch) | |
| tree | e1f7f576fa8944d2d72e64876e7c42327e5d8879 /addons/document_webdav | |
| parent | f5fd0fc0815190b3e80854a8ad0afa7a5d1271c4 (diff) | |
| parent | 33ae7185620cec8e621f7cec592db82c6b9e12fe (diff) | |
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121211170119-5spf2iqzl89kphnk
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/__init__.py | 12 | ||||
| -rw-r--r-- | addons/document_webdav/i18n/pt_BR.po | 13 | ||||
| -rw-r--r-- | addons/document_webdav/webdav.py | 10 |
3 files changed, 18 insertions, 17 deletions
diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py index 7cd1a38fc80..11bbd35f7c3 100644 --- a/addons/document_webdav/__init__.py +++ b/addons/document_webdav/__init__.py @@ -18,11 +18,15 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## +import logging -import webdav -import webdav_server +_logger = logging.getLogger(__name__) -import document_webdav +try: + import webdav + import webdav_server + import document_webdav +except ImportError: + _logger.info('document_webdav disabled please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/') -#eof # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po index 6f27346ae37..87c03949e3a 100644 --- a/addons/document_webdav/i18n/pt_BR.po +++ b/addons/document_webdav/i18n/pt_BR.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-07-28 18:55+0000\n" -"Last-Translator: Fábio Martinelli - http://zupy.com.br " -"<webmaster@guaru.net>\n" +"PO-Revision-Date: 2012-12-10 18:01+0000\n" +"Last-Translator: Projetaty Soluções OpenSource <Unknown>\n" "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n" +"X-Generator: Launchpad (build 16356)\n" #. module: document_webdav #: field:document.webdav.dir.property,create_date:0 @@ -32,7 +31,7 @@ msgstr "Documentos" #. module: document_webdav #: view:document.webdav.dir.property:0 msgid "Document property" -msgstr "" +msgstr "Propriedade do Documento" #. module: document_webdav #: view:document.webdav.dir.property:0 @@ -169,7 +168,7 @@ msgstr "Criador" #. module: document_webdav #: view:document.webdav.file.property:0 msgid "Document Property" -msgstr "" +msgstr "Propriedade do Documento" #. module: document_webdav #: model:ir.ui.menu,name:document_webdav.menu_properties diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py index f714ff51518..bf8b843a0a0 100644 --- a/addons/document_webdav/webdav.py +++ b/addons/document_webdav/webdav.py @@ -29,12 +29,10 @@ import urllib from osv import osv from tools.translate import _ -try: - from DAV import utils - from DAV.propfind import PROPFIND - from DAV.report import REPORT -except ImportError: - raise osv.except_osv(_('PyWebDAV Import Error!'), _('Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')) +from DAV import utils +from DAV.propfind import PROPFIND +from DAV.report import REPORT + import tools |