codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-04 17:19:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge conflicts resolved from Ruben's branch

Browse source
This commit is contained in:
Glen De Cauwsemaecker 2014-03-20 00:05:41 +01:00
commit e2a7c15776
3 changed files with 1131 additions and 1127 deletions
app
locale
en.coffeenl.coffee
templates/play/ladder
my_matches_tab.jade

1140
app/locale/en.coffee
View file

File diff suppressed because it is too large Load diff

1110
app/locale/nl.coffee
View file

File diff suppressed because it is too large Load diff

8
app/templates/play/ladder/my_matches_tab.jade
View file

@ -53,8 +53,12 @@ div#columns.row
td.name-cell= match.opponentName || "Anonymous"
td.time-cell= match.when
td.battle-cell
- var text = match.state === 'win' ? 'Watch your victory' : 'Defeat the ' + team.otherTeam
a(href="/play/level/#{levelID}?team=#{team.id}&opponent=#{match.sessionID}")= text
a(href="/play/level/#{levelID}?team=#{team.id}&opponent=#{match.sessionID}")
if (match.state === 'win')
span(data-i18n="ladder.watch_victory") Watch your victory
else
span(data-i18n="ladder.defeat_the") Defeat the
| #{team.otherTeam}
if !team.matches.length
tr