Merge branch 'master' into api-context

Reviewed-on: #132

internal/handlers/ussd/menuhandler.go

@@ -650,6 +650,10 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, fmt.Errorf("missing session")
 	}
 
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 	if err != nil {
@@ -666,7 +670,8 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 	}
 	res.FlagReset = append(res.FlagReset, flag_api_error)
 	balance := balanceResponse.Result.Balance
-	res.Content = balance
+
+	res.Content = l.Get("Balance: %s\n", balance)
 
 	return res, nil
 }

internal/handlers/ussd/menuhandler_test.go

@@ -1625,7 +1625,6 @@ func TestValidateRecipient(t *testing.T) {
 }
 
 func TestCheckBalance(t *testing.T) {
-
 	sessionId := "session123"
 	publicKey := "0X13242618721"
 	fm, _ := NewFlagManager(flagsPath)
@@ -1655,7 +1654,7 @@ func TestCheckBalance(t *testing.T) {
 			},
 		},
 		{
-			name: "Test when checking a  balance is a success",
+			name: "Test when checking a balance is a success",
 			balanceResonse: &models.BalanceResponse{
 				Ok: true,
 				Result: struct {
@@ -1667,7 +1666,7 @@ func TestCheckBalance(t *testing.T) {
 				},
 			},
 			expectedResult: resource.Result{
-				Content:   "0.003 CELO",
+				Content:   "Balance: 0.003 CELO\n",
 				FlagReset: []uint32{flag_api_error},
 			},
 		},
@@ -1700,10 +1699,8 @@ func TestCheckBalance(t *testing.T) {
 
 			//Assert that the result set to content is what was expected
 			assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
-
 		})
 	}
-
 }
 
 func TestGetProfile(t *testing.T) {

services/registration/locale/swa/default.po

@@ -7,6 +7,8 @@ msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."
 msgid "Thank you for using Sarafu. Goodbye!"
 msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
 
-
 msgid "For more help,please call: 0757628885"
 msgstr "Kwa usaidizi zaidi,piga: 0757628885"
+
+msgid "Balance: %s\n"
+msgstr "Salio: %s\n"

services/registration/main

@@ -1 +1 @@
-Balance: {{.check_balance}}
+{{.check_balance}}

services/registration/main_swa

@@ -1 +1 @@
-Salio: {{.check_balance}}
+{{.check_balance}}