[Mapbender-commits] r7586 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-02-13 23:46:14 -0800 (Sun, 13 Feb 2011)
New Revision: 7586

Modified:
   trunk/mapbender/http/javascripts/mod_loadwmc.js
   trunk/mapbender/http/javascripts/mod_savewmc.js
   trunk/mapbender/http/javascripts/mod_savewmc.php
Log:
some i18 bugfixes and translations

Modified: trunk/mapbender/http/javascripts/mod_loadwmc.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_loadwmc.js	2011-02-13 20:57:10 UTC (rev 7585)
+++ trunk/mapbender/http/javascripts/mod_loadwmc.js	2011-02-14 07:46:14 UTC (rev 7586)
@@ -23,15 +23,15 @@
 	else {
 		options.editWmc = 0;
 	}
-	if(Mapbender.modules.i18n){	
+	/*if(Mapbender.modules.i18n){	
 	Mapbender.modules.i18n.queue(options.id, originalI18nObject, function (translatedObject) {
 		if (typeof translatedObject !== "object") {
 			return;
 		}
 		translatedI18nObject = translatedObject;
 	});
-	//Mapbender.modules.i18n.localize(Mapbender.languageId);
-}
+	//Mapbender.modules.i18n.localize(Mapbender.languageId);*/
+//}
 	
 });
 
@@ -67,15 +67,15 @@
 
 var translatedI18nObject = Mapbender.cloneObject(originalI18nObject);
 
-/*if(Mapbender.modules.i18n){	
+if(Mapbender.modules.i18n){	
 	Mapbender.modules.i18n.queue(options.id, originalI18nObject, function (translatedObject) {
 		if (typeof translatedObject !== "object") {
 			return;
 		}
 		translatedI18nObject = translatedObject;
 	});
-	Mapbender.modules.i18n.localize(Mapbender.languageId);
-}*/
+	//Mapbender.modules.i18n.localize(Mapbender.languageId);
+}
 
 var $loadWmc = $(this);
 

Modified: trunk/mapbender/http/javascripts/mod_savewmc.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_savewmc.js	2011-02-13 20:57:10 UTC (rev 7585)
+++ trunk/mapbender/http/javascripts/mod_savewmc.js	2011-02-14 07:46:14 UTC (rev 7586)
@@ -451,20 +451,22 @@
 		});
 	});
 	
-	Mapbender.events.localize.register(function () {
+//	Mapbender.events.localize.register(function () {
+if(Mapbender.modules.i18n){	
 		Mapbender.modules.i18n.queue(options.id, originalI18nObj, function (translatedObj) {
 			if (typeof translatedObj !== "object") {
 				return;
 			}
 			translatedI18nObj = translatedObj;
-			try {
-				localize();
-			}
-			catch (exc) {
-				new Mapbender.Warning("Error when translating: " . exc.message);
-			}
+//			try {
+//				localize();
+//			}
+//			catch (exc) {
+//				new Mapbender.Warning("Error when translating: " . exc.message);
+//			}
 		});
-	});
+}
+//	});
 };
 
 $this.mapbender(new SaveWmcApi());

Modified: trunk/mapbender/http/javascripts/mod_savewmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_savewmc.php	2011-02-13 20:57:10 UTC (rev 7585)
+++ trunk/mapbender/http/javascripts/mod_savewmc.php	2011-02-14 07:46:14 UTC (rev 7586)
@@ -9,6 +9,22 @@
 require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
 require_once(dirname(__FILE__)."/../classes/class_json.php");
 
+//get language parameter out of mapbender session if it is set else set default language to de_DE
+if (isset($_SESSION['mb_lang']) && ($_SESSION['mb_lang']!='')) {
+	$e = new mb_exception("javascripts/mod_savewmc.php: language found in session: ".$_SESSION['mb_lang']);
+	$language = $_SESSION["mb_lang"];
+	$langCode = explode("_", $language);
+	$langCode = $langCode[0]; # Hopefully de or s.th. else
+	$languageCode = $langCode; #overwrite the GET Parameter with the SESSION information
+	$languageCode = str_replace(" ", "", $languageCode);
+} else {
+	$languageCode = "en";//default to en for iso categories
+}
+//echo $languageCode;
+if ($languageCode != "de" && $languageCode != "en") { // only those are defined in the database
+	$languageCode = "en";
+}
+
 //get INSPIRE categories
 
 // On server:
@@ -18,11 +34,13 @@
 /*
 * @return String containing checkboxes and labels as HTML
 */
-function createIsoTopicCategoryString($prefix) {
+function createIsoTopicCategoryString($prefix, $languageCode) {
 	$str = "";
 	$htmlrows = "";
-	$sql = "SELECT md_topic_category_id, md_topic_category_code_en FROM md_topic_category";
-	$res = db_query($sql);
+	$sql = "SELECT md_topic_category_id, md_topic_category_code_".$languageCode." FROM md_topic_category";
+	$v = array();
+	$t = array();
+	$res = db_prep_query($sql, $v, $t);
 	if(db_error()){ return "Could not get Categories from db";}
 	$i = 0;
 	while($row = db_fetch_array($res)) {
@@ -54,7 +72,7 @@
 
 $json = new Mapbender_JSON();
 
-$saveWmcCategoryString = createIsoTopicCategoryString($e_id);
+$saveWmcCategoryString = createIsoTopicCategoryString($e_id, $languageCode);
 $originalI18nObjJson = $json->encode($originalI18nObj);
 $translatedI18nObjJson = $json->encode($translatedI18nObj);