From dd7ace7eb3798a4537bd344ba1210b483a9b90f3 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Thu, 13 Aug 2015 20:39:23 +0500 Subject: [PATCH] Reconstructing pets and mounts progress strings Second take, keeping the previous view --- common/locales/en/pets.json | 4 ++-- website/views/options/inventory/mounts.jade | 2 +- website/views/options/inventory/pets.jade | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/locales/en/pets.json b/common/locales/en/pets.json index 1638883f6f..b71cc08173 100644 --- a/common/locales/en/pets.json +++ b/common/locales/en/pets.json @@ -1,12 +1,10 @@ { "pets": "Pets", "petsFound": "Pets Found", - "petsFoundEnding": "Pets Found", "rarePets": "Rare Pets", "questPets": "Quest Pets", "mounts": "Mounts", "mountsTamed": "Mounts Tamed", - "mountsTamedEnding": "Mounts Tamed", "questMounts": "Quest Mounts", "rareMounts": "Rare Mounts", "etherealLion": "Ethereal Lion", @@ -34,11 +32,13 @@ "noFood": "You don't have any food or saddles.", "dropsExplanation": "Get these items faster with gems if you don't want to wait for them to drop when completing a task. Learn more about the drop system.", "beastMasterProgress": "Beast Master Progress", + "stableBeastMasterProgress": "Beast Master Progress: <%= number %> Pets Found", "beastAchievement": "You have earned the \"Beast Master\" Achievement for collecting all the pets!", "beastMasterName": "Beast Master", "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)", "beastMasterText2": " and has released their pets a total of <%= count %> times", "mountMasterProgress": "Mount Master Progress", + "stableMountMasterProgress": "Mount Master Progress: <%= number %> Mounts Tamed", "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!", "mountMasterName": "Mount Master", "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)", diff --git a/website/views/options/inventory/mounts.jade b/website/views/options/inventory/mounts.jade index 52b51d8e04..2db2b8aa12 100644 --- a/website/views/options/inventory/mounts.jade +++ b/website/views/options/inventory/mounts.jade @@ -22,7 +22,7 @@ mixin mountList(source) a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch') .popover-content p=env.t('mattShall', {name: "{{user.profile.name}}"}) - h4= env.t('mountMasterProgress') + ': {{::mountMasterProgress}} ' + env.t('mountsTamedEnding') + h4 {{:: env.t('stableMountMasterProgress', { number: mountMasterProgress }) }} .row: .col-md-12 +mountList(env.Content.dropEggs) .row: .col-md-12 diff --git a/website/views/options/inventory/pets.jade b/website/views/options/inventory/pets.jade index 5665ca6047..e01d89c17c 100644 --- a/website/views/options/inventory/pets.jade +++ b/website/views/options/inventory/pets.jade @@ -22,8 +22,7 @@ mixin petList(source) a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch') .popover-content p=env.t('mattBochText1') - h4=env.t('beastMasterProgress') + ': {{::beastMasterProgress}} ' + env.t('petsFoundEnding') - + h4 {{:: env.t('stableBeastMasterProgress', { number: beastMasterProgress }) }} .row: .col-md-12 +petList(env.Content.dropEggs) .row: .col-md-12