From 548a88bb92e76fc6c1ac27f28e6eabe3d3d7d894 Mon Sep 17 00:00:00 2001
From: Alex Coles <alex@alexbcoles.com>
Date: Thu, 13 Nov 2014 15:04:43 +0100
Subject: [PATCH] Expose I18n as global with Webpack expose-loader

Signed-off-by: Alex Coles <alex@alexbcoles.com>
---
 app/assets/javascripts/angular/openproject-app.js | 1 -
 package.json                                      | 1 +
 webpack.config.js                                 | 5 +++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/angular/openproject-app.js b/app/assets/javascripts/angular/openproject-app.js
index 8af314ba1ff..9114c6db469 100644
--- a/app/assets/javascripts/angular/openproject-app.js
+++ b/app/assets/javascripts/angular/openproject-app.js
@@ -27,7 +27,6 @@
 //++
 
 var I18n = require('./vendor/i18n');
-window.I18n = I18n;
 I18n.translations.de = require("locales/js-de.yml").de;
 I18n.translations.en = require("locales/js-en.yml").en;
 
diff --git a/package.json b/package.json
index f251a53c07c..ec8904f9e0d 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "URIjs": "^1.14.1",
     "bower": "~1.3.8",
     "exports-loader": "^0.6.2",
+    "expose-loader": "^0.6.0",
     "json-loader": "^0.5.1",
     "webpack": "^1.4.9",
     "yaml-loader": "^0.1.0"
diff --git a/webpack.config.js b/webpack.config.js
index bdbf77a61f5..c83809cb4b5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,8 +13,9 @@ module.exports = {
 
   module: {
     loaders: [
-      { test: /[\/]angular\.js$/, loader: "exports?angular" },
-      { test: /js-\w{2}\.yml$/,   loader: 'json!yaml' }
+      { test: /[\/]angular\.js$/,         loader: "exports?angular" },
+      { test: /[\/]vendor[\/]i18n\.js$/,  loader: "expose?I18n" },
+      { test: /js-\w{2}\.yml$/,           loader: 'json!yaml' },
     ]
   },