sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-24 22:55:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop

Browse source
This commit is contained in:
Blade Barringer 2015-06-17 19:13:13 -05:00
commit bcc99791dd
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/locales/en/challenge.json
View file

@ -52,5 +52,7 @@
"challengedOwnedFilterHeader": "Ownership",
"challengedOwnedFilter": "Owned",
"challengedNotOwnedFilter": "Not Owned",
"challengedEitherOwnedFilter": "Either"
"challengedEitherOwnedFilter": "Either",
"backToChallenges": "Back to all challenges",
"prizeValue": "<%= gemcount %>&nbsp;<%= gemicon %> Prize"
}

12
website/views/options/social/challenges.jade
View file

@ -105,8 +105,9 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
input(type='radio', name='search-owner-radio', ng-model='search._isOwner', value='either', ng-change='filterChallenges', checked='checked')
=env.t('challengedEitherOwnedFilter')
.col-md-10
a.btn.btn-info#back-to-challenges(ng-show="cid", ui-sref='options.social.challenges', ui-sref-opts='{reload: true}')
| Back to all challenges
a.btn.btn-info#back-to-challenges(ng-show="cid",
ui-sref='options.social.challenges', ui-sref-opts='{reload: true}')
=env.t('backToChallenges')
// Creation form
button.btn.btn-success#create-challenge-btn(ng-click='create()', ng-hide='newChallenge')=env.t('createChallenge')
.create-challenge-from.well(ng-if='newChallenge')
@ -164,12 +165,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
li
=env.t('participants', {membercount: "{{challenge.memberCount}}"})
li(ng-show='challenge.prize')
p
// prize
| {{challenge.prize}}&nbsp;
span.inline-block.Pet_Currency_Gem1x
| &nbsp;
=env.t('prize')
p!=env.t('prizeValue', {gemcount: "{{challenge.prize}}", gemicon: "<span class='inline-block Pet_Currency_Gem1x'></span>"})
li.bg-transparent
// leave / join
a.btn.btn-sm.btn-danger(ng-show='challenge._isMember', ng-click='clickLeave(challenge, $event)')