Merge branch 'patch-2' of https://github.com/BinaryKitten/ZendSkeletonApplication...

diff --git a/README.md b/README.md
index 4e7d164..4f653c3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -14,13 +14,32 @@ Installation
 Using Composer (recommended)
 ----------------------------
 The recommended way to get a working copy of this project is to clone the repository
-and use composer to install dependencies:
+and use `composer` to install dependencies using the `create-project` command:
+
+    curl -s https://getcomposer.org/installer | php -
+    php composer.phar create-project -repository-url="http://packages.zendframework.com" zendframework/skeleton-application path/to/install
+
+Alternately, clone the repository and manually invoke `composer` using the shipped
+`composer.phar`:
 
     cd my/project/dir
     git clone git://github.com/zendframework/ZendSkeletonApplication.git
     cd ZendSkeletonApplication
+    php composer.phar self-update
     php composer.phar install
 
+(The `self-update` directive is to ensure you have an up-to-date `composer.phar`
+available.)
+
+Another alternative for downloading the project is to grab it via `curl`, and
+then pass it to `tar`:
+
+    cd my/project/dir
+    curl -#L https://github.com/zendframework/ZendSkeletonApplication/tarball/master | tar xz --strip-components=1
+
+You would then invoke `composer` to install dependencies per the previous
+example.
+
 Using Git submodules
 --------------------
 Alternatively, you can install using native git submodules:

diff --git a/module/Application/Module.php b/module/Application/Module.php
index 86d9d4e..7786cd8 100644 (file)
--- a/module/Application/Module.php
+++ b/module/Application/Module.php
@@ -10,10 +10,11 @@
 namespace Application;
 
 use Zend\Mvc\ModuleRouteListener;
+use Zend\Mvc\MvcEvent;
 
 class Module
 {
-    public function onBootstrap($e)
+    public function onBootstrap(MvcEvent $e)
     {
         $e->getApplication()->getServiceManager()->get('translator');
         $eventManager        = $e->getApplication()->getEventManager();

diff --git a/module/Application/language/zh_CN.mo b/module/Application/language/zh_CN.mo
new file mode 100644 (file)
index 0000000..4efabe2
Binary files /dev/null and b/module/Application/language/zh_CN.mo differ

diff --git a/module/Application/language/zh_CN.po b/module/Application/language/zh_CN.po
new file mode 100644 (file)
index 0000000..4bf3ffb
--- /dev/null
+++ b/module/Application/language/zh_CN.po
@@ -0,0 +1,174 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ZendSkeletonApplication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-05 22:17-0700\n"
+"PO-Revision-Date: 2012-09-08 13:15+0800\n"
+"Last-Translator: Evan Coury <me@evancoury.com>\n"
+"Language-Team: ZF Contibutors <zf-devteam@zend.com>\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: translate\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ..\n"
+
+#: ../view/layout/layout.phtml:6 ../view/layout/layout.phtml:33
+msgid "Skeleton Application"
+msgstr "框架应用"
+
+#: ../view/layout/layout.phtml:36
+msgid "Home"
+msgstr "主页"
+
+#: ../view/layout/layout.phtml:50
+msgid "All rights reserved."
+msgstr "All rights reserved."
+
+#: ../view/application/index/index.phtml:2
+#, php-format
+msgid "Welcome to %sZend Framework 2%s"
+msgstr "欢迎使用%sZend Framework 2%s"
+
+#: ../view/application/index/index.phtml:3
+#, php-format
+msgid ""
+"Congratulations! You have successfully installed the %sZF2 Skeleton "
+"Application%s. You are currently running Zend Framework version %s. This "
+"skeleton can serve as a simple starting point for you to begin building your "
+"application on ZF2."
+msgstr ""
+"恭喜！您已经成功安装了%sZF2 Skeleton Application%s。您现在运行的Zend "
+"Framework的版本为%s。这个框架应用可以用作您创建自己的ZF2应用的起点。"
+
+#: ../view/application/index/index.phtml:4
+msgid "Fork Zend Framework 2 on GitHub"
+msgstr "在GitHub中获取Zend Framework 2到您的应用"
+
+#: ../view/application/index/index.phtml:10
+msgid "Follow Development"
+msgstr "关注开发"
+
+#: ../view/application/index/index.phtml:11
+#, php-format
+msgid ""
+"Zend Framework 2 is under active development. If you are interested in "
+"following the development of ZF2, there is a special ZF2 portal on the "
+"official Zend Framework website which provides links to the ZF2 %swiki%s, "
+"%sdev blog%s, %sissue tracker%s, and much more. This is a great resource for "
+"staying up to date with the latest developments!"
+msgstr ""
+"Zend Framework 2正在开发中。如果您有兴趣关注ZF2的开发，Zend Framework的官方网"
+"站有一个专门的ZF2入口，从这个入口可以进入ZF2的%swiki%s, %sdev blog%s, "
+"%sissue tracker%s等。这些是关注我们最新开发的好资源！"
+
+#: ../view/application/index/index.phtml:12
+msgid "ZF2 Development Portal"
+msgstr "ZF2 开发入口"
+
+#: ../view/application/index/index.phtml:16
+msgid "Discover Modules"
+msgstr "探索模块"
+
+#: ../view/application/index/index.phtml:17
+#, php-format
+msgid ""
+"The community is working on developing a community site to serve as a "
+"repository and gallery for ZF2 modules. The project is available %son GitHub"
+"%s. The site is currently live and currently contains a list of some of the "
+"modules already available for ZF2."
+msgstr ""
+"社区正在开发一个能够存储和展示ZF2模块的功能。这个项目可以在%son GitHub%s找"
+"到。这个网站现在已经包含了许多ZF2可用的模块。"
+
+#: ../view/application/index/index.phtml:18
+msgid "Explore ZF2 Modules"
+msgstr "浏览ZF2模块"
+
+#: ../view/application/index/index.phtml:22
+msgid "Help &amp; Support"
+msgstr "帮助 &amp; 支持"
+
+#: ../view/application/index/index.phtml:23
+#, php-format
+msgid ""
+"If you need any help or support while developing with ZF2, you may reach us "
+"via IRC: %s#zftalk.2 on Freenode%s. We'd love to hear any questions or "
+"feedback you may have regarding the beta releases. Alternatively, you may "
+"subscribe and post questions to the %smailing lists%s."
+msgstr ""
+"如果您需要一些关于ZF2开发的帮助和支持，可以通过IRC: %s#zftalk.2 on Freenode"
+"%s。我们非常乐意收到您对于发布的公测版提问和反馈。或者，您也可以通"
+"过%smailing lists%s订阅并发布问题。"
+
+#: ../view/application/index/index.phtml:24
+msgid "Ping us on IRC"
+msgstr "在IRC上ping我们"
+
+#: ../view/error/index.phtml:1
+msgid "An error occurred"
+msgstr "发生错误"
+
+#: ../view/error/index.phtml:8
+msgid "Additional information"
+msgstr "附加信息"
+
+#: ../view/error/index.phtml:11 ../view/error/index.phtml:35
+msgid "File"
+msgstr "文件"
+
+#: ../view/error/index.phtml:15 ../view/error/index.phtml:39
+msgid "Message"
+msgstr "消息"
+
+#: ../view/error/index.phtml:19 ../view/error/index.phtml:43
+#: ../view/error/404.phtml:55
+msgid "Stack trace"
+msgstr "Stack trace"
+
+#: ../view/error/index.phtml:29
+msgid "Previous exceptions"
+msgstr "上一个异常"
+
+#: ../view/error/index.phtml:58
+msgid "No Exception available"
+msgstr "没有可用的Exception"
+
+#: ../view/error/404.phtml:1
+msgid "A 404 error occurred"
+msgstr "404 缺少目标文件"
+
+#: ../view/error/404.phtml:10
+msgid "The requested controller was unable to dispatch the request."
+msgstr "所请求的控制器不能分发该请求"
+
+#: ../view/error/404.phtml:13
+msgid ""
+"The requested controller could not be mapped to an existing controller class."
+msgstr "所请求的控制器不能映射到已存在的控制器类"
+
+#: ../view/error/404.phtml:16
+msgid "The requested controller was not dispatchable."
+msgstr ""
+
+#: ../view/error/404.phtml:19
+msgid "The requested URL could not be matched by routing."
+msgstr "所请求的URL不能与路由对应"
+
+#: ../view/error/404.phtml:22
+msgid "We cannot determine at this time why a 404 was generated."
+msgstr "我们不能确定为什么这次会出现404"
+
+#: ../view/error/404.phtml:34
+msgid "Controller"
+msgstr "控制器"
+
+#: ../view/error/404.phtml:41
+#, php-format
+msgid "resolves to %s"
+msgstr "解决： %s"
+
+#: ../view/error/404.phtml:51
+msgid "Exception"
+msgstr "异常"

diff --git a/module/Application/view/error/404.phtml b/module/Application/view/error/404.phtml
index 3edd37a..323733d 100644 (file)
--- a/module/Application/view/error/404.phtml
+++ b/module/Application/view/error/404.phtml
@@ -46,16 +46,62 @@ if (isset($this->controller_class)
 
 <?php endif ?>
 
-<?php if (isset($this->exception) && $this->exception): ?>
+<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
 
-<h2><?php echo $this->translate('Exception') ?>:</h2>
+<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
+<hr/>
+<h2><?php echo $this->translate('Additional information') ?>:</h2>
+<h3><?php echo get_class($this->exception); ?></h3>
+<dl>
+    <dt><?php echo $this->translate('File') ?>:</dt>
+    <dd>
+        <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
+    </dd>
+    <dt><?php echo $this->translate('Message') ?>:</dt>
+    <dd>
+        <pre class="prettyprint linenums"><?php echo $this->exception->getMessage() ?></pre>
+    </dd>
+    <dt><?php echo $this->translate('Stack trace') ?>:</dt>
+    <dd>
+        <pre class="prettyprint linenums"><?php echo $this->exception->getTraceAsString() ?></pre>
+    </dd>
+</dl>
+<?php
+    $e = $this->exception->getPrevious();
+    if ($e) :
+?>
+<hr/>
+<h2><?php echo $this->translate('Previous exceptions') ?>:</h2>
+<ul class="unstyled">
+    <?php while($e) : ?>
+    <li>
+        <h3><?php echo get_class($e); ?></h3>
+        <dl>
+            <dt><?php echo $this->translate('File') ?>:</dt>
+            <dd>
+                <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+            </dd>
+            <dt><?php echo $this->translate('Message') ?>:</dt>
+            <dd>
+                <pre class="prettyprint linenums"><?php echo $e->getMessage() ?></pre>
+            </dd>
+            <dt><?php echo $this->translate('Stack trace') ?>:</dt>
+            <dd>
+                <pre class="prettyprint linenums"><?php echo $e->getTraceAsString() ?></pre>
+            </dd>
+        </dl>
+    </li>
+    <?php
+        $e = $e->getPrevious();
+        endwhile;
+    ?>
+</ul>
+<?php endif; ?>
 
-<p><b><?php echo $this->escapeHtml($this->exception->getMessage()) ?></b></p>
+<?php else: ?>
 
-<h3><?php echo $this->translate('Stack trace') ?>:</h3>
+<h3><?php echo $this->translate('No Exception available') ?></h3>
 
-<pre>
-<?php echo $this->exception->getTraceAsString() ?>
-</pre>
+<?php endif ?>
 
 <?php endif ?>

diff --git a/public/index.php b/public/index.php
index 2891a0c..49cb018 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -6,7 +6,7 @@
 chdir(dirname(__DIR__));
 
 // Setup autoloading
-include 'init_autoloader.php';
+require 'init_autoloader.php';
 
 // Run the application!
-Zend\Mvc\Application::init(include 'config/application.config.php')->run();
+Zend\Mvc\Application::init(require 'config/application.config.php')->run();