diff --git a/src/cloudron.js b/src/cloudron.js index 9f0ec4e18..955fbcc11 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -256,7 +256,7 @@ async function getLanguage() { async function setLanguage(language) { assert.strictEqual(typeof language, 'string'); - const languages = await translation.getLanguages(); + const languages = await translation.listLanguages(); if (languages.indexOf(language) === -1) throw new BoxError(BoxError.BAD_FIELD, 'Language not found'); await settings.set(settings.LANGUAGE_KEY, language); diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js index f5cd7db77..06735187b 100644 --- a/src/routes/cloudron.js +++ b/src/routes/cloudron.js @@ -13,7 +13,7 @@ exports = module.exports = { getPlatformStatus, - getLanguages, + listLanguages, getLanguage, setLanguage, @@ -157,8 +157,8 @@ async function prepareDashboardDomain(req, res, next) { next(new HttpSuccess(202, { taskId })); } -async function getLanguages(req, res, next) { - const [error, languages] = await safe(translation.getLanguages()); +async function listLanguages(req, res, next) { + const [error, languages] = await safe(translation.listLanguages()); if (error) return next(new BoxError.toHttpError(error)); next(new HttpSuccess(200, { languages })); diff --git a/src/server.js b/src/server.js index 02fe62d92..430b0323f 100644 --- a/src/server.js +++ b/src/server.js @@ -98,7 +98,6 @@ async function initializeExpressSync() { router.post('/api/v1/cloudron/activate', json, routes.provision.setupTokenAuth, routes.provision.activate); router.get ('/api/v1/cloudron/status', routes.provision.getStatus); router.get ('/api/v1/cloudron/block_devices', routes.provision.getBlockDevices); - router.get ('/api/v1/cloudron/languages', routes.cloudron.getLanguages); router.get ('/api/v1/cloudron/avatar', routes.branding.getCloudronAvatar); // this is a public alias for /api/v1/branding/cloudron_avatar // login/logout routes @@ -113,6 +112,7 @@ async function initializeExpressSync() { router.get ('/api/v1/platform_status', token, authorizeUser, routes.cloudron.getPlatformStatus); // cloudron routes + router.get ('/api/v1/cloudron/languages', routes.cloudron.listLanguages); router.get ('/api/v1/cloudron/language', token, authorizeAdmin, routes.cloudron.getLanguage); router.post('/api/v1/cloudron/language', json, token, authorizeAdmin, routes.cloudron.setLanguage); router.get ('/api/v1/cloudron/time_zone', token, authorizeAdmin, routes.cloudron.getTimeZone); diff --git a/src/translation.js b/src/translation.js index 21ec749b9..2a4296d7d 100644 --- a/src/translation.js +++ b/src/translation.js @@ -3,7 +3,7 @@ exports = module.exports = { translate, getTranslations, - getLanguages + listLanguages }; const assert = require('assert'), @@ -65,13 +65,13 @@ async function getTranslations() { return { translations, fallback }; } -async function getLanguages() { +async function listLanguages() { // we always return english to avoid dashboard breakage let languages = ['en']; const [error, result] = await safe(fs.promises.readdir(TRANSLATION_FOLDER)); if (error) { - debug('getLanguages: Failed to list translations. %o', error); + debug('listLanguages: Failed to list translations. %o', error); return languages; }