Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop

common/locales/en/pets.json

@@ -32,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. <a href=\"http://habitica.wikia.com/wiki/Drops\">Learn more about the drop system.</a>",
     "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!)",

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('mountsTamed')
+        h4 {{:: env.t('stableMountMasterProgress', { number: mountMasterProgress }) }}
   .row: .col-md-12
     +mountList(env.Content.dropEggs)
   .row: .col-md-12

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('petsFound')
-
+        h4 {{:: env.t('stableBeastMasterProgress', { number: beastMasterProgress }) }}
   .row: .col-md-12
     +petList(env.Content.dropEggs)
   .row: .col-md-12