Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Berry <bryan@olenepal.org>2009-10-09 07:18:44 (GMT)
committer Bryan Berry <bryan@olenepal.org>2009-10-09 07:18:44 (GMT)
commit1463ef015ef63f53a05b6ebf3a703a79580f1bad (patch)
tree318ca63f77cbeab25c0e6bbb9f87022093af4084
parent96ff0956d8baab85911b7ea7a1f13f4d809c0041 (diff)
changed jquery.karma.js so u no longer need karma.Gettext.jsHEADmaster
-rw-r--r--index.html3
-rwxr-xr-xjs/jquery.karma.js13
2 files changed, 8 insertions, 8 deletions
diff --git a/index.html b/index.html
index 5939b0b..2a7946b 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,6 @@
<script type="text/javascript" src="js/raphael-min.js"></script>
<script type="text/javascript" src="js/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="js/jquery.karma.js"></script>
- <script type="text/javascript" src="js/karma.Gettext.js"></script>
<!-- Put the code specific to your lesson in lesson.js -->
<script type="text/javascript" src="js/lesson.js"></script>
@@ -18,4 +17,4 @@
<div>Use this file as a template to create your first Karma lesson</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/js/jquery.karma.js b/js/jquery.karma.js
index f4b99af..c30753d 100755
--- a/js/jquery.karma.js
+++ b/js/jquery.karma.js
@@ -234,10 +234,11 @@ var Karma = function( options ) {
loaded = lang + "." +
that.supportedLangFileTypes[i].ext;
- //i18n
- //we pass the data so we avoid re-loading the file
- //creates the shorcout
- that.i18n.root[ that.i18n.shortcut ] = i18nWrapper(
+ //i18n
+ //we pass the data so we avoid re-loading the file
+ //creates the shorcout
+ //Bryan: we aren't using this right now
+ /* that.i18n.root[ that.i18n.shortcut ] = i18nWrapper(
{
domain : lang,
file : {
@@ -245,9 +246,9 @@ var Karma = function( options ) {
uri: this.url, data: data
}
}
- );
+ );*/
localiseContent( lang );
- tryNext = false;
+ tryNext = false;
},
error: function ( XHR, textStatus, errorThrown ) {
//the file doesn't exist or it wasn't possible to load it