From 1718523367e147e240cd6e9fe2c888491d102897 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Wed, 1 Jan 2014 19:02:34 -0500
Subject: Implement French UI.

---
 www/index.html    | 2 +-
 www/js/html5ks.js | 2 +-
 www/js/i18n.js    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'www')

diff --git a/www/index.html b/www/index.html
index f2f9dec..a623f50 100644
--- a/www/index.html
+++ b/www/index.html
@@ -89,7 +89,7 @@
         </div>
         <div id="return" class="button" style="position: absolute; bottom: 15px; right: 20px;">
           <img src="dump/ui/bt-return.png">
-          Return
+          <span class="return_button_text"></span>
         </div>
       </div>
       <div id="context" style="display: none;">
diff --git a/www/js/html5ks.js b/www/js/html5ks.js
index 82cdfa3..59bd940 100644
--- a/www/js/html5ks.js
+++ b/www/js/html5ks.js
@@ -188,7 +188,7 @@ window.html5ks = {
           xhr.open("GET", "json/" + name + ".json");
           xhr.onload = function () {
             html5ks.data[name] = JSON.parse(xhr.responseText);
-            deferred.resolve();
+            deferred.resolve(html5ks.data[name]);
           };
           xhr.send();
         }
diff --git a/www/js/i18n.js b/www/js/i18n.js
index 427d9b3..1d8f046 100644
--- a/www/js/i18n.js
+++ b/www/js/i18n.js
@@ -1,8 +1,8 @@
 "use strict";
 html5ks.i18n = {
   init: function () {
-    html5ks.fetch("json", "ui-strings").then(function () {
-      var uiStrings = html5ks.data["ui-strings"];
+    html5ks.fetch("json", html5ks.persistent.language === "en" ?
+                          "ui-strings" : "ui-strings_FR").then(function (uiStrings) {
       for (var k in uiStrings) {
         var e = document.getElementsByClassName(k);
         for (var i = e.length - 1; i >= 0; i--) {
-- 
cgit v1.2.3-54-g00ecf