Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

lib/en.json

@@ -2,6 +2,7 @@
 
     "welcome":"NEXT",
     "login":"LOGIN",
+    "logout":"LOGOUT",
     "email":"Email",
     "password":"Password",
     "register":"REGISTER",
@@ -29,5 +30,11 @@
     "balance" : "BALANCE",
     "point" : "POINTS :",
     "profile" : "Profile",
-    "View cart":"View Cart"
+    "Viewcart":"View Cart",
+    "Viewprofil" :"View Profile",
+    "Transferbalance":"TRANSFER BALANCE",
+    "Transactionhistory":"TRANSFER HISTORY",
+    "Renewal":"RENEWAL",
+    "Usebalancepoint":"USE BALANCE / POINTS",
+    "Acitvatecard":"ACTIVATE CARD"
 }
\ No newline at end of file

lib/id.json

 { 
   "welcome": "LANJUT",
   "login":"MASUK",
+  "logout":"KELUAR",
   "email":"Email",
   "password":"Kata Sandi",
   "signin":"Masuk",
@@ -31,8 +32,13 @@
   "profile" :"Profil",
   "upgradePremium" :"Tingkatkan Premium",
   "cardActivation" :"Aktivasi Kartu",
-  "View cart":"Lihat Keranjang"
-
+  "Viewcart":"Keranjang",
+  "Viewprofil" :"Lihat Profil",
+  "Transferbalance":"TRANSFER SALDO",
+  "Transactionhistory":"RIWAYAT TRANSFER",
+  "Renewal":"RENEWAL",
+  "Usebalancepoint":"GUNAKAN SALDO / POINT",
+  "Acitvatecard":"AKTIVASI KARTU"
 }
 
 

view/MenuSelection.js

@@ -11,6 +11,7 @@ import * as Location from 'expo-location';
 import * as Permissions from 'expo-permissions';
 import * as Device from 'expo-device';
 import NumberFormat from 'react-number-format';
+import i18n from 'i18n-js';
 
 class MenuSelection extends React.Component {
   constructor(props) {
@@ -342,7 +343,7 @@ class MenuSelection extends React.Component {
                 <View>
                   <View style={{ height: 40, borderRadius: 10, width: '68%', backgroundColor: '#CFB368', marginRight: 20, marginLeft: 40, top: 15, flexDirection: 'row', marginBottom: 30 }}>
                     <Image source={(require('../assets/icon/icon-order.png'))} style={{ height: 40, width: 40, tintColor: 'white', }}></Image>
-                    <Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 16, alignSelf: 'center', textAlign: 'center' }}>View Cart</Text>
+                    <Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 16, alignSelf: 'center', textAlign: 'center' }}>{i18n.t('Viewcart')}</Text>
                   </View>
                 </View>
               </TouchableOpacity>
@@ -389,7 +390,8 @@ const mapStateToProps = (state) => {
     order_total: state.order_total,
     quantity: state.quantity,
     address: state.address,
-    menu_item: state.menu_item
+    menu_item: state.menu_item,
+    language: state.language
   }
 }