Merge pull request #5578 from NodeBB/utils-translator-require

Make utils and translator easier to require
This commit is contained in:
Julian Lam
2017-04-12 23:16:59 -04:00
committed by GitHub
69 changed files with 149 additions and 154 deletions

View File

@@ -9,7 +9,7 @@ var user = require('../../user');
var groups = require('../../groups');
var plugins = require('../../plugins');
var meta = require('../../meta');
var utils = require('../../../public/src/utils');
var utils = require('../../utils');
var helpers = {};

View File

@@ -6,7 +6,7 @@ var categories = require('../../categories');
var privileges = require('../../privileges');
var analytics = require('../../analytics');
var plugins = require('../../plugins');
var translator = require('../../../public/src/modules/translator');
var translator = require('../../translator');
var categoriesController = {};

View File

@@ -24,13 +24,13 @@ settingsController.get = function (req, res, next) {
function renderEmail(req, res, next) {
var fs = require('fs');
var path = require('path');
var utils = require('../../../public/src/utils');
var file = require('../../file');
var emailsPath = path.join(nconf.get('views_dir'), 'emails');
async.waterfall([
function (next) {
utils.walk(emailsPath, next);
file.walk(emailsPath, next);
},
function (emails, next) {
async.map(emails, function (email, next) {

View File

@@ -12,7 +12,7 @@ var categories = require('../categories');
var privileges = require('../privileges');
var plugins = require('../plugins');
var widgets = require('../widgets');
var translator = require('../../public/src/modules/translator');
var translator = require('../translator');
var apiController = module.exports;

View File

@@ -11,7 +11,7 @@ var db = require('../database');
var meta = require('../meta');
var user = require('../user');
var plugins = require('../plugins');
var utils = require('../../public/src/utils');
var utils = require('../utils');
var Password = require('../password');
var sockets = require('../socket.io');

View File

@@ -11,7 +11,7 @@ var categories = require('../categories');
var meta = require('../meta');
var pagination = require('../pagination');
var helpers = require('./helpers');
var utils = require('../../public/src/utils');
var utils = require('../utils');
var categoryController = {};

View File

@@ -13,7 +13,7 @@ var privileges = require('../privileges');
var plugins = require('../plugins');
var helpers = require('./helpers');
var pagination = require('../pagination');
var utils = require('../../public/src/utils');
var utils = require('../utils');
var topicsController = {};