From 0bcf9dbc97596ca3a0d66380f9c3e170084b1fdc Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 18 Jul 2012 13:13:35 -0400
Subject: [PATCH] Fixed code to retrieve current locale.
---
module/VuFind/src/VuFind/Recommend/AuthorInfo.php | 7 ++-----
.../src/VuFind/Recommend/ResultGoogleMapAjax.php | 10 +++-------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/module/VuFind/src/VuFind/Recommend/AuthorInfo.php b/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
index 51672cd7e91..8ec61c76d9c 100644
--- a/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
+++ b/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
@@ -56,11 +56,8 @@ class AuthorInfo implements RecommendInterface
*/
public function __construct($settings)
{
- /* TODO:
- $this->lang = Zend_Registry::getInstance()
- ->get('Zend_Translate')
- ->getAdapter()->getLocale();
- */
+ $translator = Translator::getTranslator();
+ $this->lang = is_object($translator) ? $translator->getLocale() : 'en';
}
/**
diff --git a/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php b/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php
index dcd8032cea4..d479d88a5be 100644
--- a/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php
+++ b/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php
@@ -26,7 +26,7 @@
* @link http://vufind.org/wiki/building_a_recommendations_module Wiki
*/
namespace VuFind\Recommend;
-use Zend\Registry;
+use VuFind\Translator\Translator, Zend\Registry;
/**
* AuthorInfo Recommendations Module
@@ -100,12 +100,8 @@ class ResultGoogleMapAjax implements RecommendInterface
*/
public function userLang()
{
- /* TODO
- return Registry::getInstance()
- ->get('Zend_Translate')
- ->getAdapter()
- ->getLocale();
- */
+ $translator = Translator::getTranslator();
+ return is_object($translator) ? $translator->getLocale() : 'en';
}
/**
--
GitLab