diff --git a/all.js b/all.js index 71759cc..d38feea 100644 --- a/all.js +++ b/all.js @@ -1,3 +1,4 @@ +const fs = require('fs'); const _ = require('lodash'); const path = require('path'); const phpLoader = require('./php-loader'); @@ -14,7 +15,11 @@ module.exports = function (indexContent) { } catch (e) { } if (path.dirname(this.resource).includes(path.dirname(loaderPath))) { - baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang'; + baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'lang'; + + if (! fs.existsSync(baseDirectory)) { + baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang'; + } } else { baseDirectory = path.dirname(this.resource); } diff --git a/json.js b/json.js index efe9cd5..fb66da7 100644 --- a/json.js +++ b/json.js @@ -13,7 +13,11 @@ module.exports = function (indexContent) { } catch (e) { } if (path.dirname(this.resource).includes(path.dirname(loaderPath))) { - baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang'; + baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'lang'; + + if (! fs.existsSync(baseDirectory)) { + baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang'; + } } else { baseDirectory = path.dirname(this.resource); } diff --git a/php.js b/php.js index 6bd522d..1c52add 100644 --- a/php.js +++ b/php.js @@ -14,7 +14,11 @@ module.exports = function (indexContent) { } catch (e) { } if (path.dirname(this.resource).includes(path.dirname(loaderPath))) { - baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang'; + baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'lang'; + + if (! fs.existsSync(baseDirectory)) { + baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang'; + } } else { baseDirectory = path.dirname(this.resource); }