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

This commit is contained in:
Blade Barringer 2015-07-18 17:06:26 -05:00
commit dc2fab14d0
2 changed files with 8 additions and 3 deletions

View file

@ -149,5 +149,9 @@
"mageWiki": "<a href='http://habitrpg.wikia.com/wiki/Mage' target='_blank'>Mage</a>",
"rogueWiki": "<a href='http://habitrpg.wikia.com/wiki/Rogue' target='_blank'>Rogue</a>",
"healerWiki": "<a href='http://habitrpg.wikia.com/wiki/Healer' target='_blank'>Healer</a>",
"chooseClassLearn": "<a href='http://habitrpg.wikia.com/wiki/Class_System' target='_blank'>Learn more about classes</a>"
"chooseClassLearn": "<a href='http://habitrpg.wikia.com/wiki/Class_System' target='_blank'>Learn more about classes</a>",
"str": "STR",
"con": "CON",
"per": "PER",
"int": "INT"
}

View file

@ -26,8 +26,9 @@ unless mobile
table.table.table-striped(ng-show='user.flags.itemsEnabled')
tr(ng-repeat='(k,v) in profile.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece')
td
strong {{piece.text()}}:&nbsp;
span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{stat.toUpperCase()}}&nbsp;
strong {{piece.text()}}
strong(ng-show='piece.str || piece.con || piece.per || piece.int') :&nbsp;
span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{env.t(stat)}}&nbsp;
h4(class=mobile?'item item-divider':'')=env.t('attributes')
table.table.table-striped