Versioning ids should be based on whether translation is enabled (#333)

* Versioning ids should be based on whether translation is enabled

Ref: ff117979c6 and a5e963dba1

Tested locally on:

Docusaurus
Relay
Test site from `npm run examples`

* Prettier
This commit is contained in:
Joel Marcey 2017-12-20 19:47:51 -08:00 committed by GitHub
parent 250395a96a
commit 5bb062b6f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions

View file

@ -126,8 +126,7 @@ class HeaderNav extends React.Component {
: '';
const versionPart =
env.versioning.enabled && this.props.version !== 'next'
? (this.props.language || 'en') +
'-version-' +
? 'version-' +
(this.props.version || env.versioning.latestVersion) +
'-'
: '';

View file

@ -12,7 +12,7 @@ const fs = require('fs');
const glob = require('glob');
const chalk = require('chalk');
const env = require('./env');
const env = require('./env.js');
const siteConfig = require(CWD + '/siteConfig.js');
const versionFallback = require('./versionFallback.js');
const escapeStringRegexp = require('escape-string-regexp');
@ -272,14 +272,18 @@ function generateMetadataDocs() {
'version-' + metadata.version + '-',
''
);
metadata.next = metadata.language + '-' + order[id].next;
metadata.next =
(env.translation.enabled ? metadata.language + '-' : '') +
order[id].next;
}
if (order[id].previous) {
metadata.previous_id = order[id].previous.replace(
'version-' + metadata.version + '-',
''
);
metadata.previous = metadata.language + '-' + order[id].previous;
metadata.previous =
(env.translation.enabled ? metadata.language + '-' : '') +
order[id].previous;
}
}
metadatas[metadata.id] = metadata;

View file

@ -11,6 +11,7 @@ const fs = require('fs');
const path = require('path');
const assert = require('assert');
const env = require('./env.js');
const siteConfig = require(CWD + '/siteConfig.js');
const ENABLE_TRANSLATION = fs.existsSync(CWD + '/languages.js');
@ -212,7 +213,7 @@ function processVersionMetadata(file, version, useVersion, language) {
'version-' + version + '-'
);
metadata.localized_id = metadata.id;
metadata.id = language + '-' + metadata.id;
metadata.id = (env.translation.enabled ? language + '-' : '') + metadata.id;
metadata.language = language;
metadata.version = version;