Skip to content
Snippets Groups Projects
Commit a24b190a authored by Demian Katz's avatar Demian Katz
Browse files

Update to use zend-mvc-i18n.

parent cf1e0e11
No related merge requests found
......@@ -343,7 +343,7 @@ class Bootstrapper
'ExtendedIni', $domain, $domain, $language
);
}
} catch (\Zend\Mvc\Exception\BadMethodCallException $e) {
} catch (\Zend\Mvc\I18n\Exception\BadMethodCallException $e) {
if (!extension_loaded('intl')) {
throw new \Exception(
'Translation broken due to missing PHP intl extension.'
......
......@@ -927,7 +927,7 @@ class Factory
*/
public static function getTranslator(ServiceManager $sm)
{
$factory = new \Zend\Mvc\Service\TranslatorServiceFactory();
$factory = new \Zend\Mvc\I18n\TranslatorFactory();
$translator = $factory->createService($sm);
// Set up the ExtendedIni plugin:
......@@ -941,7 +941,7 @@ class Factory
: [$config->Site->language, 'en'];
try {
$pm = $translator->getPluginManager();
} catch (\Zend\Mvc\Exception\BadMethodCallException $ex) {
} catch (\Zend\Mvc\I18n\Exception\BadMethodCallException $ex) {
// If getPluginManager is missing, this means that the user has
// disabled translation in module.config.php or PHP's intl extension
// is missing. We can do no further configuration of the object.
......
......@@ -60,7 +60,7 @@ class DisplayLanguageOption extends \Zend\View\Helper\AbstractHelper
'ExtendedIni', null, 'default', 'native'
);
$this->translator->setLocale('native');
} catch (\Zend\Mvc\Exception\BadMethodCallException $e) {
} catch (\Zend\Mvc\I18n\Exception\BadMethodCallException $e) {
if (!extension_loaded('intl')) {
throw new \Exception(
'Translation broken due to missing PHP intl extension.'
......
......@@ -205,7 +205,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
)
);
$this->serviceManager->setService('Config', []);
$factory = new \Zend\Mvc\Service\TranslatorServiceFactory();
$factory = new \Zend\Mvc\I18n\TranslatorFactory();
$this->serviceManager->setService(
'VuFind\Translator', $factory->createService($this->serviceManager)
);
......
......@@ -416,7 +416,7 @@ class Initializer
$pm = $translator->getPluginManager();
$pm->get('ExtendedIni')->addToPathStack($pathStack);
} catch (\Zend\Mvc\Exception\BadMethodCallException $e) {
} catch (\Zend\Mvc\I18n\Exception\BadMethodCallException $e) {
// This exception likely indicates that translation is disabled,
// so we can't proceed.
return;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment