diff options
| author | Oğuzhan Demir <[email protected]> | 2015-05-12 00:31:10 +0300 |
|---|---|---|
| committer | Oğuzhan Demir <[email protected]> | 2015-05-12 00:31:10 +0300 |
| commit | 7f38111a9f5d12d4d755c6ddc64b6ae00d529ddc (patch) | |
| tree | d6669f271eca4f5cb407b79290ffca2ac1eb25b6 /lib | |
| parent | 42c4019d2196c521c58f499823d3e9a550d30e9d (diff) | |
| parent | a6c857f5b442d20182e64cf4f859e114d29a6786 (diff) | |
| download | faker-7f38111a9f5d12d4d755c6ddc64b6ae00d529ddc.tar.xz faker-7f38111a9f5d12d4d755c6ddc64b6ae00d529ddc.zip | |
Merge branch 'master' into turkish-locales
Conflicts:
Readme.md
build/build/faker.js
build/build/faker.min.js
examples/browser/js/faker.js
examples/browser/js/faker.min.js
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/internet.js | 4 | ||||
| -rw-r--r-- | lib/locales/nl.js | 5 | ||||
| -rw-r--r-- | lib/locales/sk.js | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/lib/internet.js b/lib/internet.js index c0d92ec5..14d92846 100644 --- a/lib/internet.js +++ b/lib/internet.js @@ -68,8 +68,8 @@ var internet = { baseBlue255 = baseBlue255 || 0; // based on awesome response : http://stackoverflow.com/questions/43044/algorithm-to-randomly-generate-an-aesthetically-pleasing-color-palette var red = Math.floor((faker.random.number(256) + baseRed255) / 2); - var green = Math.floor((faker.random.number(256) + baseRed255) / 2); - var blue = Math.floor((faker.random.number(256) + baseRed255) / 2); + var green = Math.floor((faker.random.number(256) + baseGreen255) / 2); + var blue = Math.floor((faker.random.number(256) + baseBlue255) / 2); var redStr = red.toString(16); var greenStr = green.toString(16); var blueStr = blue.toString(16); diff --git a/lib/locales/nl.js b/lib/locales/nl.js index 75611b5e..094a7297 100644 --- a/lib/locales/nl.js +++ b/lib/locales/nl.js @@ -348,8 +348,9 @@ nl.address = { "Drenthe", "Friesland", "Groningen", - "Noord-Braband", - "Limburg" + "Noord-Brabant", + "Limburg", + "Flevoland" ], "default_country": [ "Nederland" diff --git a/lib/locales/sk.js b/lib/locales/sk.js index f9cc5cea..01944604 100644 --- a/lib/locales/sk.js +++ b/lib/locales/sk.js @@ -2279,9 +2279,7 @@ sk.company = { "collaborative", "compelling", "holistic", - "rich" - ], - "bs_noun": [ + "rich", "synergies", "web-readiness", "paradigms", |