Просмотр исходного кода

added default lang of en-US and translations package does the set lang based on subdomain

Henry Oswald 12 лет назад
Родитель
Сommit
377acfaa56

+ 1 - 2
services/web/app/coffee/infrastructure/Server.coffee

@@ -18,7 +18,7 @@ oneDayInMilliseconds = 86400000
 ReferalConnect = require('../Features/Referal/ReferalConnect')
 ReferalConnect = require('../Features/Referal/ReferalConnect')
 RedirectManager = require("./RedirectManager")
 RedirectManager = require("./RedirectManager")
 OldAssetProxy = require("./OldAssetProxy")
 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/mongojs/node_modules/mongodb"), logger)
 metrics.mongodb.monitor(Path.resolve(__dirname + "/../../../node_modules/mongoose/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 ReferalConnect.use
 	app.use express.methodOverride()
 	app.use express.methodOverride()
 
 
-
 expressLocals(app)
 expressLocals(app)
 
 
 app.configure 'production', ->
 app.configure 'production', ->

+ 7 - 0
services/web/config/settings.defaults.coffee

@@ -139,6 +139,13 @@ module.exports =
 		features: defaultFeatures
 		features: defaultFeatures
 	}]
 	}]
 
 
+
+	# i18n
+	# ------
+	# 
+	i18n:
+		defaultLng:"en-US"
+
 	# Spelling languages
 	# Spelling languages
 	# ------------------
 	# ------------------
 	#
 	#