From 49c7d5220830da22a4e8952365014cdc65412fc4 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 30 Jul 2014 16:13:02 +0100
Subject: [PATCH] i18n is cleaned and working with requirejs

---
 services/web/app/views/layout.jade                    |  5 -----
 services/web/public/coffee/main.coffee                |  2 +-
 services/web/public/coffee/main/project-list.coffee   | 11 -----------
 .../web/public/coffee/utils/i18nextProvider.coffee    |  9 +++++++++
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index 86e30d68b1..47cc832bfa 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -36,11 +36,6 @@ html(itemscope, itemtype='http://schema.org/Product')
 		block scripts
 		script(src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js")
 		script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.14/angular.min.js")
-		script(src="/js/libs/i18next.js")
-		script(src="/js/libs/ng-i18next/provider.js")
-		script(src="/js/libs/ng-i18next/filter/filter.js")
-		script(src="/js/libs/ng-i18next/directive/directive.js")
-
 		
 		script.
 			window.sharelatex = {
diff --git a/services/web/public/coffee/main.coffee b/services/web/public/coffee/main.coffee
index f8ea3aa273..4ac69ae83e 100644
--- a/services/web/public/coffee/main.coffee
+++ b/services/web/public/coffee/main.coffee
@@ -18,6 +18,6 @@ define [
 	"directives/selectAll"
 	"directives/maxHeight"
 	"filters/formatDate"
-
+	"utils/i18nextProvider"
 ], () ->
 	angular.bootstrap(document.body, ["SharelatexApp"])
diff --git a/services/web/public/coffee/main/project-list.coffee b/services/web/public/coffee/main/project-list.coffee
index c526b8b68c..0a958ab36c 100644
--- a/services/web/public/coffee/main/project-list.coffee
+++ b/services/web/public/coffee/main/project-list.coffee
@@ -3,17 +3,6 @@ define [
 ], (App) ->
 
 
-	angular.module('jm.i18next').config ['$i18nextProvider', ($i18nextProvider)->
-		console.log("hello")
-		$i18nextProvider.options =
-			lng: 'en-GB',
-			useCookie: false,
-			useLocalStorage: false,
-			fallbackLng: 'en',
-			resGetPath: '/locales/__lng__.json'
-	]
-
-
 	App.factory "queuedHttp", ($http, $q) ->
 		pendingRequests = []
 		inflight = false
diff --git a/services/web/public/coffee/utils/i18nextProvider.coffee b/services/web/public/coffee/utils/i18nextProvider.coffee
index e69de29bb2..27b02d0304 100644
--- a/services/web/public/coffee/utils/i18nextProvider.coffee
+++ b/services/web/public/coffee/utils/i18nextProvider.coffee
@@ -0,0 +1,9 @@
+angular.module('jm.i18next').config ['$i18nextProvider', ($i18nextProvider)->
+	console.log("hello")
+	$i18nextProvider.options =
+		lng: 'en-GB',
+		useCookie: false,
+		useLocalStorage: false,
+		fallbackLng: 'en',
+		resGetPath: '/locales/__lng__.json'
+]
\ No newline at end of file