mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-10 23:36:14 -05:00
parent
ce7d731d8f
commit
f5ef8dbb52
10 changed files with 17 additions and 12 deletions
|
@ -27,7 +27,7 @@ module.exports = function adminController(req, res) {
|
||||||
location: 'upgrade.new-version-available',
|
location: 'upgrade.new-version-available',
|
||||||
dismissible: false,
|
dismissible: false,
|
||||||
message: i18n.t('notices.controllers.newVersionAvailable',
|
message: i18n.t('notices.controllers.newVersionAvailable',
|
||||||
{version: updateVersion, link: '<a href="http://support.ghost.org/how-to-upgrade/" target="_blank">Click here</a>'})};
|
{version: updateVersion, link: '<a href="https://docs.ghost.org/v1.0.0/docs/installing-ghost-via-the-cli" target="_blank">Click here</a>'})};
|
||||||
|
|
||||||
return api.notifications.browse({context: {internal: true}}).then(function then(results) {
|
return api.notifications.browse({context: {internal: true}}).then(function then(results) {
|
||||||
if (!_.some(results.notifications, {message: notification.message})) {
|
if (!_.some(results.notifications, {message: notification.message})) {
|
||||||
|
|
|
@ -536,7 +536,7 @@ authentication = {
|
||||||
logging.error(new errors.EmailError({
|
logging.error(new errors.EmailError({
|
||||||
err: error,
|
err: error,
|
||||||
context: i18n.t('errors.api.authentication.unableToSendWelcomeEmail'),
|
context: i18n.t('errors.api.authentication.unableToSendWelcomeEmail'),
|
||||||
help: i18n.t('errors.api.authentication.checkEmailConfigInstructions', {url: 'http://support.ghost.org/mail/'})
|
help: i18n.t('errors.api.authentication.checkEmailConfigInstructions', {url: 'http://docs.ghost.org/v1.0.0/docs/mail-configuration-on-self-hosted-version-of-ghost'})
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
|
|
|
@ -29,7 +29,7 @@ function sendMail(object) {
|
||||||
message: [
|
message: [
|
||||||
i18n.t('warnings.index.unableToSendEmail'),
|
i18n.t('warnings.index.unableToSendEmail'),
|
||||||
i18n.t('common.seeLinkForInstructions',
|
i18n.t('common.seeLinkForInstructions',
|
||||||
{link: '<a href=\'http://support.ghost.org/mail\' target=\'_blank\'>http://support.ghost.org/mail</a>'})
|
{link: '<a href=\'https://docs.ghost.org/v1.0.0/docs/mail-configuration-on-self-hosted-version-of-ghost\' target=\'_blank\'>Checkout our mail configuration docs!</a>'})
|
||||||
].join(' ')
|
].join(' ')
|
||||||
}]},
|
}]},
|
||||||
{context: {internal: true}}
|
{context: {internal: true}}
|
||||||
|
|
|
@ -12,7 +12,7 @@ module.exports = function registerHelpers(ghost) {
|
||||||
flagKey: 'subscribers',
|
flagKey: 'subscribers',
|
||||||
flagName: 'Subscribers',
|
flagName: 'Subscribers',
|
||||||
helperName: 'subscribe_form',
|
helperName: 'subscribe_form',
|
||||||
helpUrl: 'http://support.ghost.org/subscribers-beta/'
|
helpUrl: 'https://help.ghost.org/hc/en-us/articles/224089787-Subscribers-Beta'
|
||||||
}, function executeHelper() {
|
}, function executeHelper() {
|
||||||
return require('./subscribe_form').apply(self, args);
|
return require('./subscribe_form').apply(self, args);
|
||||||
});
|
});
|
||||||
|
|
|
@ -23,9 +23,9 @@ module.exports.check = function healthCheck() {
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new errors.DatabaseVersionError({
|
throw new errors.DatabaseVersionError({
|
||||||
message: 'Your database version is not compatible with Ghost 1.0.0 Alpha (master branch)',
|
message: 'Your database version is not compatible with Ghost 1.0.0 Beta (master branch)',
|
||||||
context: 'Want to keep your DB? Use Ghost < 1.0.0 or the "stable" branch. Otherwise please delete your DB and restart Ghost.',
|
context: 'Want to keep your DB? Use Ghost < 1.0.0 or the "stable" branch. Otherwise please delete your DB and restart Ghost.',
|
||||||
help: 'More information on the Ghost 1.0.0 Alpha at https://support.ghost.org/v1-0-alpha'
|
help: 'More information on the Ghost 1.0.0 Alpha at https://docs.ghost.org/v1.0.0/docs/alpha-and-beta-versions'
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
|
|
|
@ -36,7 +36,7 @@ function makeRequest(reqOptions, reqPayload) {
|
||||||
logging.error(new errors.GhostError({
|
logging.error(new errors.GhostError({
|
||||||
err: err,
|
err: err,
|
||||||
context: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.error'),
|
context: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.error'),
|
||||||
help: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.help', {url: 'http://support.ghost.org'})
|
help: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.help', {url: 'http://docs.ghost.org'})
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ function ping(post) {
|
||||||
err: err,
|
err: err,
|
||||||
message: err.message,
|
message: err.message,
|
||||||
context: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.error'),
|
context: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.error'),
|
||||||
help: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.help', {url: 'http://support.ghost.org'})
|
help: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.help', {url: 'http://docs.ghost.org'})
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -149,7 +149,7 @@ module.exports = function getLabsWrapper() {
|
||||||
flagKey: 'publicAPI',
|
flagKey: 'publicAPI',
|
||||||
flagName: 'Public API',
|
flagName: 'Public API',
|
||||||
helperName: 'get',
|
helperName: 'get',
|
||||||
helpUrl: 'http://support.ghost.org/public-api-beta/',
|
helpUrl: 'https://help.ghost.org/hc/en-us/articles/115000301672-Public-API-Beta',
|
||||||
async: true
|
async: true
|
||||||
}, function executeHelper() {
|
}, function executeHelper() {
|
||||||
return get.apply(self, args);
|
return get.apply(self, args);
|
||||||
|
|
|
@ -47,7 +47,7 @@ function updateCheckError(err) {
|
||||||
);
|
);
|
||||||
|
|
||||||
err.context = i18n.t('errors.update-check.checkingForUpdatesFailed.error');
|
err.context = i18n.t('errors.update-check.checkingForUpdatesFailed.error');
|
||||||
err.help = i18n.t('errors.update-check.checkingForUpdatesFailed.help', {url: 'http://support.ghost.org'});
|
err.help = i18n.t('errors.update-check.checkingForUpdatesFailed.help', {url: 'https://docs.ghost.org/v1.0.0'});
|
||||||
logging.error(err);
|
logging.error(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,9 @@ var should = require('should'),
|
||||||
sinon = require('sinon'),
|
sinon = require('sinon'),
|
||||||
Promise = require('bluebird'),
|
Promise = require('bluebird'),
|
||||||
|
|
||||||
// Stuff we are testing
|
// Stuff we are testing
|
||||||
helpers = require('../../../server/helpers'),
|
helpers = require('../../../server/helpers'),
|
||||||
|
models = require('../../../server/models'),
|
||||||
api = require('../../../server/api'),
|
api = require('../../../server/api'),
|
||||||
|
|
||||||
labs = require('../../../server/utils/labs'),
|
labs = require('../../../server/utils/labs'),
|
||||||
|
@ -13,6 +14,10 @@ var should = require('should'),
|
||||||
describe('{{#get}} helper', function () {
|
describe('{{#get}} helper', function () {
|
||||||
var fn, inverse, labsStub;
|
var fn, inverse, labsStub;
|
||||||
|
|
||||||
|
before(function () {
|
||||||
|
models.init();
|
||||||
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
beforeEach(function () {
|
||||||
fn = sandbox.spy();
|
fn = sandbox.spy();
|
||||||
inverse = sandbox.spy();
|
inverse = sandbox.spy();
|
||||||
|
@ -41,7 +46,7 @@ describe('{{#get}} helper', function () {
|
||||||
'string',
|
'string',
|
||||||
'<script>console.error("The {{get}} helper is not available. ' +
|
'<script>console.error("The {{get}} helper is not available. ' +
|
||||||
'The Public API labs flag must be enabled if you wish to use the {{get}} helper. ' +
|
'The Public API labs flag must be enabled if you wish to use the {{get}} helper. ' +
|
||||||
'See http://support.ghost.org/public-api-beta/");</script>'
|
'See https://help.ghost.org/hc/en-us/articles/115000301672-Public-API-Beta");</script>'
|
||||||
);
|
);
|
||||||
|
|
||||||
done();
|
done();
|
||||||
|
|
Loading…
Add table
Reference in a new issue