diff --git a/common/locales/en/backgrounds.json b/common/locales/en/backgrounds.json index 694617a926..ba1844973f 100644 --- a/common/locales/en/backgrounds.json +++ b/common/locales/en/backgrounds.json @@ -1,6 +1,7 @@ { "backgrounds": "Backgrounds", "background": "Background", + "noBackground": "No Background Selected", "backgrounds062014": "SET 1: Released June 2014", "backgroundBeachText":"Beach", diff --git a/website/client/js/controllers/memberModalCtrl.js b/website/client/js/controllers/memberModalCtrl.js index 0c4c2ba7a7..5878b7ba18 100644 --- a/website/client/js/controllers/memberModalCtrl.js +++ b/website/client/js/controllers/memberModalCtrl.js @@ -22,6 +22,8 @@ habitrpg $scope.formatAnimal = Costume.formatAnimal; + $scope.formatBackground = Costume.formatBackground; + $scope.sendPrivateMessage = function(uuid, message){ if (!message) return; diff --git a/website/client/js/controllers/userCtrl.js b/website/client/js/controllers/userCtrl.js index 4f731f459b..5c1affcfb4 100644 --- a/website/client/js/controllers/userCtrl.js +++ b/website/client/js/controllers/userCtrl.js @@ -18,6 +18,8 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$ $scope.formatAnimal = Costume.formatAnimal; + $scope.formatBackground = Costume.formatBackground; + $scope.allocate = function(stat){ User.allocate({query:{stat:stat}}); } diff --git a/website/client/js/services/costumeServices.js b/website/client/js/services/costumeServices.js index a6897ba0d2..7afdebc46f 100644 --- a/website/client/js/services/costumeServices.js +++ b/website/client/js/services/costumeServices.js @@ -31,9 +31,31 @@ return type == 'pet' ? window.env.t(Content.specialPets[name]) : window.env.t(Content.specialMounts[name]); } } - + + function bgString(set, bg) { + var setString = window.env.t(set); + var setNumber = setString.match(/^[^:]+/)[0].toLowerCase(); + var bgString = Content.backgrounds[set][bg].text(window.env.language.code); + return bgString + " - " + setNumber.charAt(0).toUpperCase() + setNumber.slice(1) + } + + function formatBackground(background) { + var backgrounds = Content.backgrounds; + for (var set in backgrounds) { + for (var bg in backgrounds[set]) { + if (background === bg) { + return bgString(set, bg) + } else { + continue + } + } + } + return window.env.t('noBackground'); + } + return { - formatAnimal: formatAnimal + formatAnimal: formatAnimal, + formatBackground: formatBackground }; } }()); \ No newline at end of file diff --git a/website/views/shared/profiles/stats/background.jade b/website/views/shared/profiles/stats/background.jade index 53ede2e9f3..bcbad244cd 100644 --- a/website/views/shared/profiles/stats/background.jade +++ b/website/views/shared/profiles/stats/background.jade @@ -1,4 +1,4 @@ div h4=env.t('background') table.table.table-striped - +basicRow('background', '{{profile.preferences.background}}') \ No newline at end of file + +basicRow('background', '{{formatBackground(profile.preferences.background)}}') \ No newline at end of file