Merge pull request #43 from vyakymenko/feature/update

Core update.
vyakymenko · Jun 28, 2017 · f614eec · f614eec
2 parents 14f44a2 + 50906be
commit f614eec
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 123 deletions.
diff --git a/package.json b/package.json
@@ -134,7 +134,7 @@
     "traceur": "^0.0.111",
     "ts-node": "^3.0.4",
     "tslint": "^5.0.0",
-    "typescript": "^2.2.0",
+    "typescript": "~2.3.4",
     "walk": "^2.3.9",
     "yargs": "^8.0.1"
   },

diff --git a/tools/config/seed.config.ts b/tools/config/seed.config.ts
@@ -272,7 +272,7 @@ export class SeedConfig {
   E2E_DEST = `${this.DIST_DIR}/e2e`;
 
   /**
-   * The folder for the built files of the e2e-specs.
+   * The folder for the built translation file.
    * @type {string}
    */
   LOCALE_DEST = `${this.DIST_DIR}/locale`;

diff --git a/tools/tasks/seed/i18n.merge.ts b/tools/tasks/seed/i18n.merge.ts
@@ -19,7 +19,8 @@ gulp.task('get_source_i18n', function () {
         });
       },
       parserOptions: {
-        xmlMode: true
+        xmlMode: true,
+        decodeEntities: false
       }
     }));
 });
@@ -37,6 +38,12 @@ gulp.task('merge_translations_i18n', function () {
           if (targetElement.length === 0) {
             // missing translation
             $('body').append(sourceElement);
+          } else {
+            // update context group location
+            let newContextEl = $(sourceElement).children('context-group')
+              .attr('purpose', 'location');
+            targetElement.children('context-group').attr('purpose', 'location')
+              .replaceWith(newContextEl);
           }
         }
         $('trans-unit').map((function () {
@@ -48,7 +55,8 @@ gulp.task('merge_translations_i18n', function () {
         }));
       },
       parserOptions: {
-        xmlMode: true
+        xmlMode: true,
+        decodeEntities: false
       }
     }))
     .pipe(gulp.dest(Config.LOCALE_DEST));