Merge branch 'tangram.i18next' of https://github.com/VishnuVardhanBR/…

…sugarizer into pr/1437
llaske · Jan 3, 2024 · 10be436 · 10be436
2 parents b198cb1 + 362bf62
commit 10be436
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/activities/Tangram.activity/js/DatasetList.js b/activities/Tangram.activity/js/DatasetList.js
@@ -177,7 +177,7 @@ var DatasetList = {
   computed: {
     currentCategoryTitle: function () {
       let ct = this.$root.SugarL10n.dictionary ? this.$root.SugarL10n.dictionary["Data" + this.dataSetHandler.currentCategories[0].replace(/ /g, "")] : null;
-      let categoryTitle = ct ? ct.textContent : this.dataSetHandler.currentCategories[0];
+      let categoryTitle = ct ? ct : this.dataSetHandler.currentCategories[0];
       return categoryTitle;
     }
   },

diff --git a/activities/Tangram.activity/js/SettingEditor.js b/activities/Tangram.activity/js/SettingEditor.js
@@ -200,7 +200,7 @@ var SettingEditor = {
 
     currentCategoryTitle: function() {
       let ct = this.$root.SugarL10n.dictionary ? this.$root.SugarL10n.dictionary["Data" + this.dataSetHandler.currentCategories[0].replace(/ /g, "")] : null;
-      let categoryTitle = ct ? ct.textContent : this.dataSetHandler.currentCategories[0];
+      let categoryTitle = ct ? ct : this.dataSetHandler.currentCategories[0];
       return categoryTitle;
     }
   },

diff --git a/activities/Tangram.activity/js/activity.js b/activities/Tangram.activity/js/activity.js
@@ -326,7 +326,7 @@ var app = new Vue({
       for (var i = 0; i < this.DataSetHandler.AllCategories.length; i++) {
         let index = this.DataSetHandler.currentCategories.findIndex(ele => ele === this.DataSetHandler.AllCategories[i]);
         let ct = this.SugarL10n.dictionary ? this.SugarL10n.dictionary["Data" + this.DataSetHandler.AllCategories[i].replace(/ /g, "")] : null;
-        let categoryTitle = ct ? ct.textContent : this.DataSetHandler.AllCategories[i];
+        let categoryTitle = ct ? ct : this.DataSetHandler.AllCategories[i];
         categoryButtonsContent += `<div id="category-button-` + (i + 1) + `" tangramcategory="` + this.DataSetHandler.AllCategories[i] + `" class="palette-item` + (index !== -1 ? ` palette-item-selected` : ``) + `">` + categoryTitle + `</div>`;
         if (this.DataSetHandler.AllCategories[i] === this.tangramCategories[0]) {
           changeCategory = false;