From 2fda62ebd8707f872781da85a223ca7817b43575 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 26 Aug 2016 15:04:17 +0200
Subject: [FIX] website, website_{*}: Google Maps API Key

Partial backport of c82b65c8552a2ddccb9ac9990366c03199ff9d29

opw-686510
---
 addons/website_google_map/controllers/main.py  | 4 +++-
 addons/website_google_map/views/google_map.xml | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'addons/website_google_map')

diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index 991d9f87e6c..68a3f2b59f4 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -63,9 +63,11 @@ class google_map(http.Controller):
         else:
             partner_url = '/partners/'
 
+        google_maps_api_key = request.env['ir.config_parameter'].sudo().get_param('google_maps_api_key')
         # generate the map
         values = {
             'partner_url': partner_url,
-            'partner_data': json.dumps(partner_data)
+            'partner_data': json.dumps(partner_data),
+            'google_maps_api_key': google_maps_api_key,
         }
         return request.website.render("website_google_map.google_map", values)
diff --git a/addons/website_google_map/views/google_map.xml b/addons/website_google_map/views/google_map.xml
index e68b9f9e7c1..8cb7d398cab 100644
--- a/addons/website_google_map/views/google_map.xml
+++ b/addons/website_google_map/views/google_map.xml
@@ -15,7 +15,12 @@
             var odoo_partner_data = <t t-raw="partner_data"/>;
         </script>
         <div id="odoo-google-map"></div>
-        <script src="//maps.google.com/maps/api/js?sensor=false"></script>
+        <t t-if="google_maps_api_key">
+            <script t-attf-src="//maps.google.com/maps/api/js?key=#{google_maps_api_key}"></script>
+        </t>
+        <t t-if="not google_maps_api_key">
+            <script src="//maps.google.com/maps/api/js"></script>
+        </t>
         <script type="text/javascript" src="/website_google_map/static/src/js/markerclusterer_compiled.js"></script>
         <script type="text/javascript" src="/website_google_map/static/src/js/google_map.js"></script>
     </body>
-- 
cgit v1.2.3


From 9bbdec5dc954467f240e90e2cdc3e2986b4e51c6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Mon, 29 Aug 2016 15:35:58 +0200
Subject: [FIX] update saas-10 translations by merging 9.0 and master

using the --uses-first parameter on msgmerge this time
---
 addons/website_google_map/i18n/bg.po | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'addons/website_google_map')

diff --git a/addons/website_google_map/i18n/bg.po b/addons/website_google_map/i18n/bg.po
index bdc1f8d493d..77e657a0139 100644
--- a/addons/website_google_map/i18n/bg.po
+++ b/addons/website_google_map/i18n/bg.po
@@ -1,33 +1,22 @@
-# #-#-#-#-#  bg.po (Odoo 9.0)  #-#-#-#-#
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * website_google_map
 #
 # Translators:
 # Kaloyan Naumov <kaloyan@lumnus.net>, 2016
-# #-#-#-#-#  bg.po (Odoo 9.0)  #-#-#-#-#
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * website_google_map
-#
-# Translators:
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2015-09-08 10:28+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"POT-Creation-Date: 2016-08-29 12:00+0000\n"
+"PO-Revision-Date: 2016-07-26 13:08+0000\n"
+"Last-Translator: Kaloyan Naumov <kaloyan@lumnus.net>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/odoo/odoo-9/language/"
 "bg/)\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"#-#-#-#-#  bg.po (Odoo 9.0)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"#-#-#-#-#  bg.po (Odoo 9.0)  #-#-#-#-#\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_google_map
-- 
cgit v1.2.3