From 4178e4c943516b80aefdc8aeea1b9280c9f7eaa2 Mon Sep 17 00:00:00 2001
From: jos <wjosdejong@gmail.com>
Date: Thu, 11 Jun 2015 10:34:59 +0200
Subject: [PATCH] Fixed #950: option `locales` broken in `Timeline`, `Graph2d`,
 and `Network`

---
 HISTORY.md                      | 4 ++++
 lib/network/options.js          | 5 +----
 lib/timeline/optionsGraph2d.js  | 5 +----
 lib/timeline/optionsTimeline.js | 5 +----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 8fe44976..d5a8d8cf 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -4,6 +4,10 @@ http://visjs.org
 
 ## NOT YET RELEASED, verions 4.2.1--SNAPSHOT
 
+### General
+
+- Fixed #950: option `locales` broken in `Timeline`, `Graph2d`, and `Network`.
+
 ### Graph2d
 
 - Fixed #942: bug when data is empty.
diff --git a/lib/network/options.js b/lib/network/options.js
index 0af3c1e1..c2bbd57e 100644
--- a/lib/network/options.js
+++ b/lib/network/options.js
@@ -268,10 +268,7 @@ let allOptions = {
   autoResize: {boolean},
   clickToUse: {boolean},
   locale:{string},
-  locales:{
-    __any__: {object},
-    __type__: {object}
-  },
+  locales:{object},
   height: {string},
   width: {string},
   __type__: {object}
diff --git a/lib/timeline/optionsGraph2d.js b/lib/timeline/optionsGraph2d.js
index 28ecec72..1e0a7bd1 100644
--- a/lib/timeline/optionsGraph2d.js
+++ b/lib/timeline/optionsGraph2d.js
@@ -127,10 +127,7 @@ let allOptions = {
   height: {string, number},
   hiddenDates: {object, array},
   locale:{string},
-  locales:{
-    __any__: {object},
-    __type__: {object}
-  },
+  locales:{object},
   max: {date, number, string, moment},
   maxHeight: {number, string},
   min: {date, number, string, moment},
diff --git a/lib/timeline/optionsTimeline.js b/lib/timeline/optionsTimeline.js
index 7082e8a5..66bc1fb3 100644
--- a/lib/timeline/optionsTimeline.js
+++ b/lib/timeline/optionsTimeline.js
@@ -66,10 +66,7 @@ let allOptions = {
   height: {string, number},
   hiddenDates: {object, array},
   locale:{string},
-  locales:{
-    __any__: {object},
-    __type__: {object}
-  },
+  locales:{object},
   margin: {
     axis: {number},
     item: {