From 21ca49345d8ed02b06356bcdab5f0654a98dd60e Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 3 Dec 2014 22:19:57 -0600 Subject: [PATCH 1/3] Moved time travelers and hourglass strings to shared --- views/options/inventory/inventory.jade | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 5fed87ba1d..39c8f06c7d 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -37,13 +37,12 @@ script(type='text/ng-template', id='partials/options.inventory.timetravelers.htm .col-md-10 .popover.static-popover.fade.right.in .arrow - h3.popover-title Mysterious Time Travelers + h3.popover-title=env.t('timeTravelersTitle') .popover-content .pull-right span.inventory_special_trinket.inline-gems b x{{user.purchased.plan.consecutive.trinkets}} - p We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets? - + p=env.t("timeTravelersPopover") .col-md-12 li.customize-menu.inventory-gear menu.pets-menu(label='{{::set.text}}', ng-repeat='set in Content.timeTravelerStore(user.items.gear.owned)') @@ -110,7 +109,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') .badge.badge-info.stack-count {{user.purchased.plan.mysteryItems.length}} div(ng-if='user.purchased.plan.consecutive.trinkets') - button.customize-option(popover="Mystic Hourglass allow you to purchase previous months' subscriber sets.", popover-trigger='mouseenter', popover-placement='right', class='inventory_special_trinket', ng-click="$state.go('options.inventory.timetravelers')") + button.customize-option(popover=env.t('mysticHourglassPopover'), popover-trigger='mouseenter', popover-placement='right', class='inventory_special_trinket', ng-click="$state.go('options.inventory.timetravelers')") .badge.badge-info.stack-count {{user.purchased.plan.consecutive.trinkets}} .col-md-6 From 532f5d1c53bee4b25be341ef1919895d1d86659c Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 3 Dec 2014 22:46:16 -0600 Subject: [PATCH 2/3] Converted strings to be able to use links --- views/options/inventory/inventory.jade | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 39c8f06c7d..b0e165416e 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -27,10 +27,14 @@ script(type='text/ng-template', id='partials/options.inventory.timetravelers.htm .col-md-10 .popover.static-popover.fade.right.in .arrow - h3.popover-title Tyler and Vicky + h3.popover-title=env.t('timeTravelersTitleNoSub') .popover-content - p You'll need a Mystic Hourglass to summon the mysterious Time Travelers! Subscribers earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future. - + p + =env.t('timeTravelersPopoverNoSub1') + ' ' + | + =env.t('timeTravelersPopoverNoSub2') + + = ' ' + env.t('timeTravelersPopoverNoSub3') .row.stable(ng-if='user.purchased.plan.consecutive.trinkets > 0') .col-md-2 .npc_timetravelers_active @@ -42,7 +46,13 @@ script(type='text/ng-template', id='partials/options.inventory.timetravelers.htm .pull-right span.inventory_special_trinket.inline-gems b x{{user.purchased.plan.consecutive.trinkets}} - p=env.t("timeTravelersPopover") + p + =env.t('timeTravelersPopover1') + ' ' + | + =env.t('timeTravelersPopover2') + | + =env.t('timeTravelersPopover3') + .col-md-12 li.customize-menu.inventory-gear menu.pets-menu(label='{{::set.text}}', ng-repeat='set in Content.timeTravelerStore(user.items.gear.owned)') From 5986643f1ece4138ec113e7bdb01571709860ba7 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Thu, 4 Dec 2014 20:03:31 -0600 Subject: [PATCH 3/3] Corrected strings so they only use one variable --- views/options/inventory/inventory.jade | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index b0e165416e..d72cbf90a2 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -29,12 +29,7 @@ script(type='text/ng-template', id='partials/options.inventory.timetravelers.htm .arrow h3.popover-title=env.t('timeTravelersTitleNoSub') .popover-content - p - =env.t('timeTravelersPopoverNoSub1') + ' ' - | - =env.t('timeTravelersPopoverNoSub2') - - = ' ' + env.t('timeTravelersPopoverNoSub3') + p!=env.t('timeTravelersPopoverNoSub', {linkStart: "", linkEnd: ""}) .row.stable(ng-if='user.purchased.plan.consecutive.trinkets > 0') .col-md-2 .npc_timetravelers_active @@ -46,12 +41,7 @@ script(type='text/ng-template', id='partials/options.inventory.timetravelers.htm .pull-right span.inventory_special_trinket.inline-gems b x{{user.purchased.plan.consecutive.trinkets}} - p - =env.t('timeTravelersPopover1') + ' ' - | - =env.t('timeTravelersPopover2') - | - =env.t('timeTravelersPopover3') + p!=env.t('timeTravelersPopover', {linkStart: "", linkEnd: ""}) .col-md-12 li.customize-menu.inventory-gear