Merge branch 'master' into translations

[bookstack] / resources / assets / js / controllers.js

diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js
index 3a465da97221710c312eb768452cb8ef36a39e7e..0d57b09add8307f7284ceb9c417f7bd768751a1f 100644 (file)
--- a/resources/assets/js/controllers.js
+++ b/resources/assets/js/controllers.js
@@ -64,7 +64,7 @@ export default function (ngApp, events) {
                 $scope.$apply(() => {
                     $scope.images.unshift(data);
                 });
                 $scope.$apply(() => {
                     $scope.images.unshift(data);
                 });

-                events.emit('success', 'Image uploaded');
+                events.emit('success', trans('components.image_upload_success'));

             };
 
             /**
             };
 
             /**


@@ -151,10 +151,9 @@ export default function (ngApp, events) {
                 if ($scope.searching) components['term'] = $scope.searchTerm;
 
 
                 if ($scope.searching) components['term'] = $scope.searchTerm;
 
 

-                let urlQueryString = Object.keys(components).map((key) => {
+                url += Object.keys(components).map((key) => {

                     return key + '=' + encodeURIComponent(components[key]);
                 }).join('&');
                     return key + '=' + encodeURIComponent(components[key]);
                 }).join('&');

-                url += urlQueryString;

 
                 $http.get(url).then((response) => {
                     $scope.images = $scope.images.concat(response.data.images);
 
                 $http.get(url).then((response) => {
                     $scope.images = $scope.images.concat(response.data.images);


@@ -209,7 +208,7 @@ export default function (ngApp, events) {
                 event.preventDefault();
                 let url = window.baseUrl('/images/update/' + $scope.selectedImage.id);
                 $http.put(url, this.selectedImage).then(response => {
                 event.preventDefault();
                 let url = window.baseUrl('/images/update/' + $scope.selectedImage.id);
                 $http.put(url, this.selectedImage).then(response => {

-                    events.emit('success', 'Image details updated');
+                    events.emit('success', trans('components.image_update_success'));

                 }, (response) => {
                     if (response.status === 422) {
                         let errors = response.data;
                 }, (response) => {
                     if (response.status === 422) {
                         let errors = response.data;


@@ -238,7 +237,7 @@ export default function (ngApp, events) {
                 $http.delete(url).then((response) => {
                     $scope.images.splice($scope.images.indexOf($scope.selectedImage), 1);
                     $scope.selectedImage = false;
                 $http.delete(url).then((response) => {
                     $scope.images.splice($scope.images.indexOf($scope.selectedImage), 1);
                     $scope.selectedImage = false;

-                    events.emit('success', 'Image successfully deleted');
+                    events.emit('success', trans('components.image_delete_success'));

                 }, (response) => {
                     // Pages failure
                     if (response.status === 400) {
                 }, (response) => {
                     // Pages failure
                     if (response.status === 400) {


@@ -309,9 +308,9 @@ export default function (ngApp, events) {
 
         // Set initial header draft text
         if ($scope.isUpdateDraft || $scope.isNewPageDraft) {
 
         // Set initial header draft text
         if ($scope.isUpdateDraft || $scope.isNewPageDraft) {

-            $scope.draftText = 'Editing Draft'
+            $scope.draftText = trans('entities.pages_editing_draft');

         } else {
         } else {

-            $scope.draftText = 'Editing Page'
+            $scope.draftText = trans('entities.pages_editing_page');

         }
 
         let autoSave = false;
         }
 
         let autoSave = false;


@@ -388,7 +387,7 @@ export default function (ngApp, events) {
                 lastSave = Date.now();
             }, errorRes => {
                 if (draftErroring) return;
                 lastSave = Date.now();
             }, errorRes => {
                 if (draftErroring) return;

-                events.emit('error', 'Failed to save draft. Ensure you have internet connection before saving this page.')
+                events.emit('error', trans('errors.page_draft_autosave_fail'));

                 draftErroring = true;
             });
         }
                 draftErroring = true;
             });
         }


@@ -421,7 +420,7 @@ export default function (ngApp, events) {
             let url = window.baseUrl('/ajax/page/' + pageId);
             $http.get(url).then((responseData) => {
                 if (autoSave) $interval.cancel(autoSave);
             let url = window.baseUrl('/ajax/page/' + pageId);
             $http.get(url).then((responseData) => {
                 if (autoSave) $interval.cancel(autoSave);

-                $scope.draftText = 'Editing Page';
+                $scope.draftText = trans('entities.pages_editing_page');

                 $scope.isUpdateDraft = false;
                 $scope.$broadcast('html-update', responseData.data.html);
                 $scope.$broadcast('markdown-update', responseData.data.markdown || responseData.data.html);
                 $scope.isUpdateDraft = false;
                 $scope.$broadcast('html-update', responseData.data.html);
                 $scope.$broadcast('markdown-update', responseData.data.markdown || responseData.data.html);


@@ -429,7 +428,7 @@ export default function (ngApp, events) {
                 $timeout(() => {
                     startAutoSave();
                 }, 1000);
                 $timeout(() => {
                     startAutoSave();
                 }, 1000);

-                events.emit('success', 'Draft discarded, The editor has been updated with the current page content');
+                events.emit('success', trans('entities.pages_draft_discarded'));

             });
         };
 
             });
         };
 


@@ -576,7 +575,7 @@ export default function (ngApp, events) {
              * Get files for the current page from the server.
              */
             function getFiles() {
              * Get files for the current page from the server.
              */
             function getFiles() {

-                let url = window.baseUrl(`/attachments/get/page/${pageId}`)
+                let url = window.baseUrl(`/attachments/get/page/${pageId}`);

                 $http.get(url).then(resp => {
                     $scope.files = resp.data;
                     currentOrder = resp.data.map(file => {return file.id}).join(':');
                 $http.get(url).then(resp => {
                     $scope.files = resp.data;
                     currentOrder = resp.data.map(file => {return file.id}).join(':');


@@ -594,7 +593,7 @@ export default function (ngApp, events) {
                 $scope.$apply(() => {
                     $scope.files.push(data);
                 });
                 $scope.$apply(() => {
                     $scope.files.push(data);
                 });

-                events.emit('success', 'File uploaded');
+                events.emit('success', trans('entities.attachments_file_uploaded'));

             };
 
             /**
             };
 
             /**


@@ -612,7 +611,7 @@ export default function (ngApp, events) {
                         data.link = '';
                     }
                 });
                         data.link = '';
                     }
                 });

-                events.emit('success', 'File updated');
+                events.emit('success', trans('entities.attachments_file_updated'));

             };
 
             /**
             };
 
             /**


@@ -638,7 +637,7 @@ export default function (ngApp, events) {
                 file.uploaded_to = pageId;
                 $http.post(window.baseUrl('/attachments/link'), file).then(resp => {
                     $scope.files.push(resp.data);
                 file.uploaded_to = pageId;
                 $http.post(window.baseUrl('/attachments/link'), file).then(resp => {
                     $scope.files.push(resp.data);

-                    events.emit('success', 'Link attached');
+                    events.emit('success', trans('entities.attachments_link_attached'));

                     $scope.file = getCleanFile();
                 }, checkError('link'));
             };
                     $scope.file = getCleanFile();
                 }, checkError('link'));
             };


@@ -672,7 +671,7 @@ export default function (ngApp, events) {
                         $scope.editFile.link = '';
                     }
                     $scope.editFile = false;
                         $scope.editFile.link = '';
                     }
                     $scope.editFile = false;

-                    events.emit('success', 'Attachment details updated');
+                    events.emit('success', trans('entities.attachments_updated_success'));

                 }, checkError('edit'));
             };
 
                 }, checkError('edit'));
             };