Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Merge pull request #6816 from ErisDS/subscribe-error-message

Browse source 
Subscribers: Error message improvements
This commit is contained in:
Sebastian Gierlinger 2016-05-12 18:00:36 +02:00
commit 5579509e05
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/server/api/subscribers.js
View file

@ -105,12 +105,12 @@ subscribers = {
// we don't expose this information
return Promise.resolve(subscriber);
} else if (subscriber) {
return Promise.reject(new errors.ValidationError(i18n.t('errors.api.subscribers.subscriberAlreadyExist')));
return Promise.reject(new errors.ValidationError(i18n.t('errors.api.subscribers.subscriberAlreadyExists')));
}
return dataProvider.Subscriber.add(options.data.subscribers[0], _.omit(options, ['data'])).catch(function (error) {
if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
return Promise.reject(new errors.ValidationError(i18n.t('errors.api.subscribers.subscriberAlreadyExist')));
return Promise.reject(new errors.ValidationError(i18n.t('errors.api.subscribers.subscriberAlreadyExists')));
}
return Promise.reject(error);

8
core/server/translations/en.json
View file

@ -333,12 +333,12 @@
"couldNotGenerateSlug": "Could not generate slug.",
"unknownSlugType": "Unknown slug type '{type}'."
},
"tags": {
"tagNotFound": "Tag not found."
},
"subscribers": {
"subscriberNotFound": "Subscriber not found.",
"subscriberAlreadyExist": "Email already exist."
"subscriberAlreadyExists": "Email address is already subscribed."
},
"tags": {
"tagNotFound": "Tag not found."
},
"themes": {
"noPermissionToBrowseThemes": "You do not have permission to browse themes.",