From e7e31d88c22cda6aeff72510a03a71c0cf3d72f2 Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Thu, 2 Feb 2012 17:29:29 -0700
Subject: [PATCH] in production_locales, only use local.json if nothing else is
 explicitly configured in the environment

---
 scripts/production_locales | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/production_locales b/scripts/production_locales
index a4ff3a1f6..7245ecbfe 100755
--- a/scripts/production_locales
+++ b/scripts/production_locales
@@ -7,7 +7,7 @@ var path = require('path');
 process.env['VAR_PATH'] = '/tmp/browserid';
 
 // Pick up production languages
-process.env['CONFIG_FILES'] = path.join(__dirname, '..', 'config', 'local.json');
+process.env['CONFIG_FILES'] = process.env['CONFIG_FILES'] || path.join(__dirname, '..', 'config', 'local.json');
 
 var path = require('path'),
     format = require('util').format,
-- 
GitLab