From 8f4016d6696809025e229fe601a901d6044ecbf1 Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Sun, 26 Jan 2014 17:30:41 -0200 Subject: [PATCH 1/3] Split main.json --- views/options/social/group.jade | 10 +++++----- views/options/social/hall.jade | 10 +++++----- views/options/social/tavern.jade | 2 +- views/shared/footer.jade | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 96489335d3..95a9871e43 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -2,7 +2,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild // ＋ span.task-action-btn.tile.flush.neutral .Pet_Currency_Gem2x.Gems - | {{group.balance * 4 | number:0 }} + | {{group.balance * 4 | number:0 }} =env.t('guildGems') .row-fluid .span4 @@ -37,15 +37,15 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild | {{group.quest.hp | number:0}} / {{Content.quests[group.quest.key].hp}} .hero-stats .meter.health(title=env.t('bossHP')) - .bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, \'up\')}}%;') + .bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp)}}%;') span.meter-text i.icon-heart - | {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, 'up')}} + | {{group.quest.progress.hp | number:0}} / {{Content.quests[group.quest.key].boss.hp}} div(ng-if='Content.quests[group.quest.key].collect') h4=env.t('collected') + ':' table.table.table-striped - tr(ng-repeat='(k,v) in group.quest.progress.collect') + tr(ng-repeat='(k,v) in group.quest.progress.collect', class='quest_collected_{{v >= Content.quests[group.quest.key].collect[k].count}}') td div(class='quest_{{group.quest.key}}_{{k}}') {{Content.quests[group.quest.key].collect[k].text}} td @@ -61,7 +61,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild div(ng-if='Content.quests[group.quest.key].boss') .npc_ian.pull-left - p=env.t('bossDmg1') + ' ' + env.t('bossDmg2') + '' + p!=env.t('bossDmg1') + ' ' + env.t('bossDmg2') + '' br p=env.t('bossDmg3') diff --git a/views/options/social/hall.jade b/views/options/social/hall.jade index f5b4cc76d4..cfda892f3e 100644 --- a/views/options/social/hall.jade +++ b/views/options/social/hall.jade @@ -23,12 +23,12 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') h3 {{hero.profile.name}} .-options .control-group.option-large - input.option-content(type='text', ng-model='hero.contributor.text', placeholder=env.t('conTitle')) + input.option-content(type='text', ng-model='hero.contributor.text', placeholder=env.t('contribTitle')) .control-group.option-medium input.option-content(type='number', step="any", ng-model='hero.contributor.level') - span.input-suffix=env.t('conLevel') + span.input-suffix=env.t('contribLevel') br - small=env.t('conText') + small=env.t('contribHallText') a(target='_blank', href='https://trello.com/c/wkFzONhE/277-contributor-gear')=env.t('moreDetails') .control-group.option-large textarea.option-content(style='height:15em;', placeholder=env.t('contributions'), ng-model='hero.contributor.contributions') @@ -44,7 +44,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') input.option-content(type='number', step="any", ng-model='hero.balance') span.input-suffix Balance p - small= '`user.balance`' + env.t('USD1') + ' ' + env.t('not') + ' ' + env.t('USD2') + small!= '`user.balance`' + env.t('USD1') + ' ' + env.t('not') + ' ' + env.t('USD2') .control-group.option-medium label.checkbox @@ -62,7 +62,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') tr th=env.t('name') th(ng-if='user.contributor.admin')=env.t('UUID') - th=env.t('conLevel') + th=env.t('contribLevel') th=env.t('title') th=env.t('contributions') tr(ng-repeat='hero in heroes') diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index fc70e90b22..d3fae39e96 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -104,7 +104,7 @@ p=env.t('heroicText') tr td - a.label.label-npc(ng-click='toggleUserTier($event)')=env.t('npcBadge') + a.label.label-npc(ng-click='toggleUserTier($event)')=env.t('npc') div(style='display:none;') p=env.t('npcText') diff --git a/views/shared/footer.jade b/views/shared/footer.jade index 9eeaa09e89..d85a8ce8f7 100644 --- a/views/shared/footer.jade +++ b/views/shared/footer.jade @@ -23,7 +23,7 @@ footer.footer(ng-controller='FooterCtrl') li a(href='/static/extensions')=env.t('companyExtensions') li - a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ')=env.t('companyFAQ') + a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ')=env.t('FAQ') li a(href='/static/privacy')=env.t('companyPrivacy') li @@ -36,7 +36,7 @@ footer.footer(ng-controller='FooterCtrl') li a(target='_blank', href='https://trello.com/c/8gzGlle8')=env.t('communityFeature') li - a(target='_blank', href='https://github.com/lefnire/habitrpg/wiki/API')=env.t('communityAPI') + a(target='_blank', href='https://github.com/lefnire/habitrpg/wiki/API')=env.t('API') li a(href='/static/extensions')=env.t('communityExtensions') li From 8d41c44ad77c5e2db36eb7acda9c41dc600535cf Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Sun, 26 Jan 2014 17:37:54 -0200 Subject: [PATCH 2/3] Fix version conflict --- views/options/social/group.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 95a9871e43..24e7c08dc2 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -40,12 +40,12 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild .bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp)}}%;') span.meter-text i.icon-heart - | {{group.quest.progress.hp | number:0}} / {{Content.quests[group.quest.key].boss.hp}} + | {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, 'up'}} div(ng-if='Content.quests[group.quest.key].collect') h4=env.t('collected') + ':' table.table.table-striped - tr(ng-repeat='(k,v) in group.quest.progress.collect', class='quest_collected_{{v >= Content.quests[group.quest.key].collect[k].count}}') + tr(ng-repeat='(k,v) in group.quest.progress.collect') td div(class='quest_{{group.quest.key}}_{{k}}') {{Content.quests[group.quest.key].collect[k].text}} td From c09d89f87258b0462bd7da4a344c77c53030abda Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Sun, 26 Jan 2014 17:39:36 -0200 Subject: [PATCH 3/3] Fix version conflict --- views/options/social/group.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 24e7c08dc2..0314cf5199 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -37,10 +37,10 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild | {{group.quest.hp | number:0}} / {{Content.quests[group.quest.key].hp}} .hero-stats .meter.health(title=env.t('bossHP')) - .bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp)}}%;') + .bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, \'up\')}}%;') span.meter-text i.icon-heart - | {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, 'up'}} + | {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, 'up')}} div(ng-if='Content.quests[group.quest.key].collect') h4=env.t('collected') + ':'