diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json index faa9256d9d..eacd8e0ef8 100644 --- a/common/locales/en/settings.json +++ b/common/locales/en/settings.json @@ -116,5 +116,6 @@ "apply": "Apply", "resubscribe": "Resubscribe", "promoCode": "Promo Code", + "promoCodeApplied": "Promo Code Applied! Check your inventory", "promoPlaceholder": "Enter Promotion Code" } diff --git a/website/public/js/app.js b/website/public/js/app.js index 2f8e2fd512..94bcb81b3c 100644 --- a/website/public/js/app.js +++ b/website/public/js/app.js @@ -216,9 +216,9 @@ window.habitrpg = angular.module('habitrpg', url: "/export", templateUrl: "partials/options.settings.export.html" }) - .state('options.settings.coupon', { - url: "/coupon", - templateUrl: "partials/options.settings.coupon.html" + .state('options.settings.promo', { + url: "/promo", + templateUrl: "partials/options.settings.promo.html" }) .state('options.settings.subscription', { url: "/subscription", diff --git a/website/public/js/controllers/settingsCtrl.js b/website/public/js/controllers/settingsCtrl.js index 6ba382bb44..5c83b5756c 100644 --- a/website/public/js/controllers/settingsCtrl.js +++ b/website/public/js/controllers/settingsCtrl.js @@ -20,7 +20,7 @@ habitrpg.controller('SettingsCtrl', var mapPrefToEmailString = { 'importantAnnouncements': 'inactivityEmails' }; - + // If ?unsubFrom param is passed with valid email type, // automatically unsubscribe users from that email and // show an alert @@ -42,7 +42,7 @@ habitrpg.controller('SettingsCtrl', User.set({"preferences.stickyHeader":false}); $rootScope.$on('userSynced', function(){ window.location.reload(); - }); + }); } } @@ -144,7 +144,7 @@ habitrpg.controller('SettingsCtrl', $http.post(ApiUrl.get() + '/api/v2/user/coupon/' + code).success(function(res,code){ if (code!==200) return; User.sync(); - Notification.text('Coupon applied! Check your inventory'); + Notification.text(env.t('promoCodeApplied')); }); } $scope.generateCodes = function(codes){ diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index 5df04ed24c..c25d4a054f 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -9,8 +9,8 @@ script(id='partials/options.settings.html', type="text/ng-template") li(ng-class="{ active: $state.includes('options.settings.export') }") a(ui-sref='options.settings.export') =env.t('dataExport') - li(ng-class="{ active: $state.includes('options.settings.coupon') }") - a(ui-sref='options.settings.coupon') + li(ng-class="{ active: $state.includes('options.settings.promo') }") + a(ui-sref='options.settings.promo') =env.t('promoCode') li(ng-class="{ active: $state.includes('options.settings.subscription') }") a(ui-sref='options.settings.subscription')=env.t('subscription') @@ -154,11 +154,11 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') a.btn.btn-danger(ng-click='openModal("reset", {controller:"SettingsCtrl"})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('resetAccPop'))= env.t('resetAccount') a.btn.btn-danger(ng-click='openModal("delete", {controller:"SettingsCtrl"})', popover-trigger='mouseenter', popover=env.t('deleteAccPop'))= env.t('deleteAccount') -script(type='text/ng-template', id='partials/options.settings.coupon.html') +script(type='text/ng-template', id='partials/options.settings.promo.html') .container-fluid .row .col-md-6 - h2= env.t('promoCode') + h2=env.t('promoCode') form.form-inline(role='form',ng-submit='enterCoupon(_couponCode)') input.form-control(type='text', ng-model='_couponCode', placeholder=env.t('promoPlaceholder')) button.btn.btn-primary(type='submit')= env.t('submit') diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade index 3252413ee3..6f7cd61fd1 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -243,7 +243,7 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}') li a(ui-sref='options.settings.export')=env.t('export') li - a(ui-sref='options.settings.coupon')=env.t('promoCode') + a(ui-sref='options.settings.promo')=env.t('promoCode') li a(ui-sref='options.settings.subscription')=env.t('subscription') li