From 377acfaa560d910f0044eda205aafebafe2d6888 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 5 Aug 2014 11:15:17 +0100 Subject: [PATCH] added default lang of en-US and translations package does the set lang based on subdomain --- services/web/app/coffee/infrastructure/Server.coffee | 3 +-- services/web/config/settings.defaults.coffee | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Server.coffee b/services/web/app/coffee/infrastructure/Server.coffee index c00e367eb6..264360c81c 100644 --- a/services/web/app/coffee/infrastructure/Server.coffee +++ b/services/web/app/coffee/infrastructure/Server.coffee @@ -18,7 +18,7 @@ oneDayInMilliseconds = 86400000 ReferalConnect = require('../Features/Referal/ReferalConnect') RedirectManager = require("./RedirectManager") OldAssetProxy = require("./OldAssetProxy") -translations = require("translations-sharelatex").setup(Settings.subdomainLang) +translations = require("translations-sharelatex").setup(Settings.i18n) metrics.mongodb.monitor(Path.resolve(__dirname + "/../../../node_modules/mongojs/node_modules/mongodb"), logger) metrics.mongodb.monitor(Path.resolve(__dirname + "/../../../node_modules/mongoose/node_modules/mongodb"), logger) @@ -76,7 +76,6 @@ app.configure () -> app.use ReferalConnect.use app.use express.methodOverride() - expressLocals(app) app.configure 'production', -> diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 13a3b72a53..212cc3b926 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -139,6 +139,13 @@ module.exports = features: defaultFeatures }] + + # i18n + # ------ + # + i18n: + defaultLng:"en-US" + # Spelling languages # ------------------ #