remove some cruft and change some translations

classes/DwcArchiverCore.php

@@ -274,7 +274,7 @@ public function addCondition($field, $cond, $value = ''){
 	}
 
 	private function applyConditions(){
-		if($this->conditionSql) return true; // @TODO maybe here is different?
+		if($this->conditionSql) return true;
 		if ($this->customWhereSql) {
 			$this->conditionSql = trim($this->customWhereSql) . ' ';
 		}
@@ -2342,7 +2342,6 @@ public function hasAssociations($collid = false){
 			$sql = "(SELECT o.occid FROM omoccurrences o INNER JOIN omoccurassociations a ON o.occid = a.occid WHERE o.collid = ?) UNION (SELECT o.occid FROM omoccurrences o INNER JOIN omoccurassociations a ON o.occid = a.occidAssociate WHERE o.collid = ?) LIMIT 1;";
 		}
 		$stmt = $this->conn->stmt_init();
-      	// $stmt->prepare($sql); // @TODO clean up
 		if (!$stmt->prepare($sql)) {
         	throw new Exception("SQL Error: " . $stmt->error);
     	}
@@ -2351,15 +2350,12 @@ public function hasAssociations($collid = false){
 		}
 		$stmt->execute();
 		$result = $stmt->get_result();
-		// $rs = $this->conn->query($sql);
-		// if ($rs->num_rows) $bool = true;
 		if ($result && $result->num_rows > 0) {
 			$bool = true;
 		}
 		$result->free();
     	$stmt->close();
 
-		// $rs->free();
 		return $bool;
 	}
 

content/lang/collections/datasets/datapublisher.en.php

@@ -99,5 +99,5 @@
 $LANG['NO_PUBLISHABLE'] = 'There are no publishable collections';
 $LANG['ADDIT_SOURCES'] = 'Additional Data Sources within the Portal Network';
 $LANG['EDIT'] = 'Edit';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'Include Associated Records';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'Include Resource Relationships (associations & linked resources)';
 ?>

content/lang/collections/datasets/datapublisher.es.php

@@ -99,6 +99,6 @@
 $LANG['NO_PUBLISHABLE'] = 'No existen colecciones publicables';
 $LANG['ADDIT_SOURCES'] = 'Fuentes Adicionales de Datos en la Red del Portal';
 $LANG['EDIT'] = 'Editar';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'Incluir Registros Asociados';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'Incluir Relaciones de Recursos (asociaciones y recursos vinculados)';
 
 ?>

content/lang/collections/datasets/datapublisher.fr.php

@@ -99,6 +99,6 @@
 $LANG['NO_PUBLISHABLE'] = "Il n'y a pas de collections publiables";
 $LANG['ADDIT_SOURCES'] = "Sources de données supplémentaires au sein du Réseau de Portails";
 $LANG['EDIT'] = 'Modifier';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'Inclure les Enregistrements Associés';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'Inclure les Relations entre Ressources (associations et ressources liées)';
 
 ?>

content/lang/collections/download/index.en.php

@@ -46,6 +46,6 @@
 $LANG['COMPRESSED_ZIP'] = 'Compressed ZIP file';
 $LANG['DOWNLOAD_DATA'] = 'Download Data';
 $LANG['LIMIT_NOTE'] = '* There is a 1,000,000 record limit to occurrence downloads';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'include Associated Records';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'include Resource Relationships (associations & linked resources)';
 
 ?>

content/lang/collections/download/index.es.php

@@ -46,6 +46,6 @@
 $LANG['COMPRESSED_ZIP'] = 'Archivo ZIP comprimido';
 $LANG['DOWNLOAD_DATA'] = 'Descargar datos';
 $LANG['LIMIT_NOTE'] = '* Hay un límite de 1.000.000 de registros para descargas de ocurrencias';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'incluir Registros Asociados';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'incluir Relaciones de Recursos (asociaciones y recursos vinculados)';
 
 ?>

content/lang/collections/download/index.fr.php

@@ -46,6 +46,6 @@
 $LANG['COMPRESSED_ZIP'] = 'Fichier ZIP compressé';
 $LANG['DOWNLOAD_DATA'] = 'Télécharger les données';
 $LANG['LIMIT_NOTE'] = '* Il existe une limite de 1 000 000 d\'enregistrements pour les téléchargements d\'occurrences';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'inclure les Enregistrements Associés';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'inclure les Relations entre Ressources (associations et ressources liées)';
 
 ?>

content/lang/collections/specprocessor/exporter.en.php

@@ -74,6 +74,6 @@
 $LANG['INCLUDE_ATTRIBUTES'] = 'include Occurrence Trait Attributes (MeasurementOrFact extension)';
 $LANG['OUTPUT_COMPRESSED'] = 'Output must be a compressed archive';
 $LANG['ACCESS_DENIED'] = 'Access denied';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'include Associated Records';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'include Resource Relationships (associations & linked resources)';
 
 ?>

content/lang/collections/specprocessor/exporter.es.php

@@ -76,6 +76,6 @@
 $LANG['INCLUDE_ATTRIBUTES'] = 'incluir Atributos de Características de Ocurrencia (extensión MeasurementOrFact)';
 $LANG['OUTPUT_COMPRESSED'] = 'El archivo generado debe ser comprimido';
 $LANG['ACCESS_DENIED'] = 'Acceso denegado';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'incluir Registros Asociados';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'incluir Relaciones de Recursos (asociaciones y recursos vinculados)';
 
 ?>

content/lang/collections/specprocessor/exporter.fr.php

@@ -74,6 +74,6 @@
 $LANG['INCLUDE_ATTRIBUTES'] = 'inclure Attributs de Trait d\'Occurrence (extension MeasurementOrFact)';
 $LANG['OUTPUT_COMPRESSED'] = 'Sortie doit être une archive compressée';
 $LANG['ACCESS_DENIED'] = 'Accès refusé';
-$LANG['INCLUDE_ASSOCIATIONS'] = 'inclure les Enregistrements Associés';
+$LANG['INCLUDE_ASSOCIATIONS'] = 'inclure les Relations entre Ressources (associations et ressources liées)';
 
 ?>