refactor header and footer to use messages._locale_name_.json w/ context

13 files changed, 192 insertions, 19 deletions

diff --git a/examples/6_Maths_matchingAnglesAndShapes/index.html b/examples/6_Maths_matchingAnglesAndShapes/index.html
index 08d851b..9c4202f 100755
--- a/examples/6_Maths_matchingAnglesAndShapes/index.html
+++ b/examples/6_Maths_matchingAnglesAndShapes/index.html
@@ -13,10 +13,9 @@
 	<script type="text/javascript" 

 		src="../../js/ui.core-draggable-resizable-dialog.js"></script>

 	<script type="text/javascript" src="../../js/jquery.i18n.js"></script>

-	<script type="text/javascript" src="../../js/jquery.ne.json"></script>

 	<script type="text/javascript" src="../../js/ui.kHeader.js"></script>

 	<script type="text/javascript" src="../../js/ui.kFooter.js"></script>

-	<script type="text/javascript" src="../../js/ui.kFooter.ne.json"></script>

+	<script type="text/javascript" src="./js/messages.es.json"></script>

 	<script type="text/javascript" src="../../js/ui.feedback.js"></script>

 	<script type="text/javascript" src="../../js/karma.js"></script>

 	<script type="text/javascript" src="js/lesson.js"></script>

diff --git a/examples/6_Maths_matchingAnglesAndShapes/js/lesson.js b/examples/6_Maths_matchingAnglesAndShapes/js/lesson.js
index 46cbf77..2aff46c 100755
--- a/examples/6_Maths_matchingAnglesAndShapes/js/lesson.js
+++ b/examples/6_Maths_matchingAnglesAndShapes/js/lesson.js
@@ -25,6 +25,7 @@ $(document).ready(function() {
 	var $kFooter = $('#kFooter').kFooter({scoreboard: false, startButton: true,
 		pauseButton: true, restartButton: true, timer: true});
 
+
 	$kFooter.bind('kFooterStart', game);  		      
 	$kFooter.bind('kFooterRestart', game);
 
diff --git a/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json b/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json
new file mode 100644
index 0000000..c9be5bd
--- /dev/null
+++ b/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json
@@ -0,0 +1,21 @@
+/* -*- coding: utf-8  -*- */
+$.i18n.es = {};
+$.i18n.es.strings = {
+    "default":{
+
+    },
+    "$.ui.kFooter":{
+	"Play Again": "Repite",
+	"Pause" : "Pausa",
+	"Start" : "Comienza",
+	"Timer" : "Reloj",
+	"Total" : "Total",
+	"Score" : "Puntos"
+    },
+    "$.ui.kHeader":{
+	"Lesson Plan": "Plan de Lección",
+	"Teacher's Note": "Nota de Profesora"
+    }
+};
+
+$(function() { $.i18n.setLocale('es'); });
\ No newline at end of file
diff --git a/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json~ b/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json~
new file mode 100644
index 0000000..3b1f550
--- /dev/null
+++ b/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json~
@@ -0,0 +1,13 @@
+/* -*- coding: utf-8  -*- */
+$.i18n.es = {};
+$.i18n.es.strings = {
+    "default":{
+
+    },
+    "$.ui.kHeader":{
+	
+	
+    }    
+};
+
+$(function() { $.i18n.setLocale('es'); });
\ No newline at end of file
diff --git a/examples/English_Animal_Identification/index.html b/examples/English_Animal_Identification/index.html
index c32dfc3..a19bbef 100755
--- a/examples/English_Animal_Identification/index.html
+++ b/examples/English_Animal_Identification/index.html
@@ -13,13 +13,11 @@
 

 	<script type="text/javascript" src="../../js/jquery-1.3.2.min.js"></script>

 	<script type="text/javascript" src="../../js/jquery.i18n.js"></script>

-	<script type="text/javascript" src="../../js/jquery.ne.json"></script>

 	<script type="text/javascript" 

 		src="../../js/ui.core-draggable-resizable-dialog.js"></script>

 	<script type="text/javascript" src="../../js/ui.kHeader.js"></script>

-	<script type="text/javascript" src="../../js/ui.kHeader.ne.json"></script>

 	<script type="text/javascript" src="../../js/ui.kFooter.js"></script>

-	<script type="text/javascript" src="../../js/ui.kFooter.ne.json"></script>

+	<script type="text/javascript" src="./js/messages.ne.json"></script>

 	<script type="text/javascript" src="../../js/ui.feedback.js"></script>

 	<script type="text/javascript" src="../../js/karma.js"></script>

 	<script type="text/javascript" src="js/lesson.js"></script>

diff --git a/examples/English_Animal_Identification/index.html~ b/examples/English_Animal_Identification/index.html~
new file mode 100755
index 0000000..c32dfc3
--- /dev/null
+++ b/examples/English_Animal_Identification/index.html~
@@ -0,0 +1,68 @@
+<!DOCTYPE html>

+<html lang="en">

+<head>

+	<title>English_Animal Identification</title>

+

+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

+

+	<link type="image/ico" rel="icon" href="../../assets/image/favicon.ico" />

+	<link type="text/css" rel="stylesheet" href="../../css/karma.css" />

+	<link type="text/css" rel="stylesheet" href="../../css/ui.kHeader.css" />

+	<link type="text/css" rel="stylesheet" href="../../css/ui.kFooter.css" />

+	<link type="text/css" rel="stylesheet" href="css/lesson.css" />

+

+	<script type="text/javascript" src="../../js/jquery-1.3.2.min.js"></script>

+	<script type="text/javascript" src="../../js/jquery.i18n.js"></script>

+	<script type="text/javascript" src="../../js/jquery.ne.json"></script>

+	<script type="text/javascript" 

+		src="../../js/ui.core-draggable-resizable-dialog.js"></script>

+	<script type="text/javascript" src="../../js/ui.kHeader.js"></script>

+	<script type="text/javascript" src="../../js/ui.kHeader.ne.json"></script>

+	<script type="text/javascript" src="../../js/ui.kFooter.js"></script>

+	<script type="text/javascript" src="../../js/ui.kFooter.ne.json"></script>

+	<script type="text/javascript" src="../../js/ui.feedback.js"></script>

+	<script type="text/javascript" src="../../js/karma.js"></script>

+	<script type="text/javascript" src="js/lesson.js"></script>

+

+</head>

+<body>

+	<div id="kHeader">

+	</div>

+

+	<!-- Put the help text here -->

+	<div id="kHelp" title="Help Title"> Help text here</div>

+

+	<div id="feedback"></div>

+	<div id="kMain">

+		<div id="questionBox">What is this?</div>

+	

+		<div id="imageBox">

+		  <img class="imageBox" id="imgObject" src="" alt=""/>

+		</div>

+

+		<div id="options">

+		  <span class="option" id="option0"></span>

+		  <span class="option" id="option1"></span>

+		  <span class="option" id="option2"></span>

+		  <span class="option" id="option3"></span>

+		</div>

+

+		<!--<img class = "imageBox" id="imgObject" src="" alt=""/>

+		

+		<div id="options">

+			<a href="#" id="anchorOpt0">

+			  <img class="optImg" id="option0" src="" alt=""/>

+			</a>

+			<a href="#" id="anchorOpt1"><img class="optImg" id="option1" src="" alt=""/></a>

+			<a href="#" id="anchorOpt2"><img class="optImg" id="option2" src="" alt=""/></a>

+			<a href="#" id="anchorOpt3"><img class="optImg" id="option3" src="" alt=""/></a>

+		</div>

+		

+		<div id="gameOver">

+			Game Over

+		</div>-->

+	</div>

+	<div id="kFooter">

+	</div>

+</body>

+</html>
\ No newline at end of file
diff --git a/examples/English_Animal_Identification/js/lesson.js b/examples/English_Animal_Identification/js/lesson.js
index bb8eac0..f932b4c 100755
--- a/examples/English_Animal_Identification/js/lesson.js
+++ b/examples/English_Animal_Identification/js/lesson.js
@@ -21,7 +21,7 @@ $(document).ready(
     k.scaleWindow();
 
     //sets locale, otherwise defaults to English
-    $.i18n.setLocale('en');
+    //$.i18n.setLocale('en');
 
     //put your main lesson code here
     k.ready(
diff --git a/examples/English_Animal_Identification/js/messages.es.json b/examples/English_Animal_Identification/js/messages.es.json
new file mode 100644
index 0000000..c9be5bd
--- /dev/null
+++ b/examples/English_Animal_Identification/js/messages.es.json
@@ -0,0 +1,21 @@
+/* -*- coding: utf-8  -*- */
+$.i18n.es = {};
+$.i18n.es.strings = {
+    "default":{
+
+    },
+    "$.ui.kFooter":{
+	"Play Again": "Repite",
+	"Pause" : "Pausa",
+	"Start" : "Comienza",
+	"Timer" : "Reloj",
+	"Total" : "Total",
+	"Score" : "Puntos"
+    },
+    "$.ui.kHeader":{
+	"Lesson Plan": "Plan de Lección",
+	"Teacher's Note": "Nota de Profesora"
+    }
+};
+
+$(function() { $.i18n.setLocale('es'); });
\ No newline at end of file
diff --git a/examples/English_Animal_Identification/js/messages.ne.json b/examples/English_Animal_Identification/js/messages.ne.json
new file mode 100644
index 0000000..f0145a7
--- /dev/null
+++ b/examples/English_Animal_Identification/js/messages.ne.json
@@ -0,0 +1,21 @@
+/* -*- coding: utf-8  -*- */
+$.i18n.ne = {};
+$.i18n.ne.strings = {
+    "default":{
+
+    },
+    "$.ui.kFooter":{
+	"Play Again": "फेरी खेलौ",
+	"Pause" : "खेल रोकौ",
+	"Start" : "सुरु गरौ",
+	"Timer" : "",
+	"Total" : "जम्मा",
+	"Score" : "अङ्क"
+    },
+    "$.ui.kHeader":{
+	"Lesson Plan": "पाठविवरण",
+	"Teacher's Note": "पाठयोजना"
+    }
+};
+
+$(function() { $.i18n.setLocale('ne'); });
\ No newline at end of file
diff --git a/examples/English_Animal_Identification/js/messages.ne.json~ b/examples/English_Animal_Identification/js/messages.ne.json~
new file mode 100644
index 0000000..c9be5bd
--- /dev/null
+++ b/examples/English_Animal_Identification/js/messages.ne.json~
@@ -0,0 +1,21 @@
+/* -*- coding: utf-8  -*- */
+$.i18n.es = {};
+$.i18n.es.strings = {
+    "default":{
+
+    },
+    "$.ui.kFooter":{
+	"Play Again": "Repite",
+	"Pause" : "Pausa",
+	"Start" : "Comienza",
+	"Timer" : "Reloj",
+	"Total" : "Total",
+	"Score" : "Puntos"
+    },
+    "$.ui.kHeader":{
+	"Lesson Plan": "Plan de Lección",
+	"Teacher's Note": "Nota de Profesora"
+    }
+};
+
+$(function() { $.i18n.setLocale('es'); });
\ No newline at end of file
diff --git a/js/jquery.i18n.js b/js/jquery.i18n.js
index db142c4..9d9c294 100644
--- a/js/jquery.i18n.js
+++ b/js/jquery.i18n.js
@@ -12,10 +12,19 @@
 	 if (!this.i18n[lang] || !this.i18n[lang].strings){
 	     return string;
 	 }
-	 return this.i18n[lang].strings[string]||string;
+	 return this.i18n[lang].strings['default'][string]||string;
+     };
+
+    $.i18n.cgettext = function(context, string, locale){
+	 var lang = locale || $.i18n.lang;
+	 if (!this.i18n[lang] || !this.i18n[lang].strings){
+	     return string;
+	 }
+	 return this.i18n[lang].strings[context][string]||string;
      };
 
      $._ = $.i18n;
+     $._c = $.i18n.cgettext;
 
      $.i18n.setLocale = function (locale){
 	 $.i18n.lang = locale;
diff --git a/js/ui.kFooter.js b/js/ui.kFooter.js
index d25f6bd..d5ede51 100755
--- a/js/ui.kFooter.js
+++ b/js/ui.kFooter.js
@@ -157,9 +157,9 @@
 		  stopTimer : function(){
 		      this._setData('timerRunning', false);
 		  },
-		   _ : function(val, loc){
+		  _c : function(val){
 		      if($.i18n){
-			  return $.i18n.call($.ui.kFooter, val, loc);
+			  return $._c('$.ui.kFooter', val);
 		      }
 		      return val;
 		  },
@@ -195,11 +195,11 @@
 		      
 		      if(options.scoreboard === true){
 			  
-			  var $scoreboard = $("<li class='left'>" + this._("Score") + 
+			  var $scoreboard = $("<li class='left'>" + this._c("Score") + 
 			      "</li>" + "<li class='left'>" +
 			      "<span id='kFooterScore' class='ui-corner-all number'>" + 
 			      this._n(score) + "</span></li>" +
-			      "<li class='left'>" + this._("Total") + "</li>" +
+			      "<li class='left'>" + this._c("Total") + "</li>" +
 			      "<li class='left'><span id='kFooterTotal' " +
 			      "class='ui-corner-all number'>" + 
 			  this._n(total) + "</span></li>")
@@ -211,7 +211,7 @@
 		      }
 
 		      if(options.timer === true){
-			  this._$timer = $("<li class='left'>" + this._("Timer") + 
+			  this._$timer = $("<li class='left'>" + this._c("Timer") + 
 			      "</li>" +
 			      "<li class='left'><span id='kFooterMins'" + 
 			      "class='ui-corner-all" +
@@ -234,7 +234,8 @@
 			      "class='ui-corner-all ui-state-default'>" +
  			      "<span class='ui-icon ui-icon-arrowrefresh-1-w'>" +
 			      "</span>" + 
-			      "<span class='text left'>" + this._('Play Again') + 
+			      "<span class='text left'>" + 
+			      this._c('Play Again') + 
 			      "</span></button></li>")
 			      .click(function(){ 
 					 self.startTimer();
@@ -248,7 +249,7 @@
 			      "class='ui-corner-all ui-state-default'>" +
  			      "<span class='ui-icon ui-icon-pause'>" +
 			      "</span>" + 
-			      "<span class='text left'>" + this._('Pause') + 
+			      "<span class='text left'>" + this._c('Pause') + 
 			      "</span></button></li>")
 			      .click(function(){ 
 					 self.stopTimer();
@@ -262,7 +263,7 @@
 			      "class='ui-corner-all ui-state-default'>" +
  			      "<span class='ui-icon ui-icon-play'>" +
 			      "</span>" + 
-			      "<span class='text left'>" + this._('Start') + 
+			      "<span class='text left'>" + this._c('Start') + 
 			      "</span></button></li>")
 			      .click(function(){ 
 				      self.startTimer();
diff --git a/js/ui.kHeader.js b/js/ui.kHeader.js
index 2efac0d..966c85a 100755
--- a/js/ui.kHeader.js
+++ b/js/ui.kHeader.js
@@ -18,9 +18,9 @@
 
      $.widget('ui.kHeader',
 	      /** @lends $.ui.kHeader.prototype */
-	      {	  _ : function(val, loc){
+	      {	  _c : function(val){
 		      if($.i18n){
-			  return $.i18n.call($.ui.kHeader, val, loc);
+			  return $._c('$.ui.kHeader', val);
 		      }
 		      return val;
 		  },
@@ -66,14 +66,14 @@
 			  if (options.lessonPlan){
 			      $("<div>" + 
 				"<a href='./kDoc.html?back=index.html&doc=lessonPlan'>" + 
-				this._("Lesson Plan") + "</a></div>")
+				this._c("Lesson Plan") + "</a></div>")
 				.appendTo($dropDownArea);
 			  }
 
 			  if (options.teachersNote){
 			      $("<div>" + 
 				"<a href='./kDoc.html?back=index.html&doc=teachersNote'>" + 
-				this._("Teacher's Note") + "</a></div>")
+				this._c("Teacher's Note") + "</a></div>")
 				.appendTo($dropDownArea);
 			  }