diff --git a/application/modules/backend/controllers/HiveController.php b/application/modules/backend/controllers/HiveController.php --- a/application/modules/backend/controllers/HiveController.php +++ b/application/modules/backend/controllers/HiveController.php @@ -124,10 +124,10 @@ $this->view->info = "Erfolgreich geladen aus DB"; $countProjects = $count; } catch (Exception $e) { - Zend_Registry::get('logger')->info(__METHOD__ . ' - ' . "Fehler bei fetchCountProjects"); + Zend_Registry::get('logger')->info(__METHOD__ . ' - ' . "Error in fetchCountProjects"); Zend_Registry::get('logger')->err(__METHOD__ . ' - ' . print_r($e, true)); - $this->view->info = "Fehler bei laden aus DB:" . $e->getMessage(); + $this->view->info = "Error while loading from the database:" . $e->getMessage(); $countProjects = 0; } @@ -140,9 +140,9 @@ $contentTable = new Default_Model_DbTable_HiveContent(); try { $catArray = $contentTable->fetchHiveCategories(); - $this->view->info = "Erfolgreich geladen aus DB"; + $this->view->info = "Successful loaded from the database"; } catch (Exception $e) { - $this->view->info = "Fehler bei laden aus DB:" . $e->getMessage(); + $this->view->info = "Error while loading ffrom the database:" . $e->getMessage(); $catArray = null; } @@ -159,9 +159,9 @@ $count = $contentTable->fetchCountProjectsForCategory($cat_id); $cat = $contentTable->fetchHiveCategory($cat_id); - $this->view->info = "Erfolgreich geladen aus DB"; + $this->view->info .= "Successful loaded from the database"; } catch (Exception $e) { - $this->view->info = "Fehler bei laden aus DB:" . $e->getMessage(); + $this->view->info .= "Error while loading ffrom the database:" . $e->getMessage(); $cat = null; $count = 0; } @@ -172,9 +172,9 @@ try { $catArray = $contentTable->fetchOcsCategories(); - $this->view->info = "Erfolgreich geladen aus DB"; + $this->view->info = "Successful loaded from the database"; } catch (Exception $e) { - $this->view->info = "Fehler bei laden aus DB:" . $e->getMessage(); + $this->view->info = "Error while loading ffrom the database:" . $e->getMessage(); $catArray = null; } @@ -191,26 +191,26 @@ try { $count = $contentTable->fetchCountProjectsForCategory($cat_id); $cat = $contentTable->fetchHiveCategory($cat_id); - $this->view->info .= "Erfolgreich geladen aus DB"; + $this->view->info .= "Successful loaded from the database"; $this->view->cat_id = $cat['id']; $this->view->cat_desc = $cat['desc']; $this->view->count = $count; $ocs_cat = $contentTable->fetchOcsCategory($ocs_cat_id); - $this->view->info .= "Erfolgreich geladen aus DB"; + $this->view->info .= "Successful loaded from the database"; $this->view->ocs_cat_id = $ocs_cat['id']; $this->view->ocs_cat_desc = $ocs_cat['desc']; } catch (Exception $e) { - $this->view->info = "Fehler bei laden aus DB:" . $e->getMessage(); + $this->view->info = "Error while loading ffrom the database:" . $e->getMessage(); $cat = null; $count = 0; } try { $catArray = $contentTable->fetchOcsCategories(); - $this->view->info .= "Erfolgreich geladen aus DB"; + $this->view->info .= "Successful loaded from the database"; } catch (Exception $e) { - $this->view->info .= "Fehler bei laden aus DB:" . $e->getMessage(); + $this->view->info .= "Error while loading ffrom the database:" . $e->getMessage(); $catArray = null; } @@ -244,12 +244,12 @@ try { if (isset($cat_ids)) { $catArray = $contentTable->fetchHiveCategories($cat_ids); - $this->view->info = "Erfolgreich geladen aus DB"; + $this->view->info = "Successful loaded from the database"; } else { - $this->view->info = "Keine Kategorien anegeben!"; + $this->view->info = "No category selected!"; } } catch (Exception $e) { - $this->view->info = "Fehler bei laden aus DB:" . $e->getMessage(); + $this->view->info = "Error while loading ffrom the database:" . $e->getMessage(); $catArray = null; } @@ -458,7 +458,7 @@ $_is_import_done = true; $result['Result'] = self::RESULT_ERROR; - $result['Message'] = "Fehler bei laden aus DB:" . $e->getMessage(); + $result['Message'] = "Error while loading from database:" . $e->getMessage(); } $count = $contentTable->fetchCountProjectsForCategory($cat_id); @@ -535,7 +535,7 @@ * $cnFileUrl = str_replace('/cache/120x96-2', '', $cnFileUrl); * } **/ - $info .= "ImageUpload successfull: " . $cnFileUrl; + $info .= "ImageUpload successful: " . $cnFileUrl; } else { $path = 'https://cn.opendesktop.org/img/hive/content-pre2/' . $hiveProjectId . '-2.'; $fileUrl = null; @@ -595,7 +595,7 @@ * $cnFileUrl = str_replace('/cache/120x96-2', '', $cnFileUrl); * } **/ - $info .= "ImageUpload successfull: " . $cnFileUrl; + $info .= "ImageUpload successful: " . $cnFileUrl; } else { $path = 'https://cn.opendesktop.org/img/hive/content-pre3/' . $hiveProjectId . '-3.'; $fileUrl = null; @@ -655,7 +655,7 @@ * $cnFileUrl = str_replace('/cache/120x96-2', '', $cnFileUrl); * } **/ - $info .= "ImageUpload successfull: " . $cnFileUrl; + $info .= "ImageUpload successful: " . $cnFileUrl; } else { $info .= "No preview pic"; } @@ -800,7 +800,7 @@ //update project $updateCount = $projectTable->update($projectObj, "project_id = " . $projectId); - $info .= "Update Project successfull: Updated rows: " . $updateCount; + $info .= "Update Project successful: Updated rows: " . $updateCount; //update changelog? if (isset($project['changelog']) && $project['changelog'] != '') { @@ -836,7 +836,7 @@ try { //Create new project $newProjectObj = $projectTable->save($projectObj); - $info .= "Create Project successfull: " . $newProjectObj['project_id']; + $info .= "Create Project successful: " . $newProjectObj['project_id']; $projectId = $newProjectObj['project_id']; $votingTable = new Default_Model_DbTable_ProjectRating(); @@ -936,7 +936,7 @@ $uploadFileResult = $this->saveFileInPpload($projectId, $project['downloadname1'], $project['licensetype'], base64_encode($project['license']), $downloadCounter, $this->_HIVE_BASE_URL . '/CONTENT/content-files/' . $file1); - $info .= "Upload file successfull: " . $uploadFileResult; + $info .= "Upload file successful: " . $uploadFileResult; if ($uploadFileResult == true) { $_import_file_counter++; } else { @@ -960,7 +960,7 @@ $uploadFileResult = $this->saveFileInPpload($projectId, $project['downloadname1'], $project['licensetype'], base64_encode($project['license']), 0, $this->_HIVE_BASE_URL . '/CONTENT/content-files/link', $link1, $linkName1); - $info .= "Upload file successfull: " . $uploadFileResult; + $info .= "Upload file successful: " . $uploadFileResult; if ($uploadFileResult == true) { $_import_file_counter++; } @@ -984,7 +984,7 @@ $uploadFileResult = $this->saveFileInPpload($projectId, $project['downloadname' . $i], $project['licensetype'], base64_encode($project['license']), 0, $this->_HIVE_BASE_URL . '/CONTENT/content-files/link', $link1, $linkName1); - $info .= "Upload file successfull: " . $link1; + $info .= "Upload file successful: " . $link1; if ($uploadFileResult == true) { $_import_file_counter++; } diff --git a/application/modules/backend/views/scripts/legend.phtml b/application/modules/backend/views/scripts/legend.phtml --- a/application/modules/backend/views/scripts/legend.phtml +++ b/application/modules/backend/views/scripts/legend.phtml @@ -22,32 +22,32 @@ ?>


-  Button-Erklärung:
+  Button's explanation:
preview): ?>
-  Vorschau / Details +  Preview / Details
date): ?>
-  Neuen Termin eintragen +  Enter new appointment
image): ?>
-  Bilderübersicht der Galerie +  Picture overview of the gallery
-  Bearbeiten +  Edit
-  Deaktivieren +  Disabled
-  Löschen +  Delete
link): ?>
-  Liste der Links / Neuen Link hinzufügen +  List of links / Insert new link
-
\ No newline at end of file +
diff --git a/application/modules/backend/views/scripts/member/details.phtml b/application/modules/backend/views/scripts/member/details.phtml --- a/application/modules/backend/views/scripts/member/details.phtml +++ b/application/modules/backend/views/scripts/member/details.phtml @@ -63,4 +63,4 @@

-Zur Memberübersicht \ No newline at end of file +Member overview diff --git a/application/modules/default/models/Collection.php b/application/modules/default/models/Collection.php --- a/application/modules/default/models/Collection.php +++ b/application/modules/default/models/Collection.php @@ -1864,8 +1864,7 @@ */ public function validateDeleteProjectFromSpam($project_id) { - //produkt ist ueber 6 monate alt oder produkt hat ueber 5 kommentare oder produkt hat minimum 1 pling - // darf nicht gelöscht werden + // A product older than 6 months, with more than 5 comments or with at least 1 pling can not be deleted. $sql ='select count_comments ,created_at , (created_at+ INTERVAL 6 MONTH < NOW()) is_old @@ -1882,4 +1881,4 @@ return true; } -} \ No newline at end of file +} diff --git a/application/modules/default/models/Project.php b/application/modules/default/models/Project.php --- a/application/modules/default/models/Project.php +++ b/application/modules/default/models/Project.php @@ -2097,8 +2097,7 @@ */ public function validateDeleteProjectFromSpam($project_id) { - //produkt ist ueber 6 monate alt oder produkt hat ueber 5 kommentare oder produkt hat minimum 1 pling - // darf nicht gelöscht werden + // A product older than 6 months, with more than 5 comments or with at least 1 pling can not be deleted. $sql ='select count_comments ,created_at , (created_at+ INTERVAL 6 MONTH < NOW()) is_old