From 4b4266f1a0c6f1f571d8787492db323caeec8183 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sat, 14 Aug 2010 23:37:40 +0400
Subject: [PATCH] * mytinytodo js lang init changed

---
 src/lang/class.default.php                 | 2 +-
 src/mytinytodo.js                          | 4 +---
 src/{ajax.lang.php => mytinytodo_lang.php} | 2 +-
 src/themes/default/index.php               | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename src/{ajax.lang.php => mytinytodo_lang.php} (80%)

diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index 83bced0..fb7b4c1 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -156,7 +156,7 @@ class DefaultLang
 		$a[] = $this->_2js('f_past');
 		$a[] = $this->_2js('f_today');
 		$a[] = $this->_2js('f_soon');
-		return "lang = {\n". implode(",\n", $a). "\n};";
+		return "{\n". implode(",\n", $a). "\n}";
 	}
 
 	function _2js($v)
diff --git a/src/mytinytodo.js b/src/mytinytodo.js
index 62e4262..9c3d3af 100644
--- a/src/mytinytodo.js
+++ b/src/mytinytodo.js
@@ -71,7 +71,7 @@ var mytinytodo = window.mytinytodo = _mtt = {
 			else return v;
 		},
 		
-		initArrays: function(lang)
+		init: function(lang)
 		{
 			this.__lang = lang;
 			this.daysMin = this.__lang.daysMin;
@@ -90,8 +90,6 @@ var mytinytodo = window.mytinytodo = _mtt = {
 		flag.needAuth = options.needAuth ? true : false;
 		flag.isLogged = options.isLogged ? true : false;
 
-		this.lang.initArrays(lang);
-
 		if(this.options.showdate) $('#page_tasks').addClass('show-inline-date');
 		if(this.options.singletab) $('#lists .mtt-tabs').addClass('mtt-tabs-only-one');
 
diff --git a/src/ajax.lang.php b/src/mytinytodo_lang.php
similarity index 80%
rename from src/ajax.lang.php
rename to src/mytinytodo_lang.php
index c47b5cc..6c1c369 100644
--- a/src/ajax.lang.php
+++ b/src/mytinytodo_lang.php
@@ -7,6 +7,6 @@ require_once(MTTPATH. 'lang/class.default.php');
 require_once(MTTPATH. 'lang/'. $config['lang']. '.php');
 
 header('Content-type: text/javascript');
-echo Lang::instance()->makeJS();
+echo "mytinytodo.lang.init(". Lang::instance()->makeJS() .");";
 
 ?>
\ No newline at end of file
diff --git a/src/themes/default/index.php b/src/themes/default/index.php
index de44468..c8ba7d8 100644
--- a/src/themes/default/index.php
+++ b/src/themes/default/index.php
@@ -20,8 +20,8 @@
 <script type="text/javascript" src="<?php mttinfo('mtt_url'); ?>jquery/jquery-1.4.2.min.js"></script>
 <script type="text/javascript" src="<?php mttinfo('mtt_url'); ?>jquery/jquery-ui-1.7.2.custom.min.js"></script>
 <script type="text/javascript" src="<?php mttinfo('mtt_url'); ?>jquery/jquery.autocomplete-1.1.js"></script>
-<script type="text/javascript" src="<?php mttinfo('mtt_url'); ?>ajax.lang.php?v=@VERSION"></script>
 <script type="text/javascript" src="<?php mttinfo('mtt_url'); ?>mytinytodo.js?v=@VERSION"></script>
+<script type="text/javascript" src="<?php mttinfo('mtt_url'); ?>mytinytodo_lang.php?v=@VERSION"></script>
 <script type="text/javascript" src="<?php mttinfo('mtt_url'); ?>mytinytodo_ajax_storage.js?v=@VERSION"></script>
 <script type="text/javascript" src="<?php mttinfo('template_url'); ?>functions.js?v=@VERSION"></script>
 
@@ -38,7 +38,7 @@ $().ready(function(){
 		duedateformat: <?php echo (int)Config::get('duedateformat'); ?>,
 		autotag: <?php echo Config::get('autotag') ? "true" : "false"; ?>
 		<?php if(isset($_GET['list'])) echo ",openList: ". (int)$_GET['list']; ?>
-	}, lang).loadLists(1);
+	}).loadLists(1);
 });
 </script>