diff --git a/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php b/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php index 0bbb3996828688b1a81022b63e76e9a934978ac6..9f031e14ba32b053231a2e8530a70e67995da6e6 100644 --- a/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php +++ b/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php @@ -26,7 +26,6 @@ * @link http://vufind.org/wiki/vufind2:recommendation_modules Wiki */ namespace VuFind\Recommend; -use VuFind\I18n\Translator\TranslatorAwareInterface; /** * AuthorInfo Recommendations Module @@ -42,15 +41,8 @@ use VuFind\I18n\Translator\TranslatorAwareInterface; * @link http://vufind.org/wiki/vufind2:recommendation_modules Wiki * @view AuthorInfoFacets.phtml */ -class ResultGoogleMapAjax implements RecommendInterface, TranslatorAwareInterface +class ResultGoogleMapAjax implements RecommendInterface { - /** - * Translator (or null if unavailable) - * - * @var \Zend\I18n\Translator\Translator - */ - protected $translator = null; - /** * Saved search results * @@ -107,40 +99,6 @@ class ResultGoogleMapAjax implements RecommendInterface, TranslatorAwareInterfac $this->searchObject = $results; } - /** - * Set a translator - * - * @param \Zend\I18n\Translator\Translator $translator Translator - * - * @return ResultGoogleMapAjax - */ - public function setTranslator(\Zend\I18n\Translator\Translator $translator) - { - $this->translator = $translator; - return $this; - } - - /** - * Get translator object. - * - * @return \Zend\I18n\Translator\Translator - */ - public function getTranslator() - { - return $this->translator; - } - - /** - * getUserLang - * - * @return string of lang - */ - public function userLang() - { - $translator = $this->getTranslator(); - return is_object($translator) ? $translator->getLocale() : 'en'; - } - /** * getSearchParams * diff --git a/module/VuFind/src/VuFind/RecordTab/Map.php b/module/VuFind/src/VuFind/RecordTab/Map.php index 0f0937f313bf8e0fb7493170ca0e0abb9a297fbe..7ba348de69a634545af1d4f6bb54b7e5845a70d7 100644 --- a/module/VuFind/src/VuFind/RecordTab/Map.php +++ b/module/VuFind/src/VuFind/RecordTab/Map.php @@ -37,15 +37,7 @@ namespace VuFind\RecordTab; * @link http://vufind.org/wiki/vufind2:record_tabs Wiki */ class Map extends AbstractBase - implements \VuFind\I18n\Translator\TranslatorAwareInterface { - /** - * Translator (or null if unavailable) - * - * @var \Zend\I18n\Translator\Translator - */ - protected $translator = null; - /** * Is this module enabled in the configuration? * @@ -96,40 +88,6 @@ class Map extends AbstractBase return json_encode($markers); } - /** - * Set a translator - * - * @param \Zend\I18n\Translator\Translator $translator Translator - * - * @return ResultGoogleMapAjax - */ - public function setTranslator(\Zend\I18n\Translator\Translator $translator) - { - $this->translator = $translator; - return $this; - } - - /** - * Get translator object. - * - * @return \Zend\I18n\Translator\Translator - */ - public function getTranslator() - { - return $this->translator; - } - - /** - * getUserLang - * - * @return string of lang - */ - public function userLang() - { - $translator = $this->getTranslator(); - return is_object($translator) ? $translator->getLocale() : 'en'; - } - /** * Is this tab active? * diff --git a/themes/blueprint/templates/Recommend/ResultGoogleMapAjax.phtml b/themes/blueprint/templates/Recommend/ResultGoogleMapAjax.phtml index 4442be3269c3912d4661a8d07cba9f4d56931de2..61d2ded5398fb6a2f9abc329bccdf7b1b28ac87a 100644 --- a/themes/blueprint/templates/Recommend/ResultGoogleMapAjax.phtml +++ b/themes/blueprint/templates/Recommend/ResultGoogleMapAjax.phtml @@ -1,7 +1,7 @@ <? $searchParams = $this->recommend->getSearchParams(); - $this->headScript()->appendFile('https://maps.googleapis.com/maps/api/js?v=3.8&sensor=false&language='.$this->recommend->userLang()); + $this->headScript()->appendFile('https://maps.googleapis.com/maps/api/js?v=3.8&sensor=false&language='.$this->layout()->userLang); $this->headScript()->appendFile('https://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.9/src/markerclusterer_packed.js'); ?> <script type="text/javascript"> diff --git a/themes/blueprint/templates/RecordTab/map.phtml b/themes/blueprint/templates/RecordTab/map.phtml index 1cefe10b1e73c032eed09e8a0fc098985cecdab4..374a6ef94f87b384a9b24bec932a10e323923df9 100644 --- a/themes/blueprint/templates/RecordTab/map.phtml +++ b/themes/blueprint/templates/RecordTab/map.phtml @@ -1,4 +1,4 @@ -<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.5&sensor=false&language=<?=$this->tab->userLang()?>"></script> +<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.5&sensor=false&language=<?=$this->layout()->userLang?>"></script> <script type="text/javascript"> diff --git a/themes/bootstrap3/templates/Recommend/ResultGoogleMapAjax.phtml b/themes/bootstrap3/templates/Recommend/ResultGoogleMapAjax.phtml index 2c2c8664898b9d5a3fc30ec924e96f777ee6c390..542db2296537b9f4d20bdc931cdad489c13cfd72 100644 --- a/themes/bootstrap3/templates/Recommend/ResultGoogleMapAjax.phtml +++ b/themes/bootstrap3/templates/Recommend/ResultGoogleMapAjax.phtml @@ -1,7 +1,7 @@ <? $searchParams = $this->recommend->getSearchParams(); - $this->headScript()->appendFile('https://maps.googleapis.com/maps/api/js?v=3.8&sensor=false&language='.$this->recommend->userLang()); + $this->headScript()->appendFile('https://maps.googleapis.com/maps/api/js?v=3.8&sensor=false&language='.$this->layout()->userLang); $this->headScript()->appendFile('https://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.9/src/markerclusterer_packed.js'); ?> <script type="text/javascript"> diff --git a/themes/bootstrap3/templates/RecordTab/map.phtml b/themes/bootstrap3/templates/RecordTab/map.phtml index 1cefe10b1e73c032eed09e8a0fc098985cecdab4..374a6ef94f87b384a9b24bec932a10e323923df9 100644 --- a/themes/bootstrap3/templates/RecordTab/map.phtml +++ b/themes/bootstrap3/templates/RecordTab/map.phtml @@ -1,4 +1,4 @@ -<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.5&sensor=false&language=<?=$this->tab->userLang()?>"></script> +<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.5&sensor=false&language=<?=$this->layout()->userLang?>"></script> <script type="text/javascript">