codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug with Campaign i18n not showing fullNames properly.

Browse source
This commit is contained in:
Nick Winter 2015-02-16 09:21:59 -08:00
parent f0619e08f3
commit c0f738d736
2 changed files with 4 additions and 3 deletions

4
app/views/i18n/I18NEditCampaignView.coffee
View file

@ -12,7 +12,7 @@ module.exports = class I18NEditCampaignView extends I18NEditModelView
if i18n = @model.get('i18n') if i18n = @model.get('i18n')
if name = @model.get('name') if name = @model.get('name')
@wrapRow 'Campaign short name', ['name'], name, i18n[lang]?.name, [] @wrapRow 'Campaign short name', ['name'], name, i18n[lang]?.name, []
if description = @model.get('fullName') if fullName = @model.get('fullName')
@wrapRow 'Campaign full name', ['fullName'], description, i18n[lang]?.description, [] @wrapRow 'Campaign full name', ['fullName'], fullName, i18n[lang]?.fullName, []
# TODO: saves to this don't work since Campaigns don't use versioning. What to do? # TODO: saves to this don't work since Campaigns don't use versioning. What to do?

3
server/achievements/earned_achievement_handler.coffee
View file

@ -183,6 +183,7 @@ class EarnedAchievementHandler extends Handler
userStream.on 'data', (user) -> userStream.on 'data', (user) ->
++usersTotal ++usersTotal
numberRunning += 1 numberRunning += 1
#return doneWithUser() if usersTotal / total < 0.96 # If it died, we can skip ahead on restart like this.
userStream.pause() if numberRunning > 20 userStream.pause() if numberRunning > 20
# Keep track of a user's already achieved in order to set the notified values correctly # Keep track of a user's already achieved in order to set the notified values correctly
@ -262,7 +263,7 @@ class EarnedAchievementHandler extends Handler
#log.debug "Incrementing score for these achievements with #{newTotalPoints - previousPoints}" #log.debug "Incrementing score for these achievements with #{newTotalPoints - previousPoints}"
pointDelta = newTotalPoints - previousPoints pointDelta = newTotalPoints - previousPoints
pctDone = (100 * usersFinished / total).toFixed(2) pctDone = (100 * usersFinished / total).toFixed(2)
#console.log "Updated points to #{newTotalPoints} (#{if pointDelta < 0 then '' else '+'}#{pointDelta}) for #{user.get('name') or '???'} (#{user.get('_id')}) (#{pctDone}%)" console.log "Updated points to #{newTotalPoints} (#{if pointDelta < 0 then '' else '+'}#{pointDelta}) for #{user.get('name') or '???'} (#{user.get('_id')}) (#{pctDone}%)"
if recalculatingAll if recalculatingAll
update = {$set: {points: newTotalPoints, 'earned.gems': 0, 'earned.heroes': [], 'earned.items': [], 'earned.levels': []}} update = {$set: {points: newTotalPoints, 'earned.gems': 0, 'earned.heroes': [], 'earned.items': [], 'earned.levels': []}}
else else