From 5bb062b6f052264d7f45c788b2be67a72faa7a11 Mon Sep 17 00:00:00 2001
From: Joel Marcey <joelm@fb.com>
Date: Wed, 20 Dec 2017 19:47:51 -0800
Subject: [PATCH] Versioning ids should be based on whether translation is
 enabled (#333)

* Versioning ids should be based on whether translation is enabled

Ref: ff117979c69e7bbe8c0c3286c15970a1a0854bba and a5e963dba134bf0f6a83908d49cd59ce06704cb3

Tested locally on:

Docusaurus
Relay
Test site from `npm run examples`

* Prettier
---
 lib/core/nav/HeaderNav.js     |  3 +--
 lib/server/readMetadata.js    | 10 +++++++---
 lib/server/versionFallback.js |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/core/nav/HeaderNav.js b/lib/core/nav/HeaderNav.js
index 10db9f9d33..a93fbd8f59 100644
--- a/lib/core/nav/HeaderNav.js
+++ b/lib/core/nav/HeaderNav.js
@@ -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) +
             '-'
           : '';
diff --git a/lib/server/readMetadata.js b/lib/server/readMetadata.js
index 501ba5ab80..8ecf7378df 100644
--- a/lib/server/readMetadata.js
+++ b/lib/server/readMetadata.js
@@ -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;
diff --git a/lib/server/versionFallback.js b/lib/server/versionFallback.js
index 53eb1dd24d..ddd1df8494 100644
--- a/lib/server/versionFallback.js
+++ b/lib/server/versionFallback.js
@@ -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;