diff --git a/lib/version.js b/lib/version.js index 0e08498ceb1e0..0be72f6b4df2e 100755 --- a/lib/version.js +++ b/lib/version.js @@ -13,6 +13,7 @@ const path = require('path'); const mkdirp = require('mkdirp'); const chalk = require('chalk'); const readMetadata = require('./server/readMetadata.js'); +const utils = require('./server/utils.js'); const versionFallback = require('./server/versionFallback.js'); const env = require('./server/env.js'); @@ -108,7 +109,8 @@ files.forEach(file => { metadata.original_id = metadata.id; metadata.id = 'version-' + version + '-' + metadata.id; - const subDir = readMetadata.getSubDir(file); + const docsDir = path.join(CWD, '../', readMetadata.getDocsPath()); + const subDir = utils.getSubDir(file, docsDir); const targetFile = subDir ? `${versionFolder}/${subDir}/${path.basename(file)}` : `${versionFolder}/${path.basename(file)}`; diff --git a/lib/write-translations.js b/lib/write-translations.js index 37d32a7b0f2b8..4bbfc73b722ae 100755 --- a/lib/write-translations.js +++ b/lib/write-translations.js @@ -46,13 +46,13 @@ function execute() { }; // look through markdown headers of docs for titles and categories to translate + const docsDir = path.join(CWD, '../', readMetadata.getDocsPath()); let files = glob.sync(CWD + '/../' + readMetadata.getDocsPath() + '/**'); files.forEach(file => { const extension = path.extname(file); if (extension === '.md' || extension === '.markdown') { let res; try { - const docsDir = path.join(CWD, '../', readMetadata.getDocsPath()); res = readMetadata.processMetadata(file, docsDir); } catch (e) { console.error(e);