From d95836b881fbe15f21cd0c8b1fa4bd146c55f836 Mon Sep 17 00:00:00 2001 From: Garrett Scott Date: Mon, 27 Nov 2017 19:08:39 -0700 Subject: [PATCH] Translator minor changes fixes #8917 (#9297) * Updated userItemsNotEnough string * Added a variable to be passed to the deleteSocialAccountText string. This variable name is `magic_word` and is set as DELETE where used * modified incorrectDeletePhrase to use a variable rather than translatable string for the word DELETE. Updated the DELETE-user test and the user api * Changed noSudoAccess from translatable string to static * Changed enterprisePlansEmailSubject from a translatable string to a static string within groupPlans.vue * Fixed test problems with translation fixes * Added no sudo access string to api messages * changed plain string to apiMessage for no sudo access messages --- test/api/v3/integration/coupons/GET-coupons.test.js | 4 ++-- .../coupons/POST-coupons_generate_event.test.js | 3 ++- test/api/v3/integration/user/DELETE-user.test.js | 2 +- .../api/v3/unit/middlewares/ensureAccessRight.test.js | 3 ++- website/client/components/settings/deleteModal.vue | 2 +- website/client/components/static/groupPlans.vue | 11 ++++++++--- website/common/locales/en/front.json | 2 +- website/common/locales/en/groups.json | 1 - website/common/locales/en/npc.json | 2 +- website/common/locales/en/settings.json | 2 +- website/common/locales/en/subscriber.json | 1 - website/server/controllers/api-v3/user.js | 2 +- website/server/libs/apiMessages.js | 1 + website/server/middlewares/ensureAccessRight.js | 3 ++- 14 files changed, 23 insertions(+), 16 deletions(-) diff --git a/test/api/v3/integration/coupons/GET-coupons.test.js b/test/api/v3/integration/coupons/GET-coupons.test.js index 6008d2b1df..fd61ac1a98 100644 --- a/test/api/v3/integration/coupons/GET-coupons.test.js +++ b/test/api/v3/integration/coupons/GET-coupons.test.js @@ -1,8 +1,8 @@ import { generateUser, - translate as t, resetHabiticaDB, } from '../../../../helpers/api-v3-integration.helper'; +import apiMessages from '../../../../../website/server/libs/apiMessages'; describe('GET /coupons/', () => { let user; @@ -19,7 +19,7 @@ describe('GET /coupons/', () => { await expect(user.get('/coupons')).to.eventually.be.rejected.and.eql({ code: 401, error: 'NotAuthorized', - message: t('noSudoAccess'), + message: apiMessages('noSudoAccess'), }); }); diff --git a/test/api/v3/integration/coupons/POST-coupons_generate_event.test.js b/test/api/v3/integration/coupons/POST-coupons_generate_event.test.js index 09e4c76391..12730c8296 100644 --- a/test/api/v3/integration/coupons/POST-coupons_generate_event.test.js +++ b/test/api/v3/integration/coupons/POST-coupons_generate_event.test.js @@ -4,6 +4,7 @@ import { resetHabiticaDB, } from '../../../../helpers/api-v3-integration.helper'; import couponCode from 'coupon-code'; +import apiMessages from '../../../../../website/server/libs/apiMessages'; describe('POST /coupons/generate/:event', () => { let user; @@ -25,7 +26,7 @@ describe('POST /coupons/generate/:event', () => { await expect(user.post('/coupons/generate/aaa')).to.eventually.be.rejected.and.eql({ code: 401, error: 'NotAuthorized', - message: t('noSudoAccess'), + message: apiMessages('noSudoAccess'), }); }); diff --git a/test/api/v3/integration/user/DELETE-user.test.js b/test/api/v3/integration/user/DELETE-user.test.js index a9def6c902..d11fa679ae 100644 --- a/test/api/v3/integration/user/DELETE-user.test.js +++ b/test/api/v3/integration/user/DELETE-user.test.js @@ -308,7 +308,7 @@ describe('DELETE /user', () => { })).to.eventually.be.rejected.and.eql({ code: 401, error: 'NotAuthorized', - message: t('incorrectDeletePhrase'), + message: t('incorrectDeletePhrase', {magicWord: 'DELETE'}), }); }); diff --git a/test/api/v3/unit/middlewares/ensureAccessRight.test.js b/test/api/v3/unit/middlewares/ensureAccessRight.test.js index f4cf909a95..4421b82a3e 100644 --- a/test/api/v3/unit/middlewares/ensureAccessRight.test.js +++ b/test/api/v3/unit/middlewares/ensureAccessRight.test.js @@ -7,6 +7,7 @@ import { import i18n from '../../../../../website/common/script/i18n'; import { ensureAdmin, ensureSudo } from '../../../../../website/server/middlewares/ensureAccessRight'; import { NotAuthorized } from '../../../../../website/server/libs/errors'; +import apiMessages from '../../../../../website/server/libs/apiMessages'; describe('ensure access middlewares', () => { let res, req, next; @@ -42,7 +43,7 @@ describe('ensure access middlewares', () => { ensureSudo(req, res, next); - expect(next).to.be.calledWith(new NotAuthorized(i18n.t('noSudoAccess'))); + expect(next).to.be.calledWith(new NotAuthorized(apiMessages('noSudoAccess'))); }); it('passes when user is a sudo user', () => { diff --git a/website/client/components/settings/deleteModal.vue b/website/client/components/settings/deleteModal.vue index bd5ea485ac..97aa8095fe 100644 --- a/website/client/components/settings/deleteModal.vue +++ b/website/client/components/settings/deleteModal.vue @@ -18,7 +18,7 @@ .social-delete(v-if='!user.auth.local.email') h4 {{ $t('deleteAccount') }} .modal-body - p {{ $t('deleteSocialAccountText') }} + p {{ $t('deleteSocialAccountText', {magicWord: 'DELETE'}) }} br .row .col-md-6 diff --git a/website/client/components/static/groupPlans.vue b/website/client/components/static/groupPlans.vue index 8daef613a8..5d1d510506 100644 --- a/website/client/components/static/groupPlans.vue +++ b/website/client/components/static/groupPlans.vue @@ -17,7 +17,7 @@ span {{ $t('enterprisePlansDescription') }} .row.row-margin // TODO - a.btn.btn-primary.btn-lg.btn-block(:href="'mailto:vicky@habitica.com?subject=' + $t('enterprisePlansEmailSubject')") {{ $t('enterprisePlansButton') }} + a.btn.btn-primary.btn-lg.btn-block(:href="'mailto:vicky@habitica.com?subject=' + enterprisePlansEmailSubject") {{ $t('enterprisePlansButton') }} br @@ -36,11 +36,16 @@