Merge pull request #2550 from HabitRPG/paglias/translations-refactoring

Refactor translations

views/options/inventory/inventory.jade

@@ -138,7 +138,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
                   |  {{Content.food.Saddle.value}}
                   span.Pet_Currency_Gem1x.inline-gems
               div
-                button.customize-option(popover=env.t('fortifyPop'), popover-title=env.t('rerollName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true', class='inventory_special_fortify')
+                button.customize-option(popover=env.t('fortifyPop'), popover-title=env.t('fortifyName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true', class='inventory_special_fortify')
                 p
                   | 4
                   span.Pet_Currency_Gem1x.inline-gems

views/options/profile.jade

@@ -85,7 +85,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
           button.btn.btn-small.btn-primary(ng-hide='user.purchased.hair.mustache.1 && user.purchased.hair.mustache.2 && user.purchased.hair.beard.1 && user.purchased.hair.beard.2 && user.purchased.hair.beard.3', ng-click='unlock("hair.mustache.1,hair.mustache.2,hair.beard.1,hair.beard.2,hair.beard.3")')!= env.t('unlockset5') + ' <span class="Pet_Currency_Gem1x inline-gems"/>'
 
     .span4
-        h3=env.t('skin')
+        h3=env.t('bodyskin')
         small
           | 2 <span class="Pet_Currency_Gem1x inline-gems"/> /
           = ' ' + env.t('locked')

views/options/settings.jade

@@ -30,7 +30,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
       h4=env.t('language')
       select(ng-model='language.code', ng-options='lang.code as lang.name for lang in avalaibleLanguages', ng-change='changeLanguage()')
       hr
-      h4=env.t('hideHeader')
+      h4=env.t('misc')
       label.checkbox
         input(type='checkbox', ng-click='set({"preferences.hideHeader":user.preferences.hideHeader?false:true})', ng-checked='user.preferences.hideHeader!==true')
         =env.t('showHeader')

views/options/social/create-group.jade

@@ -1,7 +1,9 @@
 form.form-horizontal(ng-submit='create(newGroup)')
   .control-group.whatever-options
     .control-group
-      label.control-label(for='new-group-name') {{text}} Name
+      label.control-label(for='new-group-name') 
+       | {{text}} 
+       =env.t('name')
       .controls
         input#new-group-name.input-medium.option-content(required, type='text', placeholder='{{text}} Name', ng-model='newGroup.name')
     .control-group

views/options/social/group.jade

@@ -168,7 +168,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
             .popover-content
               markdown(ng-model='group.leaderMessage')
     div(ng-controller='ChatCtrl')
-      h3 Chat
+      h3=env.t('chat')
       include ./chat-box
       include ../../shared/formatting-help
 

views/options/social/tavern.jade

@@ -68,35 +68,35 @@
               a.label.label-contributor-1(ng-click='toggleUserTier($event)')=env.t('friendBadge')
               div(style='display:none;')
                 p
-                  != '<span class="achievement achievement-firefox"></span> ' + env.t('friendText') + '<strong> ' + env.t('first') + '</strong> ' + env.t('friend1Text') + '<strong> ' + env.t('2gems') + '</strong>.'
+                  != '<span class="achievement achievement-firefox"></span> ' + env.t('friendText') + '<strong> ' + env.t('first') + '</strong> ' + env.t('friend1Text') + '<strong> 2' + env.t('gems') + '</strong>.'
                 hr
                 p
-                  != '<span class="shop_armor_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + '<strong> ' + env.t('second') + '</strong> ' + env.t('friendText2') + '<strong> ' + env.t('crystalArmor') + '</strong> ' + env.t('friendText3') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<span class="shop_armor_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + '<strong> ' + env.t('second') + '</strong> ' + env.t('friendText2') + '<strong> ' + env.t('crystalArmor') + '</strong> ' + env.t('friendText3') + '<strong> 2' + env.t('gems') + '</strong>.'
           tr
             td
               a.label.label-contributor-3(ng-click='toggleUserTier($event)')=env.t('eliteBadge')
               div(style='display:none;')
                 p
-                  != '<span class="shop_head_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <strong>' + env.t('third') + '</strong> ' + env.t('friendText2') + ' <strong>' + env.t('crystalHelmet') + '</strong> ' + env.t('friendText3') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<span class="shop_head_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <strong>' + env.t('third') + '</strong> ' + env.t('friendText2') + ' <strong>' + env.t('crystalHelmet') + '</strong> ' + env.t('friendText3') + '<strong> 2' + env.t('gems') + '</strong>.'
                 hr
                 p
-                  != '<span class="shop_weapon_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <strong>' + env.t('fourth') + '</strong> ' + env.t('friendText2') + ' <strong>' + env.t('crystalSword') + '</strong> ' + env.t('friendText3') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<span class="shop_weapon_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <strong>' + env.t('fourth') + '</strong> ' + env.t('friendText2') + ' <strong>' + env.t('crystalSword') + '</strong> ' + env.t('friendText3') + '<strong> 2' + env.t('gems') + '</strong>.'
 
           tr
             td
               a.label.label-contributor-5(ng-click='toggleUserTier($event)')=env.t('championBadge')
               div(style='display:none;')
                 p
-                  != '<span class="shop_head_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <em>' + env.t('fifth') + '</em> ' + env.t('friendText2') + ' <strong>' + env.t('crystalShield') + '</strong> ' + env.t('friendText3') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<span class="shop_head_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <em>' + env.t('fifth') + '</em> ' + env.t('friendText2') + ' <strong>' + env.t('crystalShield') + '</strong> ' + env.t('friendText3') + '<strong> 2' + env.t('gems') + '</strong>.'
                 hr
                 p
-                  != '<div class="Pet-Dragon-Hydra pull-left"></div>' + env.t('friendText') + ' <em>' + env.t('sixth') + '</em> ' + env.t('friendText2b') + ' <strong>' + env.t('hydraPet') + '</strong> ' + env.t('friendText3b') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<div class="Pet-Dragon-Hydra pull-left"></div>' + env.t('friendText') + ' <em>' + env.t('sixth') + '</em> ' + env.t('friendText2b') + ' <strong>' + env.t('hydraPet') + '</strong> ' + env.t('friendText3b') + '<strong> 2' + env.t('gems') + '</strong>.'
           tr
             td
               a.label.label-contributor-7(ng-click='toggleUserTier($event)')=env.t('legendaryBadge')
               div(style='display:none;')
                 p
-                  != env.t('friendText') + ' <em>' + env.t('seventh') + '</em> ' + env.t('friendText2c') + ' <strong>' + env.t('2gems') + ' </strong>' + env.t('friendText3c')
+                  != env.t('friendText') + ' <em>' + env.t('seventh') + '</em> ' + env.t('friendText2c') + '<strong> 2' + env.t('gems') + ' </strong>' + env.t('friendText3c')
           tr
             td
               a.label.label-contributor-8(ng-click='toggleUserTier($event)')=env.t('heroicBadge')