diff --git a/public/js/services/guideServices.js b/public/js/services/guideServices.js index 3318ef333c..98879e040b 100644 --- a/public/js/services/guideServices.js +++ b/public/js/services/guideServices.js @@ -19,7 +19,7 @@ angular.module('guideServices', []). { element: ".main-herobox", title: window.env.t('welcomeHabit'), - content: window.env.t('welcomeHabitT1') + " Açai du Bleu Bèrie, " + window.env.t('welcomeHabitT2'), + content: window.env.t('welcomeHabitT1') + " Justin, " + window.env.t('welcomeHabitT2'), }, { element: ".main-herobox", title: window.env.t('yourAvatar'), diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 2a7da4ead4..c004d1b9ef 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -87,7 +87,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') .popover.static-popover.fade.right.in .arrow h3.popover-title - a(target='_blank', href='http://www.kickstarter.com/profile/523661924') Sir Lemon von Grapefruit von Tangerine + a(target='_blank', href='http://www.kickstarter.com/profile/523661924')=env.t('alexander') .popover-content p=env.t('welcomeMarket') p diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index a4411173b8..ee38d05564 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -7,7 +7,7 @@ script(type='text/ng-template', id='partials/options.inventory.mounts.html') .popover.static-popover.fade.right.in .arrow h3.popover-title - a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Blade Wheatgrassington III + a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch') .popover-content p=env.t('mattShall', {name: "{{user.profile.name}}"}) h4= '{{Shared.countMounts(null,User.user.items.mounts) || 0}} / {{totalMounts}} ' + env.t('mountsTamed') @@ -38,7 +38,7 @@ script(type='text/ng-template', id='partials/options.inventory.pets.html') .popover.static-popover.fade.right.in .arrow h3.popover-title - a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Blade Wheatgrassington III + a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch') .popover-content p =env.t('mattBochText1') + ' ' diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 7eab27aa33..0b654976e6 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -9,7 +9,7 @@ .popover.static-popover.fade.right.in .arrow h3.popover-title - a(target='_blank', href='http://www.kickstarter.com/profile/2014640723') Turnip McRadishwhacker + a(target='_blank', href='http://www.kickstarter.com/profile/2014640723')=env.t('daniel') .popover-content =env.t('danielText') div diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index ac1b1ca010..153c535756 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -8,51 +8,48 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember( // Mount Body span(ng-if='profile.items.currentMount', class='Mount_Body_{{profile.items.currentMount}}') - span(class='april_fools_{{profile.stats.class}}') + span(ng-if='profile.stats.buffs.snowball') + span.snowman + span(ng-if='!profile.stats.buffs.snowball') + // Back Accessory + span(class='{{profile.items.gear.equipped.back}}', ng-if='!profile.preferences.costume') + span(class='{{profile.items.gear.costume.back}}', ng-if='profile.preferences.costume') - //- - span(ng-if='profile.stats.buffs.snowball') - span.snowman - span(ng-if='!profile.stats.buffs.snowball') - // Back Accessory - span(class='{{profile.items.gear.equipped.back}}', ng-if='!profile.preferences.costume') - span(class='{{profile.items.gear.costume.back}}', ng-if='profile.preferences.costume') + // Avatar + span(class='skin_{{profile.preferences.skin}}') - // Avatar - span(class='skin_{{profile.preferences.skin}}') + // Shirt + span(class='{{profile.preferences.size}}_shirt_{{profile.preferences.shirt}}') - // Shirt - span(class='{{profile.preferences.size}}_shirt_{{profile.preferences.shirt}}') + // Armor + span(class='{{profile.preferences.size}}_{{profile.items.gear.equipped.armor}}', ng-if='!profile.preferences.costume') + span(class='{{profile.preferences.size}}_{{profile.items.gear.costume.armor}}', ng-if='profile.preferences.costume') - // Armor - span(class='{{profile.preferences.size}}_{{profile.items.gear.equipped.armor}}', ng-if='!profile.preferences.costume') - span(class='{{profile.preferences.size}}_{{profile.items.gear.costume.armor}}', ng-if='profile.preferences.costume') + // Hair + span(class='head_0') + span(class='hair_base_{{profile.preferences.hair.base}}_{{profile.preferences.hair.color}}') + span(class='hair_bangs_{{profile.preferences.hair.bangs}}_{{profile.preferences.hair.color}}') + span(class='hair_mustache_{{profile.preferences.hair.mustache}}_{{profile.preferences.hair.color}}') + span(class='hair_beard_{{profile.preferences.hair.beard}}_{{profile.preferences.hair.color}}') - // Hair - span(class='head_0') - span(class='hair_base_{{profile.preferences.hair.base}}_{{profile.preferences.hair.color}}') - span(class='hair_bangs_{{profile.preferences.hair.bangs}}_{{profile.preferences.hair.color}}') - span(class='hair_mustache_{{profile.preferences.hair.mustache}}_{{profile.preferences.hair.color}}') - span(class='hair_beard_{{profile.preferences.hair.beard}}_{{profile.preferences.hair.color}}') + // Helm + span(class='{{profile.items.gear.equipped.head}}', ng-if='!profile.preferences.costume') + span(class='{{profile.items.gear.costume.head}}', ng-if='profile.preferences.costume') - // Helm - span(class='{{profile.items.gear.equipped.head}}', ng-if='!profile.preferences.costume') - span(class='{{profile.items.gear.costume.head}}', ng-if='profile.preferences.costume') + // Head Accessory + span(class='{{profile.items.gear.equipped.headAccessory}}', ng-if='!profile.preferences.costume') + span(class='{{profile.items.gear.costume.headAccessory}}', ng-if='profile.preferences.costume') - // Head Accessory - span(class='{{profile.items.gear.equipped.headAccessory}}', ng-if='!profile.preferences.costume') - span(class='{{profile.items.gear.costume.headAccessory}}', ng-if='profile.preferences.costume') + // Flower + span(class='hair_flower_{{profile.preferences.hair.flower}}') - // Flower - span(class='hair_flower_{{profile.preferences.hair.flower}}') + // Shield + span(class='{{profile.items.gear.equipped.shield}}', ng-if='!profile.preferences.costume') + span(class='{{profile.items.gear.costume.shield}}', ng-if='profile.preferences.costume') - // Shield - span(class='{{profile.items.gear.equipped.shield}}', ng-if='!profile.preferences.costume') - span(class='{{profile.items.gear.costume.shield}}', ng-if='profile.preferences.costume') - - // Weapon - span(class='{{profile.items.gear.equipped.weapon}}', ng-if='!profile.preferences.costume') - span(class='{{profile.items.gear.costume.weapon}}', ng-if='profile.preferences.costume') + // Weapon + span(class='{{profile.items.gear.equipped.weapon}}', ng-if='!profile.preferences.costume') + span(class='{{profile.items.gear.costume.weapon}}', ng-if='profile.preferences.costume') // Mount Head diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade index b0c625877b..11544f9e0d 100644 --- a/views/shared/modals/new-stuff.jade +++ b/views/shared/modals/new-stuff.jade @@ -10,7 +10,7 @@ script(type='text/ng-template', id='modals/newStuff.html') .popover.static-popover.fade.right.in.wide-popover .arrow h3.popover-title - a(target='_blank', href='https://twitter.com/Mihakuu') Mrs. Carrot the Carroty Carrot + a(target='_blank', href='https://twitter.com/Mihakuu') Bailey .popover-content table.table.table-striped