From 195da958831a421e35915f7c1c3346588bbfc0d7 Mon Sep 17 00:00:00 2001
From: Thibaut Broggi <tbr@laquadrature.net>
Date: Tue, 31 Oct 2017 11:10:22 +0100
Subject: [PATCH] Move i18n class into another module

---
 i18n.js | 19 +++++++++++++++++++
 srv.js  | 20 +-------------------
 2 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 i18n.js

diff --git a/i18n.js b/i18n.js
new file mode 100644
index 0000000..db1f61f
--- /dev/null
+++ b/i18n.js
@@ -0,0 +1,19 @@
+const enLocale = require('./locale/en.json');
+
+module.exports = function(){
+  let _locale = 'en';
+
+  this._ = function(str) {
+    return _locale == 'en' ? enLocale[str] || str : str;
+  }
+
+  this.setLocale = function(locale) {
+    _locale = locale;
+  }
+
+  this.getLocale = function() {
+    return _locale;
+  }
+
+  return this;
+};
diff --git a/srv.js b/srv.js
index c07186f..175fb0c 100755
--- a/srv.js
+++ b/srv.js
@@ -7,7 +7,7 @@ const Canvas = require('canvas');
 const Image = Canvas.Image;
 const app = express();
 const config = require('./config.json');
-const enLocale = require('./locale/en.json');
+const i18n = require('./i18n.js')();
 
 app.set('x-powered-by', false);
 app.set('view engine', 'pug');
@@ -154,24 +154,6 @@ app.get('/generate.png', function (req, res) {
   })
 });
 
-let i18n = (function(){
-  let _locale = 'en';
-
-  this._ = function(str) {
-    return _locale == 'en' ? enLocale[str] || str : str;
-  }
-
-  this.setLocale = function(locale) {
-    _locale = locale;
-  }
-
-  this.getLocale = function() {
-    return _locale;
-  }
-
-  return this;
-})();
-
 app.get('/', function(req, res) {
   let locale = req.headers['accept-language'] || '';
   i18n.setLocale(locale.indexOf('en') !== -1 && locale.indexOf('en') < locale.indexOf('fr') ? 'en' : 'fr');
-- 
GitLab