Merge pull request GoogleWebComponents#117 from r2fresh/language-attribute-add

ebidel · ebidel · commit dde973b51fd9 · 2015-03-19T10:00:16.000-07:00
google-map-directions and google-map add language attribute("language")
diff --git a/demo.html b/demo.html
@@ -17,14 +17,15 @@
 </head>
 <body fullbleed unresolved>
 
-<google-map latitude="37.779" longitude="-122.3892" minZoom="9" maxZoom="11" fit>
+<google-map latitude="37.779" longitude="-122.3892" minZoom="9" maxZoom="11" language="en" fit>
   <google-map-marker latitude="37.779" longitude="-122.3892"
                      title="Go Giants!" draggable="true">
     <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/4/49/San_Francisco_Giants_Cap_Insignia.svg/200px-San_Francisco_Giants_Cap_Insignia.svg.png" />
   </google-map-marker>
 </google-map>
 
-<google-map-directions startAddress="San Francisco" endAddress="Mountain View"></google-map-directions>
+<google-map-directions startAddress="San Francisco" endAddress="Mountain View" language=
+"en"></google-map-directions>
 
 <button id="controlsToggle" onclick="toggleControls()">Toggle controls</button>
 
diff --git a/google-map-directions.html b/google-map-directions.html
@@ -34,14 +34,14 @@
   @param {object} detail.response The directions service response.
 -->
 
-<polymer-element name="google-map-directions" attributes="map startAddress endAddress travelMode response libraries">
+<polymer-element name="google-map-directions" attributes="map startAddress endAddress travelMode response libraries language">
   <template>
     <style>
       :host {
         display: none;
       }
     </style>
-    <google-maps-api on-api-load="{{mapApiLoaded}}" libraries="{{libraries}}"></google-maps-api>
+    <google-maps-api on-api-load="{{mapApiLoaded}}" libraries="{{libraries}}" language="{{language}}"></google-maps-api>
   </template>
   <script>
     Polymer({
@@ -97,6 +97,19 @@
        */
       libraries: "places",
 
+      /**
+       * The localized language to load the Maps API with. For more information
+       * see https://developers.google.com/maps/documentation/javascript/basics#Language
+       *
+       * Note: the Maps API defaults to the preffered language setting of the browser.
+       * Use this parameter to override that behavior. 
+       *
+       * @attribute language
+       * @type string
+       * @default null
+       */
+      language: null,
+
       /**
        * The response from the directions service.
        *
diff --git a/google-map.html b/google-map.html
@@ -491,7 +491,7 @@
 - Handle removals and support .innerHTML = ''.
 - Use <google-maps-api>.api instead of google.maps namespace.
 -->
-<polymer-element name="google-map" attributes="apiKey clientId latitude longitude zoom noAutoTilt showCenterMarker version map mapType disableDefaultUI fitToMarkers zoomable styles maxZoom minZoom libraries signedIn clickEvents dragEvents mouseEvents">
+<polymer-element name="google-map" attributes="apiKey clientId latitude longitude zoom noAutoTilt showCenterMarker version map mapType disableDefaultUI fitToMarkers zoomable styles maxZoom minZoom libraries signedIn clickEvents dragEvents mouseEvents language">
 <template>
 
   <style>
@@ -512,7 +512,7 @@
 
   </style>
 
-  <google-maps-api apiKey="{{apiKey}}" clientId="{{clientId}}" version="{{version}}" on-api-load="{{mapApiLoaded}}" libraries="{{libraries}}" signedIn="{{signedIn}}"></google-maps-api>
+  <google-maps-api apiKey="{{apiKey}}" clientId="{{clientId}}" version="{{version}}" on-api-load="{{mapApiLoaded}}" libraries="{{libraries}}" signedIn="{{signedIn}}" language="{{language}}"></google-maps-api>
 
   <div id="map"></div>
 
@@ -679,6 +679,19 @@
      */
     signedIn: false,
 
+    /**
+     * The localized language to load the Maps API with. For more information
+     * see https://developers.google.com/maps/documentation/javascript/basics#Language
+     *
+     * Note: the Maps API defaults to the preffered language setting of the browser.
+     * Use this parameter to override that behavior. 
+     *
+     * @attribute language
+     * @type string
+     * @default null
+     */
+    language: null,
+
     /**
      * When true, map *click events are automatically registered.
      *
