[Mapbender-commits] r8528 - in trunk/mapbender: http/php resources/locale/de_DE/LC_MESSAGES

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2012-12-11 07:58:54 -0800 (Tue, 11 Dec 2012)
New Revision: 8528

Modified:
   trunk/mapbender/http/php/mb_getWmsData.php
   trunk/mapbender/http/php/mod_abo_show.php
   trunk/mapbender/http/php/mod_updateWMS.php
   trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
Log:
some little bugs for translation and checking constants

Modified: trunk/mapbender/http/php/mb_getWmsData.php
===================================================================
--- trunk/mapbender/http/php/mb_getWmsData.php	2012-12-11 15:24:11 UTC (rev 8527)
+++ trunk/mapbender/http/php/mb_getWmsData.php	2012-12-11 15:58:54 UTC (rev 8528)
@@ -101,7 +101,7 @@
 		for ($j=0; $j<count($changedLayerArray); $j++) {
 			if ($changedLayerArray[$j]["oldLayerName"] != $changedLayerArray[$j]["newLayerName"]) {
 				$e = new mb_notice("Old layer name: ".$changedLayerArray[$j]["oldLayerName"]." - changed to: ".$changedLayerArray[$j]["newLayerName"]);
-				$layerChangeInformation = _mb("Old layer name: ").$changedLayerArray[$j]["oldLayerName"]._mb(" - changed to: ").$changedLayerArray[$j]["newLayerName"]."\n";	
+				$layerChangeInformation = _mb("Old layer name: ")."'".$changedLayerArray[$j]["oldLayerName"]."'"._mb(" - changed to: ")."'".$changedLayerArray[$j]["newLayerName"]."'"."\n";		
 			}
 		}
 		//get owner of guis with this wms
@@ -144,7 +144,7 @@
 			//Build mailbody	
 			$body = _mb("WMS")." '" . $admin->getWmsTitleByWmsId($myWMS) . "' "._mb("has been updated").".\n\n".$metadataUrl. "\n\n"._mb("You may want to check the changes as you are an owner or subscriber of this WMS. If you have integrated the service into a gis client, you have to reconfigure the client!")."\n"._mb("Note: This e-mail has been sent automatically because you subscribed " . "to this service. You can unsubscribe by logging in and clicking the " . "unsubscribe button in the Mapbender metadata dialogue by following the given link.");
 			if (isset($layerChangeInformation) &&  $layerChangeInformation != "") {
-				$body .= "\n\n"._mb("Attention - following layers have been renamed".":\n").$layerChangeInformation;
+				$body .= "\n\n"._mb("Attention - following layers have been renamed").":\n".$layerChangeInformation;
 			}
 			$error_msg = "";
 

Modified: trunk/mapbender/http/php/mod_abo_show.php
===================================================================
--- trunk/mapbender/http/php/mod_abo_show.php	2012-12-11 15:24:11 UTC (rev 8527)
+++ trunk/mapbender/http/php/mod_abo_show.php	2012-12-11 15:58:54 UTC (rev 8528)
@@ -98,7 +98,7 @@
 			":\n";
 		if (preg_match("/^[0-9]+(,[0-9]+)*$/", $_POST['wmslist'])) {
 			$wms_array = explode(',',$_POST['wmslist']);
-			if (defined(MAPBENDER_PATH) && MAPBENDER_PATH != '') {
+			if (defined("MAPBENDER_PATH") && MAPBENDER_PATH != '') {
 				$metadataUrl = MAPBENDER_PATH."/php/mod_showMetadata.php?resource=layer&id=";
 			} else {
 				$metadataUrl = preg_replace(

Modified: trunk/mapbender/http/php/mod_updateWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_updateWMS.php	2012-12-11 15:24:11 UTC (rev 8527)
+++ trunk/mapbender/http/php/mod_updateWMS.php	2012-12-11 15:58:54 UTC (rev 8528)
@@ -395,7 +395,7 @@
 		for ($j=0; $j<count($changedLayerArray); $j++) {
 			if ($changedLayerArray[$j]["oldLayerName"] != $changedLayerArray[$j]["newLayerName"]) {
 				$e = new mb_notice("Old layer name: ".$changedLayerArray[$j]["oldLayerName"]." - changed to: ".$changedLayerArray[$j]["newLayerName"]);
-				$layerChangeInformation = _mb("Old layer name: ").$changedLayerArray[$j]["oldLayerName"]._mb(" - changed to: ").$changedLayerArray[$j]["newLayerName"]."\n";	
+				$layerChangeInformation = _mb("Old layer name: ")."'".$changedLayerArray[$j]["oldLayerName"]."'"._mb(" - changed to: ")."'".$changedLayerArray[$j]["newLayerName"]."'"."\n";	
 			}
 		}
 		//get owner of guis with this wms
@@ -438,7 +438,7 @@
 			//Build mailbody	
 			$body = _mb("WMS")." '" . $admin->getWmsTitleByWmsId($myWMS) . "' "._mb("has been updated").".\n\n".$metadataUrl. "\n\n"._mb("You may want to check the changes as you are an owner or subscriber of this WMS. If you have integrated the service into a gis client, you have to reconfigure the client!")."\n"._mb("Note: This e-mail has been sent automatically because you subscribed " . "to this service. You can unsubscribe by logging in and clicking the " . "unsubscribe button in the Mapbender metadata dialogue by following the given link.");
 			if (isset($layerChangeInformation) &&  $layerChangeInformation != "") {
-				$body .= "\n\n"._mb("Attention - following layers have been renamed".":\n").$layerChangeInformation;
+				$body .= "\n\n"._mb("Attention - following layers have been renamed").":\n".$layerChangeInformation;
 			}
 			$error_msg = "";
 

Modified: trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
===================================================================
--- trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po	2012-12-11 15:24:11 UTC (rev 8527)
+++ trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po	2012-12-11 15:58:54 UTC (rev 8528)
@@ -3585,7 +3585,7 @@
 msgstr "Alter Layername: "
 
 msgid " - changed to: "
-msgstr "- geändert zu: "
+msgstr " - geändert zu: "
 
 msgid "has been updated"
 msgstr "wurde aktualisiert"