From 038039dbee3f16980eeb75c8fa1cf1122dcbe959 Mon Sep 17 00:00:00 2001 From: Amin Arria Date: Mon, 19 Oct 2015 12:10:27 -0430 Subject: [PATCH 1/3] Fixes #5550, change message according to rebirthLevel --- common/locales/en/rebirth.json | 5 ++++- website/views/shared/avatar/index.jade | 4 +++- website/views/shared/modals/achievements.jade | 5 ++++- website/views/shared/profiles/achievements.jade | 5 ++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/common/locales/en/rebirth.json b/common/locales/en/rebirth.json index becadbefe5..7d7cd71408 100644 --- a/common/locales/en/rebirth.json +++ b/common/locales/en/rebirth.json @@ -16,10 +16,13 @@ "rebirthEarnAchievement": "You also earn an Achievement for beginning a new adventure!", "beReborn": "Be Reborn", "rebirthAchievement": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is <%= level %>. To stack this Achievement, begin your next new adventure when you've reached an even higher Level!", + "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!", "rebirthBegan": "Began a New Adventure", "rebirthText": "Began <%= rebirths %> New Adventures", "rebirthOrb": "Used an Orb of Rebirth to start over after attaining Level", + "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.", "rebirthName": "Orb of Rebirth", - "reborn": "Reborn, max level <%= reLevel %>" + "reborn": "Reborn, max level <%= reLevel %>", + "reborn100": "Reborn, max level 100+", } diff --git a/website/views/shared/avatar/index.jade b/website/views/shared/avatar/index.jade index 0a6c9d26d9..9e085edcc8 100644 --- a/website/views/shared/avatar/index.jade +++ b/website/views/shared/avatar/index.jade @@ -26,5 +26,7 @@ mixin herobox(opts) span.glyphicon.glyphicon-circle-arrow-up(tooltip=env.t('buffed'), tooltip-append-to-body="true", ng-show='#{buffs}.str || #{buffs}.per || #{buffs}.con || #{buffs}.int || #{buffs}.stealth') span(tooltip=env.t('level'), tooltip-append-to-body="true") {{profile.stats.lvl}} - span.glyphicon.glyphicon-plus-sign(ng-show='profile.achievements.rebirths', + span.glyphicon.glyphicon-plus-sign(ng-if='::profile.achievements.rebirthLevel < 100', ng-show='profile.achievements.rebirths', tooltip=env.t('reborn', {reLevel: "{{profile.achievements.rebirthLevel}}"}), tooltip-append-to-body="true") + span.glyphicon.glyphicon-plus-sign(ng-if='::profile.achievements.rebirthLevel >= 100', ng-show='profile.achievements.rebirths', + tooltip=env.t('reborn100'), tooltip-append-to-body="true") diff --git a/website/views/shared/modals/achievements.jade b/website/views/shared/modals/achievements.jade index 142415be8f..5d105b50fa 100644 --- a/website/views/shared/modals/achievements.jade +++ b/website/views/shared/modals/achievements.jade @@ -91,6 +91,9 @@ script(id='modals/achievements/rebirth.html', type='text/ng-template') h4=env.t('modalAchievement') .modal-body .achievement.achievement-sun - =env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"}) + div(ng-if='user.achievements.rebirthLevel < 100') + =env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"}) + div(ng-if='user.achievements.rebirthLevel >= 100') + =env.t('rebirthAchievement100', {number: "{{user.achievements.rebirths}}"}) .modal-footer button.btn.btn-default(ng-click='$close()')=env.t('ok') diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index f302a7af06..a2ccf5fdf4 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -120,9 +120,12 @@ div(ng-if='::profile.achievements.rebirths') h5(ng-if='::profile.achievements.rebirths == 1')=env.t('rebirthBegan') h5(ng-if='::profile.achievements.rebirths > 1') =env.t('rebirthText', {rebirths: "{{::profile.achievements.rebirths}}"}) - small + small(ng-if='::profile.achievements.rebirthLevel < 100') =env.t('rebirthOrb') | {{::profile.achievements.rebirthLevel}}. + small(ng-if='::profile.achievements.rebirthLevel >= 100') + =env.t('rebirthOrb100') + hr div(ng-if='::profile.achievements.veteran') From 23114ac9291af805fcce700952ade0d153a2f6d2 Mon Sep 17 00:00:00 2001 From: Amin Arria Date: Mon, 19 Oct 2015 17:19:30 -0430 Subject: [PATCH 2/3] Fix trailing comma --- common/locales/en/rebirth.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en/rebirth.json b/common/locales/en/rebirth.json index 7d7cd71408..998aefa38a 100644 --- a/common/locales/en/rebirth.json +++ b/common/locales/en/rebirth.json @@ -24,5 +24,5 @@ "rebirthPop": "Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.", "rebirthName": "Orb of Rebirth", "reborn": "Reborn, max level <%= reLevel %>", - "reborn100": "Reborn, max level 100+", + "reborn100": "Reborn, max level 100+" } From bd230df0d3b93bbbad82a60ffeefc73d41fec80d Mon Sep 17 00:00:00 2001 From: Amin Arria Date: Wed, 28 Oct 2015 14:33:45 -0430 Subject: [PATCH 3/3] Added rebirthLevel var to remove need of extra translation string --- common/locales/en/rebirth.json | 3 +-- website/views/shared/avatar/index.jade | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/locales/en/rebirth.json b/common/locales/en/rebirth.json index 998aefa38a..9e450f78f4 100644 --- a/common/locales/en/rebirth.json +++ b/common/locales/en/rebirth.json @@ -23,6 +23,5 @@ "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.", "rebirthName": "Orb of Rebirth", - "reborn": "Reborn, max level <%= reLevel %>", - "reborn100": "Reborn, max level 100+" + "reborn": "Reborn, max level <%= reLevel %>" } diff --git a/website/views/shared/avatar/index.jade b/website/views/shared/avatar/index.jade index 9e085edcc8..a09d678686 100644 --- a/website/views/shared/avatar/index.jade +++ b/website/views/shared/avatar/index.jade @@ -16,6 +16,8 @@ mixin herobox(opts) - var name = '{{profile.profile.name}}' - var buffs = 'profile.stats.buffs' + - var rebirthLevel = '{{profile.achievements.rebirthLevel < 100 ? profile.achievements.rebirthLevel : "100+"}}' + figure.herobox(ng-click=ngClick, data-name=name, class=klass, ng-class=ngKlass) .avatar-name(ng-class='userLevelStyle(profile)')=name @@ -26,7 +28,5 @@ mixin herobox(opts) span.glyphicon.glyphicon-circle-arrow-up(tooltip=env.t('buffed'), tooltip-append-to-body="true", ng-show='#{buffs}.str || #{buffs}.per || #{buffs}.con || #{buffs}.int || #{buffs}.stealth') span(tooltip=env.t('level'), tooltip-append-to-body="true") {{profile.stats.lvl}} - span.glyphicon.glyphicon-plus-sign(ng-if='::profile.achievements.rebirthLevel < 100', ng-show='profile.achievements.rebirths', - tooltip=env.t('reborn', {reLevel: "{{profile.achievements.rebirthLevel}}"}), tooltip-append-to-body="true") - span.glyphicon.glyphicon-plus-sign(ng-if='::profile.achievements.rebirthLevel >= 100', ng-show='profile.achievements.rebirths', - tooltip=env.t('reborn100'), tooltip-append-to-body="true") + span.glyphicon.glyphicon-plus-sign(ng-show='profile.achievements.rebirths', + tooltip=env.t('reborn', {reLevel: rebirthLevel}), tooltip-append-to-body="true")