Merge pull request pencilblue#154 from careerbuilder/loadSite-defaults

Load site defaults
matt- · Jan 11, 2016 · 19df9b2 · 19df9b2
2 parents 8dc8e70 + e292918
commit 19df9b2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/include/localization.js b/include/localization.js
@@ -472,7 +472,6 @@ module.exports = function LocalizationModule(pb) {
      * @param {Function} cb
      */
     Localization.init = function(cb) {
-        var supportedLocales = [];
         Localization.storage = {};
         Localization.keys = {};
 

diff --git a/include/service/entities/site_service.js b/include/service/entities/site_service.js
@@ -380,9 +380,15 @@ module.exports = function SiteServiceModule(pb) {
                 return cb(err);
             }
 
+            var defaultLocale = pb.Localization.getDefaultLocale();
+            var defaultSupportedLocales = {};
+            defaultSupportedLocales[defaultLocale] = true;
             //only load the sites when we are in multi-site mode
             if (pb.config.multisite.enabled) {
                 util.forEach(results, function (site) {
+                    site.defaultLocale = site.defaultLocale || defaultLocale;
+                    site.supportedLocales = site.supportedLocales || defaultSupportedLocales;
+                    site.prevHostnames = site.prevHostnames || [];
                     pb.RequestHandler.loadSite(site);
                 });
             }
@@ -596,12 +602,17 @@ module.exports = function SiteServiceModule(pb) {
      * @return {Object}
      */
     SiteService.getGlobalSiteContext = function() {
+        var defaultLocale = pb.Localization.getDefaultLocale();
+        var defaultSupportedLocales = {};
+        defaultSupportedLocales[defaultLocale] = true;
         return {
             displayName: pb.config.siteName,
             uid: pb.SiteService.GLOBAL_SITE,
             hostname: pb.config.multisite.enabled ? url.parse(pb.config.multisite.globalRoot).host : url.parse(pb.config.siteRoot).host,
             active: pb.config.multisite.enabled ? false : true,
-            supportedLocales: util.arrayToObj(pb.Localization.getSupported(), function(a, i) { return a[i]; }, function(a, i) { return true; })
+            defaultLocale: defaultLocale,
+            supportedLocales: defaultSupportedLocales,
+            prevHostnames: []
         };
     };