Skip to content

Commit

Permalink
Merge pull request #89 from hr-it-solutions/dev
Browse files Browse the repository at this point in the history 
Release v1.1.1.8
  • Loading branch information
@HRIT-Florian
HRIT-Florian authored Feb 20, 2018
2 parents a7a680a + 4c5b760 commit e21822f
Show file tree
Hide file tree
Showing 67 changed files with 650 additions and 169 deletions.
1 change: 1 addition & 0 deletions admin/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
label="COM_DD_GMAPS_LOCATIONS_COMPONENT_MARK_AS_NEW_SELECTION_LABEL"
description="COM_DD_GMAPS_LOCATIONS_COMPONENT_MARK_AS_NEW_SELECTION_DESC"
>
<option value="0">JNO</option>
<option value="30">COM_DD_GMAPS_LOCATIONS_COMPONENT_MARK_AS_NEW_DEFAULT_THIRTYDAYS</option>
</field>

Expand Down
2 changes: 1 addition & 1 deletion admin/controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Locations
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
2 changes: 1 addition & 1 deletion admin/controllers/location.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Locations
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
2 changes: 1 addition & 1 deletion admin/controllers/locations.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Locations
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
2 changes: 1 addition & 1 deletion admin/dd_gmaps_locations.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Locations
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
22 changes: 13 additions & 9 deletions admin/helpers/dd_gmaps_locations.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Locations
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down Expand Up @@ -183,6 +183,8 @@ public static function countItems(&$items)
*/
public static function Geocode_Location_To_LatLng($data)
{
$latlng = array("latitude" => 0, "longitude" => 0);

// Get Location Data
$address = array(
'street' => $data['street'],
Expand All @@ -207,18 +209,20 @@ public static function Geocode_Location_To_LatLng($data)
$geoCode = file_get_contents('https://maps.googleapis.com/maps/api/geocode/json?address=' . urlencode($prepAddr) . '&sensor=false' . $google_api_URL_pram);
$output = json_decode($geoCode);

if ($output->error_message != "") // If Error on API Connection, display error not
if($output->status == 'ZERO_RESULTS')
{
JFactory::getApplication()->enqueueMessage($output->error_message, 'warning');
JFactory::getApplication()->enqueueMessage(JText::_('COM_DD_GMAPS_LOCATIONS_API_ALERT_GEOLOCATION_FAILED_ZERO_RESULTS'), 'warning');
}
elseif($output->status == 'ZERO_RESULTS')
elseif ($output->error_message != "") // If Error on API Connection, display error not
{
JFactory::getApplication()->enqueueMessage(JText::_('COM_DD_GMAPS_LOCATIONS_API_ALERT_GEOLOCATION_FAILED_ZERO_RESULTS'), 'warning');
JFactory::getApplication()->enqueueMessage($output->error_message, 'warning');
}

// Build array latitude and longitude
$latlng = array("latitude" => $output->results[0]->geometry->location->lat,
"longitude" => $output->results[0]->geometry->location->lng);
else
{
// Build array latitude and longitude
$latlng = array("latitude" => $output->results[0]->geometry->location->lat,
"longitude" => $output->results[0]->geometry->location->lng);
};

// Return Array
return $latlng;
Expand Down
35 changes: 25 additions & 10 deletions admin/language/de-DE/de-DE.com_dd_gmaps_locations.ini
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; @package DD_GMaps_Locations
;
; @author HR IT-Solutions Florian Häusler <[email protected]>
; @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
; @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

COM_DD_GMAPS_LOCATIONS="DD GMaps Locations"
Expand Down Expand Up @@ -115,10 +115,10 @@ COM_DD_GMAPS_LOCATIONS_GEOHARDCODE_BADGE="HardCode"
COM_DD_GMAPS_LOCATIONS_FIELD_HITS="Aufrufe"
COM_DD_GMAPS_LOCATIONS_FIELD_HITS_DESC="DD Improved Hits Counter (Ein Aufruf pro IP-Adresse pro Tag)"

COM_DD_GMAPS_LOCATIONS_FIELD_PUBLISHED_UP_LABEL="Start Veröffentlichung"
COM_DD_GMAPS_LOCATIONS_FIELD_PUBLISHED_UPD_DESC="Ein optionales Start-Datum der Veröffentlichung."
COM_DD_GMAPS_LOCATIONS_FIELD_PUBLISHED_DOWN_LABEL="Ende Veröffentlichung"
COM_DD_GMAPS_LOCATIONS_FIELD_PUBLISHED_DOWN_DESC="An optionales End-Datum der Veröffentlichung."
COM_DD_GMAPS_LOCATIONS_FIELD_PUBLISH_UP_LABEL="Start Veröffentlichung"
COM_DD_GMAPS_LOCATIONS_FIELD_PUBLISH_UPD_DESC="Ein optionales Start-Datum der Veröffentlichung."
COM_DD_GMAPS_LOCATIONS_FIELD_PUBLISH_DOWN_LABEL="Ende Veröffentlichung"
COM_DD_GMAPS_LOCATIONS_FIELD_PUBLISH_DOWN_DESC="An optionales End-Datum der Veröffentlichung."

COM_DD_GMAPS_LOCATIONS_FIELD_DESCRIPTION_LABEL="Seiteninhalt"
COM_DD_GMAPS_LOCATIONS_FIELD_DESCRIPTION_DESC="Inhalt, der mit dem Standorteintrag angezeigt wird."
Expand All @@ -136,25 +136,40 @@ COM_DD_GMAPS_LOCATIONS_FIELD_METADESC_DESC="Eine optionale Meta Beschreibung, di
COM_DD_GMAPS_LOCATIONS_FIELD_METAKEY_LABEL="Meta Keywörter"
COM_DD_GMAPS_LOCATIONS_FIELD_METAKEY_DESC="Eine optionale kommagetrennte Liste von Schlüsselwörtern (Keywörter), die in der HTML Header-Ausgabe verwendet werden sollen."

COM_DD_GMAPS_LOCATIONS_PUBLISH_DOWN_ASC="Veröffentlichung beenden aufsteigend"
COM_DD_GMAPS_LOCATIONS_PUBLISH_DOWN_DESC="Veröffentlichung beenden absteigend"
COM_DD_GMAPS_LOCATIONS_PUBLISH_UP_ASC="Veröffentlichung starten aufsteigend"
COM_DD_GMAPS_LOCATIONS_PUBLISH_UP_DESC="Veröffentlichung starten absteigend"

COM_DD_GMAPS_LOCATIONS_COMPONENT_COUNTRIES_SELECTION_REDUCED="<span class='green'>Reduzierte</span> Länder Auswahl"
COM_DD_GMAPS_LOCATIONS_COMPONENT_COUNTRIES_SELECTION_EXTENDED="<span class='red'>Erweiterte</span> Länder Auswahl"

COM_DD_GMAPS_LOCATIONS_LOCATIONS_SETTINGS_LABEL="Standorte Einstellungen"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_SETTINGS_LABEL="Listen Optionen"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_ITEMS_TO_LIST_LABEL="Standardanzahl pro Liste ."
COM_DD_GMAPS_LOCATIONS_LOCATIONS_ITEMS_TO_LIST_DESC="Standardanzahl der auf einer Seite aufgelisteten Elemente"

COM_DD_GMAPS_LOCATIONS_LOCATIONS_ITEMS_MORE_LABEL="Anzahl weitere"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_ITEMS_MORE_DESC="Anzahl der weiteren aufgelisteten Standorte auf der nächsten Seite."

COM_DD_GMAPS_LOCATIONS_LOCATIONS_SETTINGS_FILTER_LABEL="Spezial Filter Einstellungen"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_ORDER_LABEL="Listen Sortierung"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_ORDER_DESC="Die Reihenfolge, in der die Standorte angezeigt werden."
COM_DD_GMAPS_LOCATIONS_LOCATIONS_ORDER="Standard"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_ORDER_TITLE_ALPHABETICAL="Alphabetisch"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_ORDER_TITLE_REVERSE_ALPHABETICAL="Alphabetisch absteigend"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_COUNT_ITEMS_LABEL="Einträge aufzählen"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_COUNT_ITEMS_DESC="Zeigt die Anzahl der Standorte in Kategorien an."

COM_DD_GMAPS_LOCATIONS_LOCATIONS_SETTINGS_FILTER_CATEGORYLIST_LABEL="Kategorie Optionen"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_FILTER_SHOW_CATID_DESC_LABEL="Zeige Kategorie Beschreibung"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_FILTER_SHOW_CATID_DESC_DESC="Zeige Kategorie Beschreibung auf der Listenasichts Seite"

COM_DD_GMAPS_LOCATIONS_LOCATIONS_SETTINGS_FILTER_LABEL="Listen Filter"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_SETTINGS_FILTER_SHOWONLY="Zeige nur Standorte die folgende Eigenschaften haben:"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_FILTER_LOCATION_LABEL="Ort"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_FILTER_LOCATION_DESC="Zeige nur Standorte die diesen Ort hinterlegt haben!"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_FILTER_COUNTRY_LABEL="Land"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_FILTER_COUNTRY_DESC="Zeige nur Standorte die dieses Land hinterlegt haben!"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_FILTER_FEDERALSTATE_LABEL="Bundesland"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_FILTER_FEDERALSTATE_DESC="Zeige nur Standorte die dieses Bundesland hinterlegt haben!"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_SETTINGS_FILTER_SHOWONLY_NOTE="<b>Angemerkt:</b> Dies beieinträchtigt die Filtebar! Es werden nur Standort angezeigt, die ausnahmslos diese Daten hinterlegt haben (WHERE PROPERTY === 'PROPERTY'). Sämtliche Angaben müssen 1:1 mit den Angaben aus dem jeweiligen Standorten übereinstimmen, andernfalls werden gar keine Standorte angezeigt! Für freie Filtermöglichkeiten bietet sich die Such- und Filter Bar an, zu finden unter Module > DD GMaps Locations Such-Filter!"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_SETTINGS_FILTER_SHOWONLY_NOTE="<b>Angemerkt:</b> Dies beieinträchtigt auch die Filtebar! Es werden nur Standort angezeigt, die ausnahmslos diese Daten hinterlegt haben (WHERE PROPERTY === 'PROPERTY'). Sämtliche Angaben müssen 1:1 mit den Angaben aus dem jeweiligen Standorten übereinstimmen, andernfalls werden gar keine Standorte angezeigt! Für freie Filtermöglichkeiten bietet sich die Such- und Filter Bar an, zu finden unter Module > DD GMaps Locations Such-Filter!"

COM_DD_GMAPS_LOCATIONS_API_ALERT_GEOLOCATION_FAILED_ZERO_RESULTS="Die Standortbestimmung ist fehlgeschlagen! Bitte überprüfen Sie die "_QQ_"GEO Addresse"__QQ" (Standort Adress-Daten). Meist liegt dies an falschen Adress-Informationen wie (Straße, PLZ, Ort, Land)."

Expand Down
4 changes: 3 additions & 1 deletion admin/language/de-DE/de-DE.com_dd_gmaps_locations.sys.ini
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; @package DD_GMaps_Locations
;
; @author HR IT-Solutions Florian Häusler <[email protected]>
; @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
; @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

COM_DD_GMAPS_LOCATIONS="DD GMaps Locations"
Expand Down Expand Up @@ -65,6 +65,8 @@ COM_DD_GMAPS_LOCATIONS_HEADING_LOCATION="Adressee"
COM_DD_GMAPS_LOCATIONS_HEADING_ZIP="PLZ"
COM_DD_GMAPS_LOCATIONS_HEADING_COUNTRY="Land"

COM_DD_GMAPS_LOCATIONS_CATEGORIES_VIEW_DEFAULT_OPTIONS="Kategorien"
COM_DD_GMAPS_LOCATIONS_CATEGORIES_VIEW_DEFAULT_DESC="Zeige Kategorien"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_VIEW_DEFAULT_TITLE="Zeigt Standorte an"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_VIEW_DEFAULT_DESC="Zeigt Standorte an"
COM_DD_GMAPS_LOCATIONS_LOCATIONS_VIEW_DEFAULT_OPTION="Default"
Expand Down
Loading

0 comments on commit e21822f

Please sign in to comment.