Reverts changes from #985 Closes #1148

Removes duplicate `en` require
This is a quick copy and paste solution to revert
We’ll want to go back here and refactor this again

1 files changed, 60 insertions, 20 deletions

diff --git a/lib/system.js b/lib/system.js
index 35fd6828..98b3ea9c 100644
--- a/lib/system.js
+++ b/lib/system.js
@@ -36,26 +36,6 @@ function setToArray(set) {
  * @namespace faker.system
  */
 function System(faker) {
-  var typeSet = new Set();
-  var extensionSet = new Set();
-  var mimeTypes = faker.definitions.system.mimeTypes;
-
-  Object.keys(mimeTypes).forEach(function (m) {
-    var type = m.split("/")[0];
-
-    typeSet.add(type);
-
-    if (mimeTypes[m].extensions instanceof Array) {
-      mimeTypes[m].extensions.forEach(function (ext) {
-        extensionSet.add(ext);
-      });
-    }
-  });
-
-  var types = setToArray(typeSet);
-  var extensions = setToArray(extensionSet);
-  var mimeTypeKeys = Object.keys(faker.definitions.system.mimeTypes);
-
 
   /**
    * generates a file name
@@ -88,6 +68,26 @@ function System(faker) {
    * @method faker.system.mimeType
    */
   this.mimeType = function () {
+    var typeSet = new Set();
+    var extensionSet = new Set();
+    var mimeTypes = faker.definitions.system.mimeTypes;
+
+    Object.keys(mimeTypes).forEach(function (m) {
+      var type = m.split("/")[0];
+
+      typeSet.add(type);
+
+      if (mimeTypes[m].extensions instanceof Array) {
+        mimeTypes[m].extensions.forEach(function (ext) {
+          extensionSet.add(ext);
+        });
+      }
+    });
+
+    var types = setToArray(typeSet);
+    var extensions = setToArray(extensionSet);
+    var mimeTypeKeys = Object.keys(faker.definitions.system.mimeTypes);
+
     return faker.random.arrayElement(mimeTypeKeys);
   };
 
@@ -116,7 +116,27 @@ function System(faker) {
    * @method faker.system.fileType
    */
   this.fileType = function () {
+    var typeSet = new Set();
+    var extensionSet = new Set();
+    var mimeTypes = faker.definitions.system.mimeTypes;
+
+    Object.keys(mimeTypes).forEach(function (m) {
+      var type = m.split("/")[0];
+
+      typeSet.add(type);
+
+      if (mimeTypes[m].extensions instanceof Array) {
+        mimeTypes[m].extensions.forEach(function (ext) {
+          extensionSet.add(ext);
+        });
+      }
+    });
+
+    var types = setToArray(typeSet);
+    var extensions = setToArray(extensionSet);
+    var mimeTypeKeys = Object.keys(faker.definitions.system.mimeTypes);
     return faker.random.arrayElement(types);
+
   };
 
   /**
@@ -126,6 +146,26 @@ function System(faker) {
    * @param {string} mimeType
    */
   this.fileExt = function (mimeType) {
+    var typeSet = new Set();
+    var extensionSet = new Set();
+    var mimeTypes = faker.definitions.system.mimeTypes;
+
+    Object.keys(mimeTypes).forEach(function (m) {
+      var type = m.split("/")[0];
+
+      typeSet.add(type);
+
+      if (mimeTypes[m].extensions instanceof Array) {
+        mimeTypes[m].extensions.forEach(function (ext) {
+          extensionSet.add(ext);
+        });
+      }
+    });
+
+    var types = setToArray(typeSet);
+    var extensions = setToArray(extensionSet);
+    var mimeTypeKeys = Object.keys(faker.definitions.system.mimeTypes);
+
     if (mimeType) {
       var mimes = faker.definitions.system.mimeTypes;
       return faker.random.arrayElement(mimes[mimeType].extensions);