diff --git a/common/script/content.coffee b/common/script/content.coffee index 9d2333f68d..9e8671dba8 100644 --- a/common/script/content.coffee +++ b/common/script/content.coffee @@ -55,6 +55,24 @@ api.mystery = wondercon: {start:'2014-03-24',end:'2014-04-01'} # not really, but the mechanic works _.each api.mystery, (v,k)->v.key = k +equipmentList = + 'weapon': {localeKey: 'weapon', isEquipment: true, needsLowerCase: false} + 'armor' : {localeKey: 'armor', isEquipment: true, needsLowerCase: false} + 'head' : {localeKey: 'headgear', isEquipment: true, needsLowerCase: false} + 'shield' : {localeKey: 'offhand', isEquipment: true, needsLowerCase: false} + 'back' : {localeKey: 'back', isEquipment: true, needsLowerCase: false} + 'body' : {localeKey: 'body', isEquipment: true, needsLowerCase: false} + 'headAccessory' : {localeKey: 'headAccessory', isEquipment: true, needsLowerCase: false} + 'eyewear' : {localeKey: 'eyewear', isEquipment: true, needsLowerCase: false} + 'hatchingPotions' : {localeKey: 'hatchingPotion', isEquipment: false, needsLowerCase: false} + 'eggs' : {localeKey: 'eggSingular', isEquipment: false, needsLowerCase: false} + 'quests' : {localeKey: 'quest', isEquipment: false, needsLowerCase: false} + 'Saddle' : {localeKey: 'foodSaddleText', isEquipment: false, needsLowerCase: true} + get : (key, w = window) -> + string = w.env.t(this.key.localeKey) + if (this.key.needsLowerCase) then string = string.toLowerCase() + string + gear = weapon: base: diff --git a/website/public/js/controllers/rootCtrl.js b/website/public/js/controllers/rootCtrl.js index 0f8c2c37bc..8ae97b3523 100644 --- a/website/public/js/controllers/rootCtrl.js +++ b/website/public/js/controllers/rootCtrl.js @@ -215,22 +215,17 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ var gems = User.user.balance * 4; - var equipmentList = { - 'weapon': window.env.t('weapon'), - 'armor' : window.env.t('armor'), - 'head' : window.env.t('headgear'), - 'shield' : window.env.t('offhand'), - 'back' : window.env.t('back'), - 'body' : window.env.t('body'), - 'headAccessory' : window.env.t('headAccessory'), - 'eyewear' : window.env.t('eyewear'), - 'hatchingPotions' : window.env.t('hatchingPotion'), - 'eggs' : window.env.t('eggSingular'), - 'quests' : window.env.t('quest'), - 'Saddle' : window.env.t('foodSaddleText').toLowerCase() - }; - - var string = (type in equipmentList) ? equipmentList.type : type; + var string = (type in equipmentList) ? equipmentList.get(type, window) : type; + // or + var string = (type in equipmentList) ? (equipmentList.type.needsLowerCase) ? equipmentList.get(type, window).toLowerCase() : equipmentList.get(type, window) : type; + // or + var string; + if (type in equipmentList) { + string = window.env.t(equipmentList.type.localeKey) + if (equipmentList.type.needsLowerCase) string = string.toLowerCase(); + } else { + string = type; + } // var string = (type == 'weapon') ? window.env.t('weapon') : (type == 'armor') ? window.env.t('armor') : (type == 'head') ? window.env.t('headgear') : (type == 'shield') ? window.env.t('offhand') : (type == 'back') ? window.env.t('back') : (type == 'body') ? window.env.t('body') : (type == 'headAccessory') ? window.env.t('headAccessory') : (type == 'eyewear') ? window.env.t('eyewear') : (type == 'hatchingPotions') ? window.env.t('hatchingPotion') : (type == 'eggs') ? window.env.t('eggSingular') : (type == 'quests') ? window.env.t('quest') : (item.key == 'Saddle') ? window.env.t('foodSaddleText').toLowerCase() : type; // FIXME this is ugly but temporary, once the purchase modal is done this will be removed var price = ((((item.specialClass == "wizard") && (item.type == "weapon")) || item.gearSet == "animal") + 1);