TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Restructure error and success messages for the editor.

Browse Source 
closes #1368
- merged the Maps for Error/Notification Messages into one JSON-structure
- this structure is more translation-friendly and influenced by I18n-standards.

Merged the Error and Message Map into one structure

The new JSON-structure is more translation friendly and similiar to i18n.
This commit is contained in:
Manuel Gellfart 2013-11-04 13:54:18 +01:00 committed by Manuel Gellfart
parent cf4fdb3a49
commit 28c3c5670c
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
core/client/views/editor.js
View File

@ -77,14 +77,35 @@
'published': 'Update Post'
},
notificationMap: {
'draft': 'Your post has been saved as a draft.',
'published': 'Your post has been published.'
},
//TODO: This has to be moved to the I18n localization file.
//This structure is supposed to be close to the i18n-localization which will be used soon.
messageMap: {
errors: {
post: {
published: {
'published': 'Your post could not be updated.',
'draft': 'Your post could not be saved as a draft.'
},
draft: {
'published': 'Your post could not be published.',
'draft': 'Your post could not be saved as a draft.'
}
errorMap: {
'draft': 'Your post could not be saved as a draft.',
'published': 'Your post could not be published.'
}
},
success: {
post: {
published: {
'published': 'Your post has been updated.',
'draft': 'Your post has been saved as a draft.'
},
draft: {
'published': 'Your post has been published.',
'draft': 'Your post has been saved as a draft.'
}
}
}
},
initialize: function () {
@ -119,10 +140,10 @@
this.savePost({
status: keys[newIndex]
}).then(function () {
self.reportSaveSuccess(status);
self.reportSaveSuccess(status, prevStatus);
}, function (xhr) {
// Show a notification about the error
self.reportSaveError(xhr, model, status);
self.reportSaveError(xhr, model, status, prevStatus);
});
},
@ -185,7 +206,7 @@
this.savePost({
status: status
}).then(function () {
self.reportSaveSuccess(status);
self.reportSaveSuccess(status, prevStatus);
// Refresh publish button and all relevant controls with updated status.
self.render();
}, function (xhr) {
@ -194,7 +215,7 @@
// Set appropriate button status
self.setActiveStatus(status, self.statusMap[status], prevStatus);
// Show a notification about the error
self.reportSaveError(xhr, model, status);
self.reportSaveError(xhr, model, status, prevStatus);
});
},
@ -217,18 +238,18 @@
return $.Deferred().reject();
},
reportSaveSuccess: function (status) {
reportSaveSuccess: function (status, prevStatus) {
Ghost.notifications.clearEverything();
Ghost.notifications.addItem({
type: 'success',
message: this.notificationMap[status],
message: this.messageMap.success.post[prevStatus][status],
status: 'passive'
});
Ghost.currentView.setEditorDirty(false);
},
reportSaveError: function (response, model, status) {
var message = this.errorMap[status];
reportSaveError: function (response, model, status, prevStatus) {
var message = this.messageMap.errors.post[prevStatus][status];
if (response) {
// Get message from response