r19178 - htdocs/trunk - Fix bug in lang.php and cleanup Makefile, patch by Tao Wang

[Geert Janssens]

Author: gjanssens
Date: 2010-05-17 09:25:09 -0400 (Mon, 17 May 2010)
New Revision: 19178
Trac: http://svn.gnucash.org/trac/changeset/19178

Modified:
   htdocs/trunk/Makefile
   htdocs/trunk/lang.php
Log:
Fix bug in lang.php and cleanup Makefile, patch by Tao Wang

Modified: htdocs/trunk/Makefile
===================================================================
--- htdocs/trunk/Makefile	2010-05-15 20:29:24 UTC (rev 19177)
+++ htdocs/trunk/Makefile	2010-05-17 13:25:09 UTC (rev 19178)
@@ -40,8 +40,7 @@
 # add when we have utf-8 translations: iconv -f UTF-8 -t ISO8859-1 
 
 nmz.onefile:
-	( echo '$$text_dir = "."; ?>'; \
-	  cat $(TMPLBASE)$(FILE).php_tmpl ) | php -q > \
+	( cat $(TMPLBASE)$(FILE).php_tmpl ) | php -q > \
 	  $(TMPLBASE)$(FILE)$(FILETAIL)
 
 nmz.lang:

Modified: htdocs/trunk/lang.php
===================================================================
--- htdocs/trunk/lang.php	2010-05-15 20:29:24 UTC (rev 19177)
+++ htdocs/trunk/lang.php	2010-05-17 13:25:09 UTC (rev 19178)
@@ -65,5 +65,7 @@
 T_bind_textdomain_codeset($domain, 'UTF-8');
 
 T_textdomain($domain);
+
+$lang_cookie = $_COOKIE['lang_cookie'];
 echo ("<!-- $locale , locale_res [$locale_res] , dir_res $dir_res, lang_cookie [$lang_cookie] -->\n");
 ?>