diff --git a/bower.json b/bower.json index 74d3ee1067..0e17a75c86 100644 --- a/bower.json +++ b/bower.json @@ -42,11 +42,6 @@ "swagger-ui": "https://github.com/wordnik/swagger-ui.git#105c516f5f055b140e935e9cfe0c36f841921dff", "ngInfiniteScroll": "~1.0.0" }, - "resolutions": { - "jquery": "~2.0.3", - "bootstrap": "v2.3.2", - "angular": "~1.2.1" - }, "devDependencies": { "angular-mocks": "~1.2.1" } diff --git a/views/shared/header/header.jade b/views/shared/header/header.jade index c08ab5e2ed..63ea79962a 100644 --- a/views/shared/header/header.jade +++ b/views/shared/header/header.jade @@ -1,5 +1,5 @@ .header-wrap(ng-controller='HeaderCtrl') - a.label.undo-button(x-bind='click:undo', ng-show='_undo') Undo + a.label.undo-button(x-bind='click:undo', ng-show='_undo')=env.t('undo') div(ng-if='!user.preferences.hideHeader') include menu @@ -10,19 +10,19 @@ // stat bars .hero-stats - .meter.health(title='Health') + .meter.health(title=env.t('health')) .bar(style='width: {{Shared.percent(user.stats.hp, 50)}}%;') span.meter-text i.icon-heart | {{Math.ceil(user.stats.hp)}} / 50 - .meter.experience(title='Experience') + .meter.experience(title=env.t('experience')) .bar(style='width: {{Shared.percent(user.stats.exp,Shared.tnl(user.stats.lvl))}}%;') span.meter-text i.icon-star | {{Math.floor(user.stats.exp)}} / {{Shared.tnl(user.stats.lvl) | number:0}} // FIXME doesn't look great here, but the "Experience" CSS title rollover covers it where it was before span(ng-show='user.history.exp') - a(ng-click='toggleChart("exp")', tooltip='Progress') + a(ng-click='toggleChart("exp")', tooltip=env.t('progress')) i.icon-signal .meter.mana(title='Mana', ng-if='user.flags.classSelected && !user.preferences.disableClasses') .bar(style='width: {{user.stats.mp / user._statsComputed.maxMP * 100}}%;') @@ -35,5 +35,5 @@ .herobox-wrap(ng-repeat='profile in partyMinusSelf') include avatar - .npc_bailey.npc_bailey_head(ng-show='user.flags.newStuff', tooltip='Psst', tooltip-placement='top', ng-click='modals.newStuff=true') + .npc_bailey.npc_bailey_head(ng-show='user.flags.newStuff', tooltip=env.t('psst'), tooltip-placement='top', ng-click='modals.newStuff=true') diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 7dd24b513f..1b8846a71b 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -1,5 +1,5 @@ .user-menu(ng-controller='AuthCtrl') - button.task-action-btn.tile.solid(ng-hide='authenticated()', style='cursor: pointer;', ng-click="modals.login = true") Login / Register + button.task-action-btn.tile.solid(ng-hide='authenticated()', style='cursor: pointer;', ng-click="modals.login = true")=env.t('loginAndReg') ul.nav.site-nav(ng-show='authenticated()') li.flyout h1.task-action-btn.tile.solid.user-reporter {{user.profile.name}} @@ -8,21 +8,21 @@ a.task-action-btn.tile.solid span(ng-show='$state.includes("options")', ui-sref='tasks') i.icon-ok - | Tasks + =env.t('tasks') span(ng-show='$state.includes("tasks")', ui-sref='options') i.icon.icon-wrench - | Options + =env.t('options') li a.task-action-btn.tile.solid(ng-click='User.sync()') i.icon.icon-refresh - | Sync + =env.t('sync') li a.task-action-btn.tile.solid(ng-click='logout()') i.icon-share-alt - | Logout + =env.t('logout') // party invitation notification a(ng-show='user.party.invitation', style='cursor: pointer;', x-bind='click:gotoPartyChat') i.icon-user // party chat notification a(ng-show='newChatMessages(_party.chat,user.party.lastMessageSeen)', style='cursor: pointer;', x-bind='click:gotoPartyChat') - i.icon-comment(tooltip='New Party Messages') + i.icon-comment(tooltip=env.t('partyNotification'))