From 26cd66814a843ed801abd0dbb180b7d6e027a30f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 15 Jun 2018 21:16:14 +0530
Subject: [PATCH 1/3] Translated sidebar items

---
 src/sidebar.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/sidebar.js b/src/sidebar.js
index d32acc56..69f2f7a3 100644
--- a/src/sidebar.js
+++ b/src/sidebar.js
@@ -1,39 +1,41 @@
+const { _ } = require('frappejs');
+
 export default [
   {
     items: [
       {
-        label: 'ToDo', route: '#/list/ToDo'
+        label: _('ToDo'), route: '#/list/ToDo'
       },
       {
-        label: 'Event', route: '#/list/Event'
+        label: _('Event'), route: '#/list/Event'
       }
     ]
   },
   {
-    title: 'Masters',
+    title: _('Masters'),
     items: [
       {
-        label: 'Item', route: '#/list/Item'
+        label: _('Item'), route: '#/list/Item'
       },
       {
-        label: 'Party', route: '#/list/Party'
+        label: _('Party'), route: '#/list/Party'
       },
       {
-        label: 'Invoice', route: '#/list/Invoice'
+        label: _('Invoice'), route: '#/list/Invoice'
       },
       {
-        label: 'Tax', route: '#/list/Tax'
+        label: _('Tax'), route: '#/list/Tax'
       },
       {
-        label: 'Account', route: '#/list/Account'
+        label: _('Account'), route: '#/list/Account'
       }
     ]
   },
   {
-    title: 'Reports',
+    title: _('Reports'),
     items: [
       {
-        label: 'General Ledger', route: '#/report/general-ledger'
+        label: _('General Ledger'), route: '#/report/general-ledger'
       }
     ]
   }

From e80d5570c59e4b2d6baa9560a8be19895ebb2c68 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 15 Jun 2018 21:16:45 +0530
Subject: [PATCH 2/3] closeModal

---
 src/App.vue              | 2 +-
 src/components/Modal.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index dc8890d6..548d485e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@
       <router-view />
     </frappe-desk>
     <router-view v-else name="setup" />
-    <frappe-modal ref="modal" :show="showModal" v-bind="modalOptions" />
+    <frappe-modal ref="modal" :show="showModal" v-bind="modalOptions" @close-modal="showModal = false"/>
   </div>
 </template>
 
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index 46c9a5cd..8304d5fd 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -16,12 +16,12 @@
           </div>
           <div class="modal-footer">
             <component :is="footer" />
-            <button type="button" class="btn btn-secondary" @click="closeModal">Close</button>
+            <f-button secondary @click="closeModal">Close</f-button>
           </div>
         </div>
       </div>
     </div>
-    <div class="modal-backdrop show" v-show="show"></div>
+    <div class="modal-backdrop show" v-show="show" @click="closeModal"></div>
   </div>
 </template>
 <script>
@@ -50,7 +50,7 @@ export default {
   },
   methods: {
     closeModal() {
-      this.$emit('closeModal');
+      this.$emit('close-modal');
     }
   }
 }

From 79bcee0aee4487fcafac6769bb06235494a37cd7 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 24 Jun 2018 11:22:41 +0530
Subject: [PATCH 3/3] [fix] Translate function

---
 src/sidebar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sidebar.js b/src/sidebar.js
index 69f2f7a3..ab062fa4 100644
--- a/src/sidebar.js
+++ b/src/sidebar.js
@@ -1,4 +1,4 @@
-const { _ } = require('frappejs');
+const { _ } = require('frappejs/utils');
 
 export default [
   {