Merge pull request #81 from pierrekamel5/master

Fix languages issue
BuildFire · Sep 13, 2022 · 7dc2783 · 7dc2783
2 parents 6136c96 + e368814
commit 7dc2783
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/widget/controllers/widget.home.controller.js b/widget/controllers/widget.home.controller.js
@@ -23,19 +23,16 @@
           "general.confirm": "Confirm",
           "general.cancel": "Cancel",
           "general.next": "Next",
-          "redeem.confirmRedemptionModalTitle": 'Redeem Item',
-          "redeem.confirmRedemptionModalImportantNote": "By clicking redeem, you are confirming that the reward has been received and the coresponding points will, therefore, be deducted from your account.",
-          "redeem.confirmRedemptionModalCancel": 'CANCEL',
-          "redeem.confirmRedemptionModalConfirm": "REDEEM",
-          "redeem.itemRedeemedModalTitle": "Item Redeemed",
+          "redeem.titleNote": 'Redeem Item',
+          "redeem.importantNote": "By clicking redeem, you are confirming that the reward has been received and the coresponding points will, therefore, be deducted from your account.",
+          "redeem.cancelActionNote": 'CANCEL',
+          "redeem.confirmActionNote": "REDEEM",
+          "redeem.itemRedeemedTitle": "Item Redeemed",
           "redeem.itemRedeemedBody": "Rewards can take up to 24 hours to process. You can check the status of your reward by tapping on rewards icon in the upper right corner on the home screen.",
           "redeem.closeitemRedeemedAction": "Thanks",
           "redeem.errorRedeem": "Error redeeming reward. Please try again later.",
           "redeem.redeemDailyLimit": "You have exceeded the daily limit.",
           "redeem.insufficientFunds": "You have insufficient points. Please get points to redeem awards.",
-          "redeem.handDevice": "Please hand your device to a staff member for confirmation",
-          "redeem.invalidCode": "Invalid confirmation code.",
-          "redeem.enterCode": "Enter Code",
           "buyItems.productName": "Product Name",
           "buyItems.pointsPerProduct": "Points Per Product",
           "buyItems.quantity": "Quantity",

diff --git a/widget/controllers/widget.item.controller.js b/widget/controllers/widget.item.controller.js
@@ -65,13 +65,13 @@
         WidgetItem.confirmCancel = function () {
           buildfire.dialog.confirm(
             {
-              title: WidgetItem.strings["redeem.confirmRedemptionModalTitle"],
-              message: WidgetItem.strings["redeem.confirmRedemptionModalImportantNote"],
+              title: WidgetItem.strings["redeem.titleNote"],
+              message: WidgetItem.strings["redeem.importantNote"],
               confirmButton: {
-                text: WidgetItem.strings["redeem.confirmRedemptionModalConfirm"],
+                text: WidgetItem.strings["redeem.confirmActionNote"],
                 type: "primary",
               },
-              cancelButtonText: WidgetItem.strings["redeem.confirmRedemptionModalCancel"],
+              cancelButtonText: WidgetItem.strings["redeem.cancelActionNote"],
             },
             (err, isConfirmed) => {
               if (err) return;

diff --git a/widget/js/shared/strings.js b/widget/js/shared/strings.js
@@ -14,7 +14,7 @@ buildfire.services.Strings = class{
 			if(stringsConfig[sectionKey].labels.length &&  stringsConfig[sectionKey].labels.length){
 				for (let labelKey in stringsConfig[sectionKey].labels) {
 					for(let subLabelKey in stringsConfig[sectionKey].labels[labelKey].subLabels){
-						section[labelKey]={
+						section[subLabelKey]={
 							defaultValue : stringsConfig[sectionKey].labels[labelKey].subLabels[subLabelKey].defaultValue
 							,required : stringsConfig[sectionKey].labels[labelKey].subLabels[subLabelKey].required
 						};