From a631707db4b366111b8d726956ed0ed29378b981 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Fri, 20 Sep 2013 16:02:25 -0400
Subject: [PATCH] app.js + todo

---
 app.js               | 21 ++++++++++++++-------
 public/language/TODO |  7 ++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index 33c765a012..362d6604dc 100644
--- a/app.js
+++ b/app.js
@@ -79,20 +79,27 @@
 			};
 
 			var templates = require('./public/src/templates.js'),
+				translator = require('./public/src/translator.js'),
 				webserver = require('./src/webserver.js'),
 				websockets = require('./src/websockets.js'),
 				plugins = require('./src/plugins'); // Don't remove this - plugins initializes itself
 
 			global.templates = {};
-			templates.init([
-				'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index',
-				'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext',
-				'emails/header', 'emails/footer',
 
-				'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic'
-			]);
+			translator.loadAll(function () {
+				// todo: replace below with read directory code, derp.
+				templates.init([
+					'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index',
+					'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext',
+					'emails/header', 'emails/footer',
+
+					'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic'
+				]);
+
+				templates.ready(webserver.init);
+			});
+
 
-			templates.ready(webserver.init);
 		});
 
 	} else if (nconf.get('upgrade')) {
diff --git a/public/language/TODO b/public/language/TODO
index 2f9c2d6598..42a405e1c1 100644
--- a/public/language/TODO
+++ b/public/language/TODO
@@ -1,2 +1,7 @@
+1. NPM INSTALL
 For now, language packs will be stored here. Eventually, will be moved to server side to allow for npm installability.
-When that happens, server code will generate compressed JSON language files in this folder.
\ No newline at end of file
+When that happens, server code will generate compressed JSON language files in this folder.
+
+
+2. SERVERSIDE METHODS
+Allow server side code to call language.get(key)
\ No newline at end of file