rework messages.json file for spanish

5 files changed, 18 insertions, 15 deletions

diff --git a/examples/6_Maths_matchingAnglesAndShapes/index.html b/examples/6_Maths_matchingAnglesAndShapes/index.html
index da1cee4..5239fc0 100755
--- a/examples/6_Maths_matchingAnglesAndShapes/index.html
+++ b/examples/6_Maths_matchingAnglesAndShapes/index.html
@@ -10,15 +10,14 @@
 	<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/messages.es.json"></script>

 	<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/ui.kHeader.js"></script>

 	<script type="text/javascript" src="../../js/ui.kFooter.js"></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/messages.json"></script>

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

 

 </head>

diff --git a/examples/6_Maths_matchingAnglesAndShapes/js/lesson.js b/examples/6_Maths_matchingAnglesAndShapes/js/lesson.js
index 5bff562..8aef7d8 100755
--- a/examples/6_Maths_matchingAnglesAndShapes/js/lesson.js
+++ b/examples/6_Maths_matchingAnglesAndShapes/js/lesson.js
@@ -117,7 +117,7 @@ $(document).ready(function() {
 			play = 0;
 			$('#content').html('');
 			$('#content').append('<div id="gameOver">GAME OVER<br/>Congratulations!!!</div>');
-            $('#content').append($(document.createElement('div'))
+		    /*    $('#content').append($(document.createElement('div'))
                                  .attr({id: 'gameOverInfo'})
                                  // clicks < 2 is impossible
                                  .html(format($.i18n.ngettext('You have completed the game in <span class="specialText">%d</span> clicks within <span class="specialText">%d</span> hour,',
@@ -131,7 +131,7 @@ $(document).ready(function() {
                                        + format ($.i18n.ngettext('<span class="specialText">%d</span> second.',
                                                                  '<span class="specialText">%d</span> seconds.',
                                                                  s),
-                                                 s)));
+                                                 s))); */
 		}
 	};
 
diff --git a/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json b/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json
index bad90a9..f889468 100644
--- a/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json
+++ b/examples/6_Maths_matchingAnglesAndShapes/js/messages.es.json
@@ -2,7 +2,7 @@
 $.i18n.es = {};
 $.i18n.es.strings = {
     "default":{
-        'Acute-Angle' : 'Ángulo-agudo',
+    'Acute-Angle' : 'Ángulo-agudo',
     'Right-Angle' : 'Ángulo-recto',
     'Obtuse-Angle' : 'Ángulo-obtuso',
     'Triangle' : 'Triángulo',
@@ -31,16 +31,20 @@ $.i18n.es.strings = {
     }
 };
 
-$(function() { $.i18n.setLocale('es'); });
+(function() { $.i18n.setLocale('es'); })();
+
+ $.i18n.setLocale('es');
 
 // You can put these inside the dict above, but for now this will be easier to merge.
-$.i18n.es.strings['You have completed the game in <span class="specialText">%d</span> clicks within <span class="specialText">%d</span> hour,'] =
+
+
+$.i18n.es.strings['default']['You have completed the game in <span class="specialText">%d</span> clicks within <span class="specialText">%d</span> hour,'] =
     ['Has acabado el juego en <span class="specialText">%d</span> clics en <span class="specialText">%d</span> hora,',
      'Has acabado el juego en <span class="specialText">%d</span> clics en <span class="specialText">%d</span> horas,'];
-$.i18n.es.strings['<span class="specialText">%d</span> minute and '] =
+$.i18n.es.strings['default']['<span class="specialText">%d</span> minute and '] =
     ['<span class="specialText">%d</span> minuto y ',
      '<span class="specialText">%d</span> minutos y '];
-$.i18n.es.strings['<span class="specialText">%d</span> second.'] =
+$.i18n.es.strings['default']['<span class="specialText">%d</span> second.'] =
     ['<span class="specialText">%d</span> segundo.',
      '<span class="specialText">%d</span> segundos.'];
 
diff --git a/examples/English_Animal_Identification/index.html b/examples/English_Animal_Identification/index.html
index a19bbef..e08f815 100755
--- a/examples/English_Animal_Identification/index.html
+++ b/examples/English_Animal_Identification/index.html
@@ -17,7 +17,7 @@
 		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.kFooter.js"></script>

-	<script type="text/javascript" src="./js/messages.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/js/jquery.i18n.js b/js/jquery.i18n.js
index 2df5e53..4eb303f 100644
--- a/js/jquery.i18n.js
+++ b/js/jquery.i18n.js
@@ -27,18 +27,18 @@
     // You can override this in messages.<lang>.json.
     $.i18n.choose_pluralized_msg = function (choices, n) {
         return n == 1 ? choices[0] : choices[1];
-    }
+    };
 
     $.i18n.ngettext = function (msgid1, msgid2, n) {
         var lang = $.i18n.lang;
         if (!$.i18n[lang] || !$.i18n[lang].strings) {
-            return $.choose_pluralized_msg([msgid1, msgid2], n);
+            return $.i18n.choose_pluralized_msg([msgid1, msgid2], n);
         }
         // Is using msgid1 as the key ok?
         return $.i18n.choose_pluralized_msg($.i18n[lang].strings[msgid1]
                                             || [msgid1, msgid2],
-                                            n)
-    }
+                                            n);
+    };
 
      $._ = $.i18n;
      $._c = $.i18n.cgettext;