[MERGE] forward port of branch saas-9 up to 87a01c7

7 files changed, 24 insertions, 23 deletions

diff --git a/addons/link_tracker/i18n/ca.po b/addons/link_tracker/i18n/ca.po
index 240444edfb1..43f95c0f7b0 100644
--- a/addons/link_tracker/i18n/ca.po
+++ b/addons/link_tracker/i18n/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-10-12 18:16+0000\n"
+"PO-Revision-Date: 2016-02-12 21:58+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr ""
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_link_code_ids
 msgid "Codes"
-msgstr ""
+msgstr "Codis"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click_country_id
@@ -127,7 +127,7 @@ msgstr "Enllaç"
 #: model:ir.actions.act_window,name:link_tracker.action_link_tracker
 #: model:ir.ui.menu,name:link_tracker.menu_url_shortener_main
 msgid "Link Tracker"
-msgstr ""
+msgstr "Rastrejador de l'enllaç"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_medium_id
@@ -179,19 +179,19 @@ msgstr ""
 msgid ""
 "This is a name that helps you keep track of your different campaign efforts "
 "Ex: Fall_Drive, Christmas_Special"
-msgstr ""
+msgstr "Aquest nom us permet fer un seguiment de les diferents accions de campanya. Per ex: Tardor2015, Especial_Nadal"
 
 #. module: link_tracker
 #: model:ir.model.fields,help:link_tracker.field_link_tracker_medium_id
 msgid "This is the method of delivery. Ex: Postcard, Email, or Banner Ad"
-msgstr ""
+msgstr "Aquest és el mètode d'enviament. Per exemple: correu, correu electrònic o pancarta"
 
 #. module: link_tracker
 #: model:ir.model.fields,help:link_tracker.field_link_tracker_source_id
 msgid ""
 "This is the source of the link Ex: Search Engine, another domain, or name of"
 " email list"
-msgstr ""
+msgstr "Aquest és l'origen de l'enllaç. Per ex: cercador, un altre domini o el nom d'una llista de correu electrònic"
 
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_filter
diff --git a/addons/link_tracker/i18n/es_EC.po b/addons/link_tracker/i18n/es_EC.po
index e6668c37d3b..455e5cd86af 100644
--- a/addons/link_tracker/i18n/es_EC.po
+++ b/addons/link_tracker/i18n/es_EC.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2016-01-20 12:32+0000\n"
+"PO-Revision-Date: 2016-02-10 17:31+0000\n"
 "Last-Translator: Rick Hunter <rick_hunter_ec@yahoo.com>\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr "Creado por:"
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code_create_date
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_create_date
 msgid "Created on"
-msgstr "Creado"
+msgstr "Creado en"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click_display_name
diff --git a/addons/link_tracker/i18n/eu.po b/addons/link_tracker/i18n/eu.po
index 8903c7c78ab..af2206d8e69 100644
--- a/addons/link_tracker/i18n/eu.po
+++ b/addons/link_tracker/i18n/eu.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-28 20:19+0000\n"
+"PO-Revision-Date: 2016-02-08 18:25+0000\n"
 "Last-Translator: Oihane Crucelaegui <oihanecruce@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/odoo/odoo-9/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr ""
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_link_code_ids
 msgid "Codes"
-msgstr ""
+msgstr "Kodeak"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click_country_id
@@ -67,7 +67,7 @@ msgstr "Created on"
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code_display_name
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Izena erakutsi"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_favicon
diff --git a/addons/link_tracker/i18n/ta.po b/addons/link_tracker/i18n/ta.po
index 2ed906cdc34..04bebcdddb0 100644
--- a/addons/link_tracker/i18n/ta.po
+++ b/addons/link_tracker/i18n/ta.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2016-02-05 09:53+0000\n"
+"PO-Revision-Date: 2016-02-11 13:00+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Tamil (http://www.transifex.com/odoo/odoo-9/language/ta/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_campaign_id
 msgid "Campaign"
-msgstr ""
+msgstr "பிரச்சாரம்"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_link_click_ids
@@ -127,12 +127,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:link_tracker.action_link_tracker
 #: model:ir.ui.menu,name:link_tracker.menu_url_shortener_main
 msgid "Link Tracker"
-msgstr ""
+msgstr "இணைப்பு தட"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_medium_id
 msgid "Medium"
-msgstr ""
+msgstr "நடுத்தரம்"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_count
@@ -162,7 +162,7 @@ msgstr ""
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_source_id
 msgid "Source"
-msgstr ""
+msgstr "ஆதாரம்"
 
 #. module: link_tracker
 #: model:ir.actions.act_window,name:link_tracker.action_view_click_statistics
diff --git a/addons/link_tracker/i18n/uk.po b/addons/link_tracker/i18n/uk.po
index b80c7afe757..8ffb48b61f5 100644
--- a/addons/link_tracker/i18n/uk.po
+++ b/addons/link_tracker/i18n/uk.po
@@ -3,12 +3,13 @@
 # * link_tracker
 # 
 # Translators:
+# Bogdan, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-11-26 10:37+0000\n"
+"PO-Revision-Date: 2016-02-13 17:00+0000\n"
 "Last-Translator: Bogdan\n"
 "Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -132,7 +133,7 @@ msgstr ""
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_medium_id
 msgid "Medium"
-msgstr "Середній"
+msgstr "Засіб розповсюдження"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_count
diff --git a/addons/link_tracker/i18n/zh_TW.po b/addons/link_tracker/i18n/zh_TW.po
index acc69f6357c..705da1b9429 100644
--- a/addons/link_tracker/i18n/zh_TW.po
+++ b/addons/link_tracker/i18n/zh_TW.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-08 05:49+0000\n"
+"PO-Revision-Date: 2016-02-10 09:29+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/odoo/odoo-9/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr "建立於"
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code_display_name
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_display_name
 msgid "Display Name"
-msgstr ""
+msgstr "顯示名稱"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_favicon
@@ -101,7 +101,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click___last_update
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code___last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "最後修改:"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click_write_uid
diff --git a/addons/link_tracker/models/link_tracker.py b/addons/link_tracker/models/link_tracker.py
index ad71b56286e..f387a7e6e7f 100644
--- a/addons/link_tracker/models/link_tracker.py
+++ b/addons/link_tracker/models/link_tracker.py
@@ -5,10 +5,10 @@ import re
 import string
 
 from lxml.html import parse
-from urllib import urlencode
 from urllib2 import urlopen
 from urlparse import urljoin
 from urlparse import urlparse
+from werkzeug import url_encode
 
 from openerp import models, fields, api, _
 
@@ -101,7 +101,7 @@ class link_tracker(models.Model):
             if attr:
                 utms[key] = attr
 
-        self.redirected_url = '%s://%s%s?%s&%s#%s' % (parsed.scheme, parsed.netloc, parsed.path, urlencode(utms), parsed.query, parsed.fragment)
+        self.redirected_url = '%s://%s%s?%s&%s#%s' % (parsed.scheme, parsed.netloc, parsed.path, url_encode(utms), parsed.query, parsed.fragment)
 
     @api.model
     @api.depends('url')