Skip to content

Commit

Permalink
Update character.json to separate optOut into two translation strings
Browse files Browse the repository at this point in the history
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes HabitRPG#6511
Closes HabitRPG#6518
  • Loading branch information
Luveluen authored and crookedneighbor committed Jan 15, 2016
1 parent 24e0867 commit 5315cc9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions common/locales/en/character.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@
"mageText": "Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habit, or if you are strongly motivated by leveling up and unlocking advanced features!",
"rogueText": "Rogues love to accumulate wealth, gaining more Gold than anyone else, and are adept at finding random items. Their iconic Stealth ability lets them duck the consequences of missed Dailies. Play a Rogue if you find strong motivation from Rewards and Achievements, striving for loot and badges!",
"healerText": "Healers stand impervious against harm, and extend that protection to others. Missed Dailies and bad Habits don't faze them much, and they have ways to recover Health from failure. Play a Healer if you enjoy assisting others in your Party, or if the idea of cheating Death through hard work inspires you!",
"optOut": "Opt Out",
"optOutText": "Can't be bothered with classes? Want to choose later? Opt out - you'll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time under User -> Stats.",
"optOutOfClasses": "Opt Out",
"optOutOfPMs": "Opt Out",
"optOutOfClassesText": "Can't be bothered with classes? Want to choose later? Opt out - you'll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time under User -> Stats.",
"select": "Select",
"stealth": "Stealth",
"stealthNewDay": "When a new day begins, you will avoid damage from this many missed Dailies.",
Expand Down
2 changes: 1 addition & 1 deletion website/views/options/social/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ script(type='text/ng-template', id='partials/options.social.inbox.html')
label
input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})')
|  
span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('optOutPopover'))=env.t('optOut')
span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('optOutPopover'))=env.t('optOutOfPMs')
+chatMessages('inbox')

script(type='text/ng-template', id='partials/options.social.tavern.html')
Expand Down
6 changes: 3 additions & 3 deletions website/views/shared/modals/classes.jade
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
script(type='text/ng-template', id='modals/chooseClass.html')
script(type='text/ng-template', id='modals/chooseClass.html')
.modal-header
h4=env.t('chooseClassHeading')
.modal-body.select-class
Expand Down Expand Up @@ -67,7 +67,7 @@ script(type='text/ng-template', id='modals/chooseClass.html')
.well(ng-show='selectedClass=="healer"')=env.t('healerText')

.modal-footer
span(popover-placement='left', popover-trigger='mouseenter', popover=env.t('optOutText'))
button.btn.btn-danger(ng-click='user.ops.disableClasses({}); $close()')=env.t('optOut')
span(popover-placement='left', popover-trigger='mouseenter', popover=env.t('optOutOfClassesText'))
button.btn.btn-danger(ng-click='user.ops.disableClasses({}); $close()')=env.t('optOutOfClasses')
button.btn.btn-primary(ng-disabled='!selectedClass' ng-click='changeClass(selectedClass); $close()')=env.t('select')
.pull-left!=env.t('chooseClassLearn')

0 comments on commit 5315cc9

Please sign in to comment.