Merge branch 'master' into rescatter-squashed

Author: etpinard

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,15 @@
 Thanks for your interest in plotly.js!
 
+### Translations:
+
+- Make a PR directly to the main repository
+- Label it `type: translation`
+- Please @ mention a few other speakers of this language who can help review your translations.
+- If you've omitted any keys from [dist/translation_keys.txt](https://github.com/plotly/plotly.js/blob/master/dist/translation-keys.txt) - which means they will fall back on the US English text - just make a short comment about why in the PR description: the English text works fine in your language, or you would like someone else to help translating those, or whatever the reason.
+- You should only update files in `lib/locales/`, not those in `dist/`
+
+### Features, Bug fixes, and others:
+
 Developers are strongly encouraged to first make a PR to their own plotly.js fork and ask one of the maintainers to review the modifications there. Once the pull request is deemed satisfactory, the developer will be asked to make a pull request to the main plotly.js repo and may be asked to squash some commits before doing so.
 
 Before opening a pull request, developer should: 

CONTRIBUTING.md

@@ -17,6 +17,7 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
 | `type: bug` | bug report confirmed by a plotly team member |
 | `type: regression` | bug that introduced a change in behavior from one version to the next |
 | `type: feature` | planned feature additions |
+| `type: translation` | localization-related tasks |
 | `type: performance` | performance related tasks |
 | `type: maintenance` | source code cleanup resulting in no enhancement for users |
 | `type: documentation` | API doc or attribute description improvements |

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Plotly, Inc
+Copyright (c) 2018 Plotly, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -187,7 +187,7 @@ plotly.js charts can also be created and saved online for free at [plot.ly/creat
 
 ## Copyright and license
 
-Code and documentation copyright 2017 Plotly, Inc.
+Code and documentation copyright 2018 Plotly, Inc.
 
 Code released under the [MIT license](https://github.com/plotly/plotly.js/blob/master/LICENSE).
 

build/plotcss.js

@@ -50,7 +50,7 @@ var rules = {
     "X .select-outline-2": "stroke:black;stroke-dasharray:2px 2px;",
     Y: "font-family:'Open Sans';position:fixed;top:50px;right:20px;z-index:10000;font-size:10pt;max-width:180px;",
     "Y p": "margin:0;",
-    "Y .notifier-note": "min-width:180px;max-width:250px;border:1px solid #fff;z-index:3000;margin:0;background-color:#8c97af;background-color:rgba(140,151,175,0.9);color:#fff;padding:10px;",
+    "Y .notifier-note": "min-width:180px;max-width:250px;border:1px solid #fff;z-index:3000;margin:0;background-color:#8c97af;background-color:rgba(140,151,175,0.9);color:#fff;padding:10px;overflow-wrap:break-word;word-wrap:break-word;-ms-hyphens:auto;-webkit-hyphens:auto;hyphens:auto;",
     "Y .notifier-close": "color:#fff;opacity:0.8;float:right;padding:0 5px;background:none;border:none;font-size:20px;font-weight:bold;line-height:20px;",
     "Y .notifier-close:hover": "color:#444;text-decoration:none;cursor:pointer;"
 };

dist/README.md

@@ -14,22 +14,46 @@ or the un-minified version as:
 <script type="text/javascript" src="plotly.js" charset="utf-8"></script>
 ```
 
-To support IE9, put:
+### To support IE9
+
+*Before* the plotly.js script tag, add:
 
 ```html
 <script>if(typeof window.Int16Array !== 'function')document.write("<scri"+"pt src='extras/typedarray.min.js'></scr"+"ipt>");</script>
 <script>document.write("<scri"+"pt src='extras/request_animation_frame.js'></scr"+"ipt>");</script>
 ```
 
-before the plotly.js script tag.
+### To support MathJax
 
-To add MathJax, put
+*Before* the plotly.js script tag, add:
 
 ```html
 <script type="text/javascript" src="mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
 ```
 
-before the plotly.js script tag. You can grab the relevant MathJax files in `./dist/extras/mathjax/`.
+You can grab the relevant MathJax files in `./dist/extras/mathjax/`.
+
+### To include localization
+
+Plotly.js defaults to US English (en-US) and includes British English (en) in the standard bundle.
+Many other localizations are available - here is an example using Swiss-German (de-CH),
+see the contents of this directory for the full list.
+They are also available on our CDN as https://cdn.plot.ly/plotly-locale-de-ch-latest.js OR https://cdn.plot.ly/plotly-locale-de-ch-1.31.2.js
+Note that the file names are all lowercase, even though the region is uppercase when you apply a locale.
+
+*After* the plotly.js script tag, add:
+
+```html
+<script type="text/javascript" src="plotly-locale-de-ch.js"></script>
+<script type="text/javascript">Plotly.setPlotConfig({locale: 'de-CH'})</script>
+```
+
+The first line loads and registers the locale definition with plotly.js, the second sets it as the default for all Plotly plots.
+You can also include multiple locale definitions and apply them to each plot separately as a `config` parameter:
+
+```js
+Plotly.newPlot(graphDiv, data, layout, {locale: 'de-CH'})
+```
 
 # Bundle information
 
@@ -84,7 +108,7 @@ The `basic` partial bundle contains the `scatter`, `bar` and `pie` trace modules
 
 ### plotly.js cartesian
 
-The `cartesian` partial bundle contains the `scatter`, `bar`, `box`, `heatmap`, `histogram`, `histogram2d`, `histogram2dcontour`, `pie`, `contour` and `scatterternary` trace modules.
+The `cartesian` partial bundle contains the `scatter`, `bar`, `box`, `heatmap`, `histogram`, `histogram2d`, `histogram2dcontour`, `pie`, `contour`, `scatterternary` and `violin` trace modules.
 
 | Way to import | Location |
 |---------------|----------|