Skip to content

Commit

Permalink
Added german translation to home page and tidied up some whitespace i…
Browse files Browse the repository at this point in the history
…n the undum code.
  • Loading branch information
idmillington committed Sep 26, 2013
1 parent e2e59b0 commit c01015d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 19 deletions.
3 changes: 2 additions & 1 deletion docs/out/index.html
Expand Up @@ -81,7 +81,8 @@ <h1>Undum</h1>
</p>
<p>
<a href="/games/tutorial.en.html">Tutorial Game</a><br/>
(<a href="/games/tutorial.ru.html">Русский</a>)
(<a href="/games/tutorial.de.html">Deutsch</a>,
<a href="/games/tutorial.ru.html">Русский</a>)
</p>
<p><a href="/API.html">Reference Documentation</a></p>
<p><a href="http://github.com/idmillington/undum">Source Code</a></p>
Expand Down
29 changes: 12 additions & 17 deletions games/media/js/undum.js
Expand Up @@ -761,11 +761,11 @@
* function(character, system, oldSituationId, newSituationId);
*/
enter: null,
/* Hook for when the situation has already been carried out and printed.
* The signature is
*
* function( character, system, oldSituationId, newSituationId );

/* Hook for when the situation has already been carried out
* and printed. The signature is:
*
* function(character, system, oldSituationId, newSituationId);
*/
afterEnter: null,

Expand Down Expand Up @@ -1094,9 +1094,7 @@
}
} else {
// We should have an action if we have no situation change.
assert(
action, "link_no_action".l()
);
assert(action, "link_no_action".l());
}

// Carry out the action
Expand Down Expand Up @@ -1180,10 +1178,10 @@
game.enter(character, system, oldSituationId, newSituationId);
}
newSituation.enter(character, system, oldSituationId);

// additional hook for when the situation text has already been printed
if( game.afterEnter ) {
game.afterEnter( character, system, oldSituationId, newSituationId );
if (game.afterEnter) {
game.afterEnter(character, system, oldSituationId, newSituationId);
}
};

Expand Down Expand Up @@ -1219,8 +1217,7 @@
return output;
};

/* Erases the character in local storage. This is permanent! TODO:
* Perhaps give a warning. */
/* Erases the character in local storage. This is permanent! */
var doErase = function(force) {
var saveId = getSaveId()
if (localStorage[saveId]) {
Expand All @@ -1239,9 +1236,7 @@
$("#content").empty();

var situation = getCurrentSituation();
assert(
situation, "no_current_situation".l()
);
assert(situation, "no_current_situation".l());

showQualities();
};
Expand Down Expand Up @@ -1336,7 +1331,7 @@
QualityGroup: QualityGroup,

game: game,

isInteractive: function() { return interactive; },

// The undum set of translated strings.
Expand Down
2 changes: 1 addition & 1 deletion site/fabfile.py
Expand Up @@ -40,7 +40,7 @@ def package():

# Add games.
with lcd(ROOT_DIR):
local("tar --append games -f %s" % TAR)
local("tar --append -f %s games" % TAR)

# Compress.
local("gzip -f %s" % TAR)
Expand Down

0 comments on commit c01015d

Please sign in to comment.