From 77e58f31c5e8dc005e808dcf1101adc66a697b95 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Mon, 28 Nov 2016 18:16:13 -0700
Subject: [PATCH] Fixes, passes tests

---
 .../{en_GB => en-GB}/admin/appearance/themes.json      |  0
 src/admin/search.js                                    | 10 +++++-----
 src/languages.js                                       |  2 +-
 src/socket.io/admin.js                                 |  2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename public/language/{en_GB => en-GB}/admin/appearance/themes.json (100%)

diff --git a/public/language/en_GB/admin/appearance/themes.json b/public/language/en-GB/admin/appearance/themes.json
similarity index 100%
rename from public/language/en_GB/admin/appearance/themes.json
rename to public/language/en-GB/admin/appearance/themes.json
diff --git a/src/admin/search.js b/src/admin/search.js
index 76f127a4d8..940c202cf4 100644
--- a/src/admin/search.js
+++ b/src/admin/search.js
@@ -6,7 +6,7 @@ var sanitizeHTML = require('sanitize-html');
 
 var languages = require('../languages');
 var utils = require('../../public/src/utils');
-var Translator = require('../../public/src/modules/translator');
+var Translator = require('../../public/src/modules/translator').Translator;
 
 function walk(directory) {
 	return new Promise(function (resolve, reject) {
@@ -32,9 +32,9 @@ function readFile(path) {
 	});
 }
 
-function loadLanguage(language, filename) {
+function loadLanguage(language, namespace) {
 	return new Promise(function (resolve, reject) {
-		languages.get(language, filename + '.json', function (err, data) {
+		languages.get(language, namespace, function (err, data) {
 			if (err || !data || !Object.keys(data).length) {
 				reject(err);
 			} else {
@@ -56,7 +56,7 @@ function filterDirectories(directories) {
 }
 
 function getAdminNamespaces() {
-	return walk(path.resolve('./public/templates/admin'))
+	return walk(path.resolve(__dirname, '../../public/templates/admin'))
 		.then(filterDirectories);
 }
 
@@ -81,7 +81,7 @@ function simplify(translations) {
 var fallbackCache = {};
 
 function initFallback(namespace) {
-	return readFile(path.resolve('./public/templates/', namespace + '.tpl'))
+	return readFile(path.resolve(__dirname, '../../public/templates/', namespace + '.tpl'))
 		.then(function (template) {
 			var translations = sanitize(template);
 			translations = simplify(translations);
diff --git a/src/languages.js b/src/languages.js
index 86563628b2..f3b9aa5743 100644
--- a/src/languages.js
+++ b/src/languages.js
@@ -75,7 +75,7 @@ Languages.list = function (callback) {
 
 				fs.readFile(configPath, function (err, stream) {
 					if (err) {
-						next();
+						return next(err);
 					}
 					languages.push(JSON.parse(stream.toString()));
 					next();
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 9817099ef5..00d90067f7 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -283,7 +283,7 @@ SocketAdmin.getSearchDict = function (socket, data, callback) {
 		if (err) {
 			return callback(err);
 		}
-		var lang = settings.userLang || meta.config.defaultLang || 'en_GB';
+		var lang = settings.userLang || meta.config.defaultLang || 'en-GB';
 		getAdminSearchDict(lang)
 			.then(function (results) {
 				callback(null, results);