Merge pull request #59 from euforic/locale

[TIMOB-13999] [TIMOB-14581]
tidev · Sep 30, 2013 · e6653fa · e6653fa
2 parents c2f4df3 + 8ea67ae
commit e6653fa
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 64 deletions.
diff --git a/build/liveview.js b/build/liveview.js
@@ -391,8 +391,12 @@ Module.patch = function (globalCtx, url, port) {
   Module._port = port || 8324;
   Module._requireNative = globalCtx.require;
   Module.evtServer && Module.evtServer.close();
+
+  globalCtx.localeStrings = Module.require('localeStrings');
+  globalCtx.L = function (name, filler) {
+    return (globalCtx.localeStrings[Ti.Locale.currentLanguage] || {})[name] || filler || name;
+  };
   Module.connectServer();
-  Module.require('app');
 }
 
 /**
@@ -624,7 +628,6 @@ Module.prototype._compile = function() {
     return;
   }
   this.source = Module._wrap(src);
-
   try{
     var fn = Function('exports, require, module, __filename, __dirname, lvGlobal',this.source);
     fn(this.exports, Module.require, this, this.filename, this.__dirname, global);

diff --git a/build/liveview.min.js b/build/liveview.min.js