From 8e99186e9c133702557a970b01ba650afceca8a0 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 24 Jan 2014 20:07:02 +0100 Subject: [PATCH 1/3] refactor(translations): achievements --- views/shared/profiles/achievements.jade | 27 ++++++------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index c02b3c20e1..865c1bd3c6 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -35,10 +35,7 @@ div(ng-if='profile.backer.tier') .achievement.achievement-heart - h5 - =env.t('kickstartName1') - | ${{profile.backer.tier}} - =env.t('kickstartName2') + h5=env.t('kickstartName', {tier: "{{profile.backer.tier}}"}) small=env.t('kickstartText') hr @@ -47,10 +44,7 @@ div(ng-class='{muted: !profile.achievements.streak}') h5 {{profile.achievements.streak || 0 }} =env.t('streakName') - small - =env.t('streakText1') - | {{profile.achievements.streak || 0 }} - =env.t('streakText2') + small=env.t('streakText', {streaks: "{{profile.achievements.streak || 0 }}"}) hr div(ng-if='profile.achievements.perfect || user._id == profile._id') @@ -58,10 +52,7 @@ div(ng-class='{muted: !profile.achievements.perfect}') h5 {{profile.achievements.perfect || 0 }} =env.t('perfectName') - small - =env.t('streakText1') - | {{profile.achievements.perfect || 0 }} - =env.t('perfectText2') + small=env.t('perfectText', {perfects: "{{profile.achievements.perfect || 0 }}"}) hr div(ng-if='profile.achievements.ultimateGear || user._id == profile._id') @@ -82,9 +73,7 @@ .achievement.achievement-sun h5(ng-if='profile.achievements.rebirths == 1')=env.t('rebirthBegan') h5(ng-if='profile.achievements.rebirths > 1') - =env.t('rebirthText1') - | {{profile.achievements.rebirths}} - =env.t('rebirthText2') + =env.t('rebirthText', {rebirths: "{{profile.achievements.rebirths}}"}) small =env.t('rebirthOrb') | {{profile.achievements.rebirthLevel}}. @@ -105,9 +94,7 @@ small=env.t('veteranText') div(ng-if='profile.achievements.originalUser') h5=env.t('originalUser') - small=env.t('originalUserText1') - em=env.t('originalUserText2') - =env.t('originalUserText3') + small=env.t('originalUserText') hr div(ng-if='profile.achievements.challenges || user._id == profile._id') @@ -134,7 +121,5 @@ .achievement.achievement-snowball h5=env.t('annoyingFriends') small - =env.t('annoyingFriends1') - | {{profile.achievements.snowball}} - =env.t('annoyingFriends2') + =env.t('annoyingFriendsText', {snowballs: "{{profile.achievements.snowball}}"}) hr From d107db7013037ce92a894a12aa728e8bad2b19d6 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 24 Jan 2014 21:27:06 +0100 Subject: [PATCH 2/3] refactor(translations) --- views/options/inventory/inventory.jade | 2 +- views/shared/footer.jade | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index dda21c55ce..f9c3c5b7c2 100644 --- a/views/options/inventory/inventory.jade +++ b/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 diff --git a/views/shared/footer.jade b/views/shared/footer.jade index 6b4a41e437..9eeaa09e89 100644 --- a/views/shared/footer.jade +++ b/views/shared/footer.jade @@ -65,14 +65,14 @@ footer.footer(ng-controller='FooterCtrl') td a.addthis_button_google_plusone(g:plusone:size='medium') else - h4=env.t('footerDebug') + h4 Debug ul.unstyled li - a.btn(ng-click='addMissedDay()')=env.t('debugMissed') + a.btn(ng-click='addMissedDay()') +1 Missed Day li - a.btn(ng-click='addTenGems()')=env.t('debugGems') + a.btn(ng-click='addTenGems()') +10 Gems li - a.btn(ng-click='addLevelsAndGold()')=env.t('debugLevel') + a.btn(ng-click='addLevelsAndGold()') +Exp +GP li a.btn(ng-click='addOneLevel()') +1 Level From 5336134c7d962eb4fb0da6b64c84815bbf3e99c5 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 24 Jan 2014 22:49:36 +0100 Subject: [PATCH 3/3] refactor(translations) --- public/js/directives/directives.js | 8 ++++---- src/middleware.js | 2 +- views/main/filters.jade | 11 ++++++----- views/options/profile.jade | 2 +- views/options/settings.jade | 2 +- views/options/social/create-group.jade | 4 +++- views/options/social/group.jade | 2 +- views/options/social/tavern.jade | 14 +++++++------- views/shared/header/menu.jade | 2 +- views/shared/modals/rebirth.jade | 4 +++- views/shared/modals/reroll.jade | 4 +++- 11 files changed, 31 insertions(+), 24 deletions(-) diff --git a/public/js/directives/directives.js b/public/js/directives/directives.js index 796864c5e3..2d36fea375 100644 --- a/public/js/directives/directives.js +++ b/public/js/directives/directives.js @@ -85,19 +85,19 @@ habitrpg scope.main = attrs.main; $rootScope.lists = [ { - header: env.t('Habits'), + header: env.t('habits'), type: 'habit', placeHolder: env.t('newHabit') }, { - header: env.t('Dailies'), + header: env.t('dailies'), type: 'daily', placeHolder: env.t('newDaily') }, { - header: env.t('Todos'), + header: env.t('todos'), type: 'todo', placeHolder: env.t('newTodo') }, { - header: env.t('Rewards'), + header: env.t('rewards'), type: 'reward', placeHolder: env.t('newReward') } diff --git a/src/middleware.js b/src/middleware.js index 6ae2af370e..829e9e2cc0 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -172,7 +172,7 @@ var getUserLanguage = function(req, callback){ module.exports.locals = function(req, res, next) { getUserLanguage(req, function(err, language){ - if(err) return res.json(500, {err: err}); + if(err) return res.json(500, {err: err}); language.momentLang = (momentLangs[language.code] || undefined); diff --git a/views/main/filters.jade b/views/main/filters.jade index 06180ec2e3..0a5de7e1db 100644 --- a/views/main/filters.jade +++ b/views/main/filters.jade @@ -1,9 +1,10 @@ .filters.tag-list(ng-controller='FiltersCtrl') .pull-left.filter-description - | Tags: + =env.t('tags') + |: ul.nav.nav-pills li - a(rel='tooltip', title='Edit Tags', ng-click='saveOrEdit()') + a(rel='tooltip', title=env.t('editTags'), ng-click='saveOrEdit()') i(ng-class='{"icon-ok": _editing, "icon-pencil": !_editing}') li(bindonce='user.tags', ng-class='{active: user.filters[tag.id]}', ng-repeat='tag in user.tags', style='position: relative;') .input-append.option-group.tag-editing(ng-show='_editing') @@ -17,9 +18,9 @@ li form.form-inline(ng-show='_editing', ng-submit='createTag(_newTag)') .input-append.tag-editing - input.span2.tag-editing-pill(type='text', ng-model='_newTag', placeholder='New Tag') - button.add-on.tag-editing-pill(type='submit') Add + input.span2.tag-editing-pill(type='text', ng-model='_newTag', placeholder=env.t('newTag')) + button.add-on.tag-editing-pill(type='submit')=env.t('add') //
  • li - a(rel='tooltip', title='Clear Filters', ng-click='user.filters = {}') + a(rel='tooltip', title=env.t('clearFilters'), ng-click='user.filters = {}') i.icon-remove-sign diff --git a/views/options/profile.jade b/views/options/profile.jade index 24c996abc4..c2fe8f8bce 100644 --- a/views/options/profile.jade +++ b/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') + ' ' .span4 - h3=env.t('skin') + h3=env.t('bodyskin') small | 2 / = ' ' + env.t('locked') diff --git a/views/options/settings.jade b/views/options/settings.jade index b3b54dc3a9..c3a4c4ebf5 100644 --- a/views/options/settings.jade +++ b/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') diff --git a/views/options/social/create-group.jade b/views/options/social/create-group.jade index d4e954c706..edf985d1a4 100644 --- a/views/options/social/create-group.jade +++ b/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 diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 16397795cb..037c72d979 100644 --- a/views/options/social/group.jade +++ b/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 diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 6413b3a7b3..fc70e90b22 100644 --- a/views/options/social/tavern.jade +++ b/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 - != ' ' + env.t('friendText') + ' ' + env.t('first') + ' ' + env.t('friend1Text') + ' ' + env.t('2gems') + '.' + != ' ' + env.t('friendText') + ' ' + env.t('first') + ' ' + env.t('friend1Text') + ' 2' + env.t('gems') + '.' hr p - != ' ' + env.t('friendText') + ' ' + env.t('second') + ' ' + env.t('friendText2') + ' ' + env.t('crystalArmor') + ' ' + env.t('friendText3') + ' ' + env.t('2gems') + '.' + != ' ' + env.t('friendText') + ' ' + env.t('second') + ' ' + env.t('friendText2') + ' ' + env.t('crystalArmor') + ' ' + env.t('friendText3') + ' 2' + env.t('gems') + '.' tr td a.label.label-contributor-3(ng-click='toggleUserTier($event)')=env.t('eliteBadge') div(style='display:none;') p - != ' ' + env.t('friendText') + ' ' + env.t('third') + ' ' + env.t('friendText2') + ' ' + env.t('crystalHelmet') + ' ' + env.t('friendText3') + ' ' + env.t('2gems') + '.' + != ' ' + env.t('friendText') + ' ' + env.t('third') + ' ' + env.t('friendText2') + ' ' + env.t('crystalHelmet') + ' ' + env.t('friendText3') + ' 2' + env.t('gems') + '.' hr p - != ' ' + env.t('friendText') + ' ' + env.t('fourth') + ' ' + env.t('friendText2') + ' ' + env.t('crystalSword') + ' ' + env.t('friendText3') + ' ' + env.t('2gems') + '.' + != ' ' + env.t('friendText') + ' ' + env.t('fourth') + ' ' + env.t('friendText2') + ' ' + env.t('crystalSword') + ' ' + env.t('friendText3') + ' 2' + env.t('gems') + '.' tr td a.label.label-contributor-5(ng-click='toggleUserTier($event)')=env.t('championBadge') div(style='display:none;') p - != ' ' + env.t('friendText') + ' ' + env.t('fifth') + ' ' + env.t('friendText2') + ' ' + env.t('crystalShield') + ' ' + env.t('friendText3') + ' ' + env.t('2gems') + '.' + != ' ' + env.t('friendText') + ' ' + env.t('fifth') + ' ' + env.t('friendText2') + ' ' + env.t('crystalShield') + ' ' + env.t('friendText3') + ' 2' + env.t('gems') + '.' hr p - != '
    ' + env.t('friendText') + ' ' + env.t('sixth') + ' ' + env.t('friendText2b') + ' ' + env.t('hydraPet') + ' ' + env.t('friendText3b') + ' ' + env.t('2gems') + '.' + != '
    ' + env.t('friendText') + ' ' + env.t('sixth') + ' ' + env.t('friendText2b') + ' ' + env.t('hydraPet') + ' ' + env.t('friendText3b') + ' 2' + env.t('gems') + '.' tr td a.label.label-contributor-7(ng-click='toggleUserTier($event)')=env.t('legendaryBadge') div(style='display:none;') p - != env.t('friendText') + ' ' + env.t('seventh') + ' ' + env.t('friendText2c') + ' ' + env.t('2gems') + ' ' + env.t('friendText3c') + != env.t('friendText') + ' ' + env.t('seventh') + ' ' + env.t('friendText2c') + ' 2' + env.t('gems') + ' ' + env.t('friendText3c') tr td a.label.label-contributor-8(ng-click='toggleUserTier($event)')=env.t('heroicBadge') diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 1546a4fe35..6933ffbe98 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -19,7 +19,7 @@ li a.task-action-btn.tile.solid(href="https://vimeo.com/57654086", target='_blank') i.icon.icon-film - =env.t('Tutorials') + =env.t('tutorials') li a.task-action-btn.tile.solid(ng-click='User.sync()') i.icon.icon-refresh diff --git a/views/shared/modals/rebirth.jade b/views/shared/modals/rebirth.jade index c8c49b4785..bbc79630cf 100644 --- a/views/shared/modals/rebirth.jade +++ b/views/shared/modals/rebirth.jade @@ -41,4 +41,6 @@ div(modal='modals.rebirth') span.gem-cost=env.t('notEnoughGems') span(ng-if='user.balance >= 2', ng-controller='SettingsCtrl') a.btn.btn-danger.btn-large(ng-click='rebirth()')=env.t('beReborn') - span.gem-cost=env.t('cost8Gems') + span.gem-cost + | 8  + =env.t('gems') diff --git a/views/shared/modals/reroll.jade b/views/shared/modals/reroll.jade index 4d03c5de97..24dba8d7ff 100644 --- a/views/shared/modals/reroll.jade +++ b/views/shared/modals/reroll.jade @@ -13,5 +13,7 @@ div(modal='modals.reroll') span.gem-cost=env.t('notEnoughGems') span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl') a.btn.btn-danger.btn-large(ng-click='reroll()')=env.t('fortify') - span.gem-cost=env.t('cost4Gems') + span.gem-cost + | 4  + = env.t('gems')