Merge branch 'livedocx-2.0' of https://github.com/jonathanmaron/zf2 i…

…nto feature/livedocx-demo-improvements
yalibaba · May 20, 2011 · 5b66173 · 5b66173
2 parents 82c4c91 + 6dda0e4
commit 5b66173
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 98 deletions.
diff --git a/demos/Zend/Service/LiveDocx/Bootstrap.php b/demos/Zend/Service/LiveDocx/Bootstrap.php
@@ -1,32 +1,32 @@
 <?php
 
 // Set used namespaces
-use Zend\Locale\Locale;
-use Zend\Registry;
-use Zend\Service\LiveDocx\Helper;
+use \Zend\Loader\StandardAutoloader;
+use \Zend\Locale\Locale;
+use \Zend\Service\LiveDocx\Helper;
 
 // Turn up error reporting
 error_reporting(E_ALL | E_STRICT);
 
-// Set up autoloader
+// Library base
 $base = dirname(dirname(dirname(dirname(__DIR__))));
+
+// Set up autoloader
 require_once "{$base}/library/Zend/Loader/StandardAutoloader.php";
-$loader = new \Zend\Loader\StandardAutoloader();
+$loader = new StandardAutoloader();
 $loader->registerNamespace('Zend', "{$base}/library/Zend");
 $loader->register();
 
 // Include utility class
 require_once "{$base}/demos/Zend/Service/LiveDocx/library/Zend/Service/LiveDocx/Helper.php";
 
-// Set default locale
-Locale::setDefault(Helper::LOCALE);
-$locale = new Locale(Locale::ZFDEFAULT);
-Registry::set('Zend_Locale', $locale);
+// Set fallback locale
+Locale::setFallback(Helper::LOCALE);
 
 // Ensure LiveDocx credentials are available
 if (false === Helper::credentialsAvailable()) {
     Helper::printLine(Helper::credentialsHowTo());
     exit();
 }
 
-unset($base);
+unset($base);