commented out all localiztion stuff because none of it works right now

43 files changed, 25 insertions, 24 deletions

diff --git a/examples/adding_up_to_10_canvas/assets/generic/sounds/correct.ogg b/examples/adding_up_to_10_canvas/assets/generic/sounds/correct.ogg
deleted file mode 100755
index c89ce57..0000000
--- a/examples/adding_up_to_10_canvas/assets/generic/sounds/correct.ogg
+++ /dev/null
diff --git a/examples/adding_up_to_10_canvas/assets/generic/sounds/incorrect.ogg b/examples/adding_up_to_10_canvas/assets/generic/sounds/incorrect.ogg
deleted file mode 100755
index 2306562..0000000
--- a/examples/adding_up_to_10_canvas/assets/generic/sounds/incorrect.ogg
+++ /dev/null
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/ball37px.png b/examples/adding_up_to_10_canvas/assets/images/ball37px.png
index 4388283..4388283 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/ball37px.png
+++ b/examples/adding_up_to_10_canvas/assets/images/ball37px.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/balloon37px.png b/examples/adding_up_to_10_canvas/assets/images/balloon37px.png
index 8f47d6a..8f47d6a 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/balloon37px.png
+++ b/examples/adding_up_to_10_canvas/assets/images/balloon37px.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/banana37px.png b/examples/adding_up_to_10_canvas/assets/images/banana37px.png
index 90728e6..90728e6 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/banana37px.png
+++ b/examples/adding_up_to_10_canvas/assets/images/banana37px.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/chilli.png b/examples/adding_up_to_10_canvas/assets/images/chilli.png
index 5f8b64d..5f8b64d 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/chilli.png
+++ b/examples/adding_up_to_10_canvas/assets/images/chilli.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/fish64px.png b/examples/adding_up_to_10_canvas/assets/images/fish64px.png
index a29f12c..a29f12c 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/fish64px.png
+++ b/examples/adding_up_to_10_canvas/assets/images/fish64px.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/flower37px.png b/examples/adding_up_to_10_canvas/assets/images/flower37px.png
index 224e707..224e707 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/flower37px.png
+++ b/examples/adding_up_to_10_canvas/assets/images/flower37px.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/happyChimp_120x125.png b/examples/adding_up_to_10_canvas/assets/images/happyChimp_120x125.png
index 5e721c9..5e721c9 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/happyChimp_120x125.png
+++ b/examples/adding_up_to_10_canvas/assets/images/happyChimp_120x125.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/happyMonkey.jpg b/examples/adding_up_to_10_canvas/assets/images/happyMonkey.jpg
index bfe0d38..bfe0d38 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/happyMonkey.jpg
+++ b/examples/adding_up_to_10_canvas/assets/images/happyMonkey.jpg
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/normalChimp_120x125.png b/examples/adding_up_to_10_canvas/assets/images/normalChimp_120x125.png
index a731df4..a731df4 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/normalChimp_120x125.png
+++ b/examples/adding_up_to_10_canvas/assets/images/normalChimp_120x125.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/plussign.png b/examples/adding_up_to_10_canvas/assets/images/plussign.png
index 915c5aa..915c5aa 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/plussign.png
+++ b/examples/adding_up_to_10_canvas/assets/images/plussign.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/sadChimp_120x125.png b/examples/adding_up_to_10_canvas/assets/images/sadChimp_120x125.png
index 1dec5f0..1dec5f0 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/sadChimp_120x125.png
+++ b/examples/adding_up_to_10_canvas/assets/images/sadChimp_120x125.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/scorebox.png b/examples/adding_up_to_10_canvas/assets/images/scorebox.png
index 424b60b..424b60b 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/scorebox.png
+++ b/examples/adding_up_to_10_canvas/assets/images/scorebox.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/sidebar.png b/examples/adding_up_to_10_canvas/assets/images/sidebar.png
index 9632788..9632788 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/sidebar.png
+++ b/examples/adding_up_to_10_canvas/assets/images/sidebar.png
diff --git a/examples/adding_up_to_10_canvas/assets/generic/images/yellowBox.png b/examples/adding_up_to_10_canvas/assets/images/yellowBox.png
index f7a72ca..f7a72ca 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/images/yellowBox.png
+++ b/examples/adding_up_to_10_canvas/assets/images/yellowBox.png
diff --git a/examples/adding_up_to_10_canvas/assets/sounds/correct.ogg b/examples/adding_up_to_10_canvas/assets/sounds/correct.ogg
new file mode 100755
index 0000000..a0d9e3a
--- /dev/null
+++ b/examples/adding_up_to_10_canvas/assets/sounds/correct.ogg
diff --git a/examples/adding_up_to_10_canvas/assets/sounds/incorrect.ogg b/examples/adding_up_to_10_canvas/assets/sounds/incorrect.ogg
new file mode 100755
index 0000000..4805e55
--- /dev/null
+++ b/examples/adding_up_to_10_canvas/assets/sounds/incorrect.ogg
diff --git a/examples/adding_up_to_10_canvas/assets/generic/sounds/trigger.ogg b/examples/adding_up_to_10_canvas/assets/sounds/trigger.ogg
index f22512a..f22512a 100755
--- a/examples/adding_up_to_10_canvas/assets/generic/sounds/trigger.ogg
+++ b/examples/adding_up_to_10_canvas/assets/sounds/trigger.ogg
diff --git a/examples/adding_up_to_10_canvas/index.html b/examples/adding_up_to_10_canvas/index.html
index ea752d9..49cee59 100755
--- a/examples/adding_up_to_10_canvas/index.html
+++ b/examples/adding_up_to_10_canvas/index.html
@@ -22,15 +22,15 @@
       <div id="actionTop">
 
 	<div id="topLtSide">
-	  <img id="topLtBox" src="assets/generic/images/yellowBox.png" alt="" />
+	  <img id="topLtBox" src="assets/images/yellowBox.png" alt="" />
 	  <canvas id="topLtCanvas" width="200px" height="200px"></canvas>
 
 	</div>
 	<div id="topMd">
-	  <img id="plussign" src="assets/generic/images/plussign.png" alt=""/>
+	  <img id="plussign" src="assets/images/plussign.png" alt=""/>
 	</div>
 	<div id="topRtSide">
-	  <img id="topRtBox" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <img id="topRtBox" src="assets/images/yellowBox.png" alt=""/>
 	  <canvas id="topRtCanvas" width="200px" height="200px"></canvas>
 	</div>
 
@@ -39,15 +39,15 @@
       <div id="bottom">
 	<!-- <canvas id="bottomCanvas"></canvas> -->
 	<div id="bottomLt" class="bottom">
-	  <img class="bottomBox" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <img class="bottomBox" src="assets/images/yellowBox.png" alt=""/>
 	  <canvas id="bottomLtCanvas" class="bottomBox" width="200px" height="200px"> </canvas>
 	</div>
 	<div id="bottomMd" class="bottom">
-	  <img class="bottomBox" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <img class="bottomBox" src="assets/images/yellowBox.png" alt=""/>
 	  <canvas id="bottomMdCanvas" class="bottomBox" width="200px" height="200px"> </canvas>
 	</div>
 	<div id="bottomRt" class="bottom">
-	  <img class="bottomBox" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <img class="bottomBox" src="assets/images/yellowBox.png" alt=""/>
 	  <canvas id="bottomRtCanvas" class="bottomBox" width="200px" height="200px"> </canvas>
 	</div>
 
@@ -56,11 +56,11 @@
     </div>
     <div id="sidebar">
       <div class="sidebarItem">
-	<img id="timer" src="assets/generic/images/scorebox.png" alt=""/>
+	<img id="timer" src="assets//images/scorebox.png" alt=""/>
 	<canvas id="timerCanvas" width="100" height="140" > </canvas>
       </div>
       <div class="sidebarItem">
-	<img id="scorebox" src="assets/generic/images/scorebox.png" alt=""/>
+	<img id="scorebox" src="assets/images/scorebox.png" alt=""/>
 	<canvas id="scoreboxCanvas" width="100" height="140"></canvas>
       </div>
       <div class="sidebarItem">
diff --git a/examples/adding_up_to_10_canvas/js/lesson.js b/examples/adding_up_to_10_canvas/js/lesson.js
index 44b280c..1860dd9 100755
--- a/examples/adding_up_to_10_canvas/js/lesson.js
+++ b/examples/adding_up_to_10_canvas/js/lesson.js
@@ -19,8 +19,8 @@ $(document).ready(function(){
 	,
 	sounds: [
 
-	    {name: "correct",  file: "correct.ogg", localized: true},
-	    {name: "incorrect", file: "incorrect.ogg", localized: true},
+	    {name: "correct",  file: "correct.ogg"},
+	    {name: "incorrect", file: "incorrect.ogg"},
 	    {name: "trigger", file: "trigger.ogg"}
  	    
 	],
diff --git a/examples/adding_up_to_10_svg/assets/generic/sounds/correct.ogg b/examples/adding_up_to_10_svg/assets/generic/sounds/correct.ogg
deleted file mode 100755
index c89ce57..0000000
--- a/examples/adding_up_to_10_svg/assets/generic/sounds/correct.ogg
+++ /dev/null
diff --git a/examples/adding_up_to_10_svg/assets/generic/sounds/incorrect.ogg b/examples/adding_up_to_10_svg/assets/generic/sounds/incorrect.ogg
deleted file mode 100755
index 2306562..0000000
--- a/examples/adding_up_to_10_svg/assets/generic/sounds/incorrect.ogg
+++ /dev/null
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/ball37px.png b/examples/adding_up_to_10_svg/assets/images/ball37px.png
index 4388283..4388283 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/ball37px.png
+++ b/examples/adding_up_to_10_svg/assets/images/ball37px.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/balloon37px.png b/examples/adding_up_to_10_svg/assets/images/balloon37px.png
index 8f47d6a..8f47d6a 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/balloon37px.png
+++ b/examples/adding_up_to_10_svg/assets/images/balloon37px.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/banana37px.png b/examples/adding_up_to_10_svg/assets/images/banana37px.png
index 90728e6..90728e6 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/banana37px.png
+++ b/examples/adding_up_to_10_svg/assets/images/banana37px.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/chilli.png b/examples/adding_up_to_10_svg/assets/images/chilli.png
index 5f8b64d..5f8b64d 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/chilli.png
+++ b/examples/adding_up_to_10_svg/assets/images/chilli.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/fish64px.png b/examples/adding_up_to_10_svg/assets/images/fish64px.png
index a29f12c..a29f12c 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/fish64px.png
+++ b/examples/adding_up_to_10_svg/assets/images/fish64px.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/flower37px.png b/examples/adding_up_to_10_svg/assets/images/flower37px.png
index 224e707..224e707 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/flower37px.png
+++ b/examples/adding_up_to_10_svg/assets/images/flower37px.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/happyChimp_120x125.png b/examples/adding_up_to_10_svg/assets/images/happyChimp_120x125.png
index 5e721c9..5e721c9 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/happyChimp_120x125.png
+++ b/examples/adding_up_to_10_svg/assets/images/happyChimp_120x125.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/happyMonkey.jpg b/examples/adding_up_to_10_svg/assets/images/happyMonkey.jpg
index bfe0d38..bfe0d38 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/happyMonkey.jpg
+++ b/examples/adding_up_to_10_svg/assets/images/happyMonkey.jpg
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/normalChimp_120x125.png b/examples/adding_up_to_10_svg/assets/images/normalChimp_120x125.png
index a731df4..a731df4 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/normalChimp_120x125.png
+++ b/examples/adding_up_to_10_svg/assets/images/normalChimp_120x125.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/plussign.png b/examples/adding_up_to_10_svg/assets/images/plussign.png
index 915c5aa..915c5aa 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/plussign.png
+++ b/examples/adding_up_to_10_svg/assets/images/plussign.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/sadChimp_120x125.png b/examples/adding_up_to_10_svg/assets/images/sadChimp_120x125.png
index 1dec5f0..1dec5f0 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/sadChimp_120x125.png
+++ b/examples/adding_up_to_10_svg/assets/images/sadChimp_120x125.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/scorebox.png b/examples/adding_up_to_10_svg/assets/images/scorebox.png
index 424b60b..424b60b 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/scorebox.png
+++ b/examples/adding_up_to_10_svg/assets/images/scorebox.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/sidebar.png b/examples/adding_up_to_10_svg/assets/images/sidebar.png
index 9632788..9632788 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/sidebar.png
+++ b/examples/adding_up_to_10_svg/assets/images/sidebar.png
diff --git a/examples/adding_up_to_10_svg/assets/generic/images/yellowBox.png b/examples/adding_up_to_10_svg/assets/images/yellowBox.png
index f7a72ca..f7a72ca 100755
--- a/examples/adding_up_to_10_svg/assets/generic/images/yellowBox.png
+++ b/examples/adding_up_to_10_svg/assets/images/yellowBox.png
diff --git a/examples/adding_up_to_10_svg/assets/sounds/correct.ogg b/examples/adding_up_to_10_svg/assets/sounds/correct.ogg
new file mode 100755
index 0000000..a0d9e3a
--- /dev/null
+++ b/examples/adding_up_to_10_svg/assets/sounds/correct.ogg
diff --git a/examples/adding_up_to_10_svg/assets/sounds/incorrect.ogg b/examples/adding_up_to_10_svg/assets/sounds/incorrect.ogg
new file mode 100755
index 0000000..4805e55
--- /dev/null
+++ b/examples/adding_up_to_10_svg/assets/sounds/incorrect.ogg
diff --git a/examples/adding_up_to_10_svg/assets/generic/sounds/trigger.ogg b/examples/adding_up_to_10_svg/assets/sounds/trigger.ogg
index f22512a..f22512a 100755
--- a/examples/adding_up_to_10_svg/assets/generic/sounds/trigger.ogg
+++ b/examples/adding_up_to_10_svg/assets/sounds/trigger.ogg
diff --git a/examples/adding_up_to_10_svg/index.html b/examples/adding_up_to_10_svg/index.html
index 6a861d1..cf38c40 100755
--- a/examples/adding_up_to_10_svg/index.html
+++ b/examples/adding_up_to_10_svg/index.html
@@ -23,15 +23,15 @@
       <div id="top">
 
 	<div id="topLeftArea">
-	  <img id="topLeftCard" src="assets/generic/images/yellowBox.png" alt="" />
+	  <img id="topLeftCard" src="assets/images/yellowBox.png" alt="" />
 	  <div id="topLeftPaper" ></div>
 
 	</div>
 	<div id="topMiddleArea">
-	  <img id="plusSign" src="assets/generic/images/plussign.png" alt=""/>
+	  <img id="plusSign" src="assets/images/plussign.png" alt=""/>
 	</div>
 	<div id="topRightArea">
-	  <img id="topRightCard" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <img id="topRightCard" src="assets/images/yellowBox.png" alt=""/>
 	  <div id="topRightPaper"></div>
 	</div>
 
@@ -39,15 +39,15 @@
 
       <div id="bottom">
 	<div id="bottomLeft" class="bottom">
-	  <img class="bottomCard" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <img class="bottomCard" src="assets/images/yellowBox.png" alt=""/>
 	  <div id="bottomLeftPaper" class="bottomCard"> </div>
 	</div>
 	<div id="bottomMiddle" class="bottom">
-	  <img class="bottomCard" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <img class="bottomCard" src="assets/images/yellowBox.png" alt=""/>
 	  <div id="bottomMiddlePaper" class="bottomCard"> </div>
 	</div>
 	<div id="bottomRight" class="bottom">
-	  <img class="bottomCard" src="assets/generic/images/yellowBox.png" alt=""/>
+	  <img class="bottomCard" src="assets/images/yellowBox.png" alt=""/>
 	  <div id="bottomRightPaper" class="bottomCard"> </div>
 	</div>
 
@@ -56,11 +56,11 @@
     </div>
     <div id="side">
       <div class="sideItem">
-	<img id="timer" src="assets/generic/images/scorebox.png" alt=""/>
+	<img id="timer" src="assets/images/scorebox.png" alt=""/>
 	<div id="timerPaper"> </div>
       </div>
       <div class="sideItem">
-	<img id="scoreBox" src="assets/generic/images/scorebox.png" alt=""/>
+	<img id="scoreBox" src="assets/images/scorebox.png" alt=""/>
 	<div id="scoreBoxText"></div>
       </div>
       <div class="sideItem">
diff --git a/examples/adding_up_to_10_svg/js/lesson.js b/examples/adding_up_to_10_svg/js/lesson.js
index d333515..6a810c9 100755
--- a/examples/adding_up_to_10_svg/js/lesson.js
+++ b/examples/adding_up_to_10_svg/js/lesson.js
@@ -17,8 +17,8 @@ $(document).ready(function(){
 	    {name: "happyChimp", file: "happyChimp_120x125.png"},
 	    {name: "sadChimp", file: "sadChimp_120x125.png"}],
 	sounds: [
-	    {name: "correct",  file: "correct.ogg", localized: true},
-	    {name: "incorrect", file: "incorrect.ogg", localized: true},
+	    {name: "correct",  file: "correct.ogg"},
+	    {name: "incorrect", file: "incorrect.ogg"},
 	    {name: "trigger", file: "trigger.ogg"}
 	]
 
diff --git a/js/jquery.karma.js b/js/jquery.karma.js
index 2d06c9b..bdd212e 100755
--- a/js/jquery.karma.js
+++ b/js/jquery.karma.js
@@ -110,15 +110,15 @@ var Karma = function( options ) {
 		po: "po/",
 		images: {
 				localized:	"assets/$/images/",
-				generic:	"assets/generic/images/"
+				generic:	"assets/images/"
 				},
 		sounds: {
 				localized:	"assets/$/sounds/",
-				generic:	"assets/generic/sounds/"
+				generic:	"assets/sounds/"
 				},
 		videos: {
 				localized:	"assets/$/videos/",
-				generic:	"assets/generic/videos/"
+				generic:	"assets/videos/"
 				}
 	};
 	that.supportedLangFileTypes = [ 
@@ -308,8 +308,9 @@ var Karma = function( options ) {
 	if ( typeof that.language.lang !== "undefined" ) {
 		that.language.alternatives.unshift( that.language.lang );
 	}
+        //this doesn't work right now so commenting out
 	//try to load the localized lang file (po or json or ...)
-	that.language.fileLoaded = loadAlternatives( );
+	//that.language.fileLoaded = loadAlternatives( );
 	//initializes the container
 	if ( typeof that.container === "string" ) {
 		that.container = $( that.container )[ 0 ];