Merge pull request #6068 from AminArria/Wrong-max-level-messages

Wrong max level messages

common/locales/en/rebirth.json

@@ -16,9 +16,11 @@
     "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 %>"

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
@@ -27,4 +29,4 @@ mixin herobox(opts)
         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',
-        tooltip=env.t('reborn', {reLevel: "{{profile.achievements.rebirthLevel}}"}), tooltip-append-to-body="true")
+        tooltip=env.t('reborn', {reLevel: rebirthLevel}), tooltip-append-to-body="true")

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')

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')
     |&nbsp;{{::profile.achievements.rebirthLevel}}.
+  small(ng-if='::profile.achievements.rebirthLevel >= 100')
+    =env.t('rebirthOrb100')
+
   hr
 
 div(ng-if='::profile.achievements.veteran')