Merge branch '0.4.0'

Author: brianhyder

controllers/blog.js

@@ -22,6 +22,7 @@ module.exports = function BlogModule(pb) {
 
     //pb dependencies
     var util             = pb.util;
+    var config           = pb.config;
     var PluginService    = pb.PluginService;
     var TopMenu          = pb.TopMenuService;
     var Comments         = pb.CommentService;
@@ -48,13 +49,14 @@ module.exports = function BlogModule(pb) {
 
       contentService.getSettings(function(err, contentSettings) {
           self.gatherData(function(err, data) {
-              ArticleService.getMetaInfo(data.content[0], function(metaKeywords, metaDescription, metaTitle, metaThumbnail) {
+              var articleService = new pb.ArticleService();
+                articleService.getMetaInfo(data.content[0], function(metaKeywords, metaDescription, metaTitle, metaThumbnail) {
 
                   self.ts.reprocess = false;
                   self.ts.registerLocal('meta_keywords', metaKeywords);
                   self.ts.registerLocal('meta_desc', metaDescription);
                   self.ts.registerLocal('meta_title', metaTitle);
-                  self.ts.registerLocal('meta_lang', localizationLanguage);
+                  self.ts.registerLocal('meta_lang', config.localization.defaultLocale);
                   self.ts.registerLocal('meta_thumbnail', metaThumbnail);
                   self.ts.registerLocal('current_url', self.req.url);
                   self.ts.registerLocal('navigation', new pb.TemplateValue(data.nav.navigation, false));

controllers/index.js

@@ -1,37 +1,38 @@
 module.exports = function IndexModule(pb) {
+    
   /**
    * Index - The home page controller of the portfolio theme.
    *
    * @author Blake Callens <[email protected]>
    * @copyright 2014 PencilBlue, LLC.  All Rights Reserved
    */
-
   function Index() {}
 
-  //dependencies
-  var PluginService = pb.PluginService;
-  var util = pb.util;
-  var TopMenu = pb.TopMenuService;
-  var Comments = pb.CommentService;
-  var ArticleService = pb.ArticleService;
-  var externalProfiles = PluginService.getService('external_profiles', 'devblog-pencilblue');
-  var pluginService = new PluginService();
+    //dependencies
+    var util = pb.util;
+    var config = pb.config;
+    var PluginService = pb.PluginService;
+    var TopMenu = pb.TopMenuService;
+    var Comments = pb.CommentService;
+    var ArticleService = pb.ArticleService;
+    var externalProfiles = PluginService.getService('external_profiles', 'devblog-pencilblue');
+    var pluginService = new PluginService();
 
-  //inheritance
-  util.inherits(Index, pb.BaseController);
+    //inheritance
+    util.inherits(Index, pb.BaseController);
 
-  /**
-  * This is the function that will be called by the system's RequestHandler.  It
-  * will map the incoming route to the ones below and then instantiate this
-  * prototype.  The request handler will then proceed to call this function.
-  * Its callback should contain everything needed in order to provide a response.
-  *
-  * @param cb The callback.  It does not require a an error parameter.  All
-  * errors should be handled by the controller and format the appropriate
-  *  response.  The system will attempt to catch any catastrophic errors but
-  *  makes no guarantees.
-  */
-  Index.prototype.render = function(cb) {
+    /**
+     * This is the function that will be called by the system's RequestHandler.  It
+     * will map the incoming route to the ones below and then instantiate this
+     * prototype.  The request handler will then proceed to call this function.
+     * Its callback should contain everything needed in order to provide a response.
+     *
+     * @param cb The callback.  It does not require a an error parameter.  All
+     * errors should be handled by the controller and format the appropriate
+     *  response.  The system will attempt to catch any catastrophic errors but
+     *  makes no guarantees.
+     */
+    Index.prototype.render = function(cb) {
       var self = this;
 
       var content = {
@@ -70,7 +71,7 @@ module.exports = function IndexModule(pb) {
                           self.ts.registerLocal('meta_keywords', homePageKeywords);
                           self.ts.registerLocal('meta_desc', homePageDescription);
                           self.ts.registerLocal('meta_title', pb.config.siteName);
-                          self.ts.registerLocal('meta_lang', localizationLanguage);
+                          self.ts.registerLocal('meta_lang', config.localization.defaultLocale);
                           self.ts.registerLocal('current_url', self.req.url);
                           self.ts.registerLocal('navigation', new pb.TemplateValue(navigation, false));
                           self.ts.registerLocal('account_buttons', new pb.TemplateValue(accountButtons, false));