texttemplate: use d3locale in GL traces, fix style

Author: antoinerg

Diff for: src/lib/index.js

@@ -1067,7 +1067,7 @@ function templateFormatString(string, labels, d3locale) {
 
         if(format) {
             var fmt;
-            if(d3locale && d3locale.numberFormat) {
+            if(d3locale) {
                 fmt = d3locale.numberFormat;
             } else {
                 fmt = d3.format;

Diff for: src/traces/scatter/attributes.js

@@ -168,7 +168,7 @@ module.exports = {
         ].join(' ')
     },
 
-    texttemplate: texttemplateAttrs({arrayOk: true}, {
+    texttemplate: texttemplateAttrs({}, {
 
     }),
     hovertext: {

Diff for: src/traces/scatter3d/attributes.js

@@ -86,7 +86,7 @@ var attrs = module.exports = overrideAll({
             'these elements will be seen in the hover labels.'
         ].join(' ')
     }),
-    texttemplate: texttemplateAttrs({arrayOk: true}, {
+    texttemplate: texttemplateAttrs({}, {
 
     }),
     hovertext: extendFlat({}, scatterAttrs.hovertext, {

Diff for: src/traces/scatter3d/convert.js

@@ -243,21 +243,22 @@ function convertPlotlyOptions(scene, data) {
 
     // check texttemplate
     if(data.texttemplate) {
+        var d3locale = scene.fullLayout._d3locale;
         if(Array.isArray(data.texttemplate)) {
             text = new Array(data.texttemplate.length);
             for(i = 0; i < data.texttemplate.length; i++) {
                 var pt = {};
                 pt.text = text[i];
                 appendArrayPointValue(pt, data, i);
-                text[i] = Lib.texttemplateString(data.texttemplate[i], pt, function() {}, pt);
+                text[i] = Lib.texttemplateString(data.texttemplate[i], pt, d3locale, pt);
             }
         } else {
             text = new Array(len);
             for(i = 0; i < len; i++) {
                 var pt1 = {};
                 pt1.text = text[i];
                 appendArrayPointValue(pt1, data, i);
-                text[i] = Lib.texttemplateString(data.texttemplate, pt1, function() {}, pt1);
+                text[i] = Lib.texttemplateString(data.texttemplate, pt1, d3locale, pt1);
             }
         }
     }

Diff for: src/traces/scattergl/convert.js

@@ -49,7 +49,7 @@ function convertStyle(gd, trace) {
     if(trace.visible !== true) return opts;
 
     if(subTypes.hasText(trace)) {
-        opts.text = convertTextStyle(trace);
+        opts.text = convertTextStyle(trace, gd);
         opts.textSel = convertTextSelection(trace, trace.selected);
         opts.textUnsel = convertTextSelection(trace, trace.unselected);
     }
@@ -102,7 +102,7 @@ function convertStyle(gd, trace) {
     return opts;
 }
 
-function convertTextStyle(trace) {
+function convertTextStyle(trace, gd) {
     var count = trace._length;
     var textfontIn = trace.textfont;
     var textpositionIn = trace.textposition;
@@ -115,19 +115,20 @@ function convertTextStyle(trace) {
 
     var texttemplate = trace.texttemplate;
     if(texttemplate) {
+        var d3locale = gd._fullLayout._d3locale;
         optsOut.text = [];
         var pt;
         if(Array.isArray(texttemplate)) {
             for(i = 0; i < texttemplate.length; i++) {
                 pt = {};
                 appendArrayPointValue(pt, trace, i);
-                optsOut.text.push(Lib.texttemplateString(texttemplate[i], pt, function() {}, pt));
+                optsOut.text.push(Lib.texttemplateString(texttemplate[i], pt, d3locale, pt));
             }
         } else {
             for(i = 0; i < count; i++) {
                 pt = {};
                 appendArrayPointValue(pt, trace, i);
-                optsOut.text.push(Lib.texttemplateString(texttemplate, pt, function() {}, pt));
+                optsOut.text.push(Lib.texttemplateString(texttemplate, pt, d3locale, pt));
             }
         }
     } else {