From 56c3aa65801b74baabf6460c396e7986b18178e2 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 12 Sep 2014 09:21:38 -0400
Subject: [PATCH] Make translator a soft dependency.
---
module/VuFind/src/VuFind/Connection/Wikipedia.php | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/module/VuFind/src/VuFind/Connection/Wikipedia.php b/module/VuFind/src/VuFind/Connection/Wikipedia.php
index d441c175f18..c4dd9b5127c 100644
--- a/module/VuFind/src/VuFind/Connection/Wikipedia.php
+++ b/module/VuFind/src/VuFind/Connection/Wikipedia.php
@@ -101,6 +101,18 @@ class Wikipedia implements TranslatorAwareInterface
return $this->translator;
}
+ /**
+ * Translate a string
+ *
+ * @param string $s String to translate
+ *
+ * @return string
+ */
+ public function translate($s)
+ {
+ return null === $this->translator ? $s : $this->translator->translate($s);
+ }
+
/**
* Set language
*
@@ -336,7 +348,7 @@ class Wikipedia implements TranslatorAwareInterface
// Fix pronunciation guides
$pattern[] = '/({{)pron-en\|([^}]*)(}})/Us';
- $replacement[] = $this->getTranslator()->translate("pronounced") . " /$2/";
+ $replacement[] = $this->translate('pronounced') . " /$2/";
// Fix dashes
$pattern[] = '/{{ndash}}/';
--
GitLab