@@ -45,9 +45,12 @@ import Modal from './components/modals/Modal.vue';
4545import InfoBlock from ' ./components/blocks/InfoBlock.vue' ;
4646import ContextMenu from ' ./components/blocks/ContextMenu.vue' ;
4747import Notification from ' ./components/blocks/Notification.vue' ;
48+ // Mixins
49+ import translate from ' ./mixins/translate' ;
4850
4951export default {
5052 name: ' FileManager' ,
53+ mixins: [translate],
5154 components: {
5255 Navbar,
5356 FolderTree,
@@ -140,11 +143,18 @@ export default {
140143 // create notification, if find message text
141144 if (Object .prototype .hasOwnProperty .call (response .data , ' result' )) {
142145 if (response .data .result .message ) {
146+ const message = {
147+ status: response .data .result .status ,
148+ message: Object .prototype .hasOwnProperty .call (this .lang .response , response .data .result .message )
149+ ? this .lang .response [response .data .result .message ]
150+ : response .data .result .message ,
151+ };
152+
143153 // show notification
144- EventBus .$emit (' addNotification' , response . data . result );
154+ EventBus .$emit (' addNotification' , message );
145155
146156 // set action result
147- this .$store .commit (' fm/messages/setActionResult' , response . data . result );
157+ this .$store .commit (' fm/messages/setActionResult' , message );
148158 }
149159 }
150160
@@ -153,25 +163,45 @@ export default {
153163 // loading spinner -
154164 this .$store .commit (' fm/messages/subtractLoading' );
155165
156- // set error message
157- this .$store .commit (' fm/messages/setError' , error);
158-
159166 const errorMessage = {
167+ status: 0 ,
168+ message: ' ' ,
169+ };
170+
171+ const errorNotificationMessage = {
160172 status: ' error' ,
161173 message: ' ' ,
162174 };
163175
164176 // add message
165177 if (error .response ) {
166- errorMessage .message = error .response .data .message || error .response .statusText ;
178+ errorMessage .status = error .response .status ;
179+
180+ if (error .response .data .message ) {
181+ const trMessage = Object .prototype .hasOwnProperty .call (this .lang .response , error .response .data .message )
182+ ? this .lang .response [error .response .data .message ]
183+ : error .response .data .message ;
184+
185+ errorMessage .message = trMessage;
186+ errorNotificationMessage .message = trMessage;
187+ } else {
188+ errorMessage .message = error .response .statusText ;
189+ errorNotificationMessage .message = error .response .statusText ;
190+ }
167191 } else if (error .request ) {
192+ errorMessage .status = error .request .status ;
168193 errorMessage .message = error .request .statusText || ' Network error' ;
194+ errorNotificationMessage .message = error .request .statusText || ' Network error' ;
169195 } else {
170196 errorMessage .message = error .message ;
197+ errorNotificationMessage .message = error .message ;
171198 }
172199
200+ // set error message
201+ this .$store .commit (' fm/messages/setError' , errorMessage);
202+
173203 // show notification
174- EventBus .$emit (' addNotification' , errorMessage );
204+ EventBus .$emit (' addNotification' , errorNotificationMessage );
175205
176206 return Promise .reject (error);
177207 });
0 commit comments