Change translations structure

medic/cht-core#3128
medic · Nov 19, 2018 · 685ece9 · 685ece9
2 parents 391f838 + 3f68173
commit 685ece9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/fn/upload-custom-translations.js b/src/fn/upload-custom-translations.js
@@ -25,7 +25,7 @@ module.exports = (projectDir, couchUrl) => {
               if(e.status === 404) return newDocFor(fileName);
               else throw e;
             })
-            .then(doc => mergeProperties(doc, translations))
+            .then(doc => overwriteProperties(doc, translations))
             .then(doc => db.put(doc));
         }));
     });
@@ -42,11 +42,20 @@ function propertiesAsObject(path) {
   return vals;
 }
 
-function mergeProperties(doc, props) {
-  if(!doc.values) doc.values = {};
-
-  for(const k in props) {
-    if(props.hasOwnProperty(k)) doc.values[k] = props[k];
+function overwriteProperties(doc, props) {
+  if(doc.default) {
+    // 3.4.0 translation structure
+    doc.custom = props;
+  } else {
+    // obsolete doc structure
+    if(!doc.values) {
+      doc.values = {};
+    }
+    for(const k in props) {
+      if(props.hasOwnProperty(k)) {
+        doc.values[k] = props[k];
+      }
+    }
   }
 
   return doc;

diff --git a/test/fn/upload-custom-translations.spec.js b/test/fn/upload-custom-translations.spec.js
@@ -44,7 +44,7 @@ describe('upload-custom-translations', () => {
       .then(doc => {
         assert.equal(doc.code, lang);
         assert.equal(doc.type, 'translations');
-        assert.deepEqual(doc.values, expectedTranslations);
+        assert.deepEqual(doc.custom || doc.values, expectedTranslations);
       });
   }
 });