Merge pull request #98 from juriansluiman/feature/layout-placeholder-enhancements

Layout enhancements for placeholder helper

diff --git a/composer.json b/composer.json
index 0abf15e..e2cb2ec 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,6 @@
     "homepage": "http://framework.zend.com/",
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zendframework": "dev-master#725fb6fd85334b3183b2bbca49d7b0f2fe301db1"
+        "zendframework/zendframework": "dev-master#c34e65aca73902b311a374b2f4a0a1d4ee9bf792"
     }
 }

diff --git a/composer.phar b/composer.phar
index 92e7242..747875e 100755 (executable)
Binary files a/composer.phar and b/composer.phar differ

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

diff --git a/module/Application/language/nl_NL.po b/module/Application/language/nl_NL.po
new file mode 100644 (file)
index 0000000..3ed90a5
--- /dev/null
+++ b/module/Application/language/nl_NL.po
@@ -0,0 +1,153 @@
+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-07-24 12:48+0100\n"
+"Last-Translator: Walter Tamboer\n"
+"Language-Team: ZF Contibutors <zf-devteam@zend.com>\n"
+"Language: \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-Language: Dutch\n"
+"X-Poedit-Country: NETHERLANDS\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ..\n"
+
+#: ../view/layout/layout.phtml:6
+#: ../view/layout/layout.phtml:33
+msgid "Skeleton Application"
+msgstr "Applicatie Fundering"
+
+#: ../view/layout/layout.phtml:36
+msgid "Home"
+msgstr "Home"
+
+#: ../view/layout/layout.phtml:50
+msgid "All rights reserved."
+msgstr "Alle rechten voorbehouden."
+
+#: ../view/application/index/index.phtml:2
+#, php-format
+msgid "Welcome to %sZend Framework 2%s"
+msgstr "Welkom bij %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 "Gefeliciteerd! Je hebt de %sZF2 Applicatie Fundering%s succesvol geinstalleerd. Je gebruikt Zend Framework versie %s. Deze fundering biedt je een startpunt om je ZF2 applicatie op voort te bouwen."
+
+#: ../view/application/index/index.phtml:4
+msgid "Fork Zend Framework 2 on GitHub"
+msgstr "Fork Zend Framework 2 op GitHub"
+
+#: ../view/application/index/index.phtml:10
+msgid "Follow Development"
+msgstr "Volg de Ontwikkeling"
+
+#: ../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 webiste 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 wordt actief ontwikkeld. Als je interesse hebt in het volgen van deze ontwikkelingen dan kun je de ZF2 portaal bezoeken op de officiële website van Zend Framework. Daar staan links naar de ZF2 %swiki%s, %sdev blog%s, %sissue tracker%s en nog veel meer. Het is het perfecte middel om up-to-date te blijven met de ontwikkelingen."
+
+#: ../view/application/index/index.phtml:12
+msgid "ZF2 Development Portal"
+msgstr "ZF2 Ontwikkelaars Portaal"
+
+#: ../view/application/index/index.phtml:16
+msgid "Discover Modules"
+msgstr "Ontdek Modules"
+
+#: ../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 "De community werkt aan een eigen community website die dient als een bewaarplaats en galerij voor ZF2 modules. Het project is beschikbaar %sop GitHub%s. De site staat op dit moment live en bevat een lijst met modules die op dit moment beschikbaar zijn voor ZF2."
+
+#: ../view/application/index/index.phtml:18
+msgid "Explore ZF2 Modules"
+msgstr "Verken ZF2 Modules"
+
+#: ../view/application/index/index.phtml:22
+msgid "Help &amp; Support"
+msgstr "Hulp &amp; Support"
+
+#: ../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 "Als je hulp nodig hebt tijdens het ontwikkelen met ZF2, dan kun je ons bereiken via IRC: %s#zftalk.2 op Freenode%s. We beantwoorde met alle liefde je vragen en zouden graag feedback krijgen betreffende de beta releases. Je kunt je ook abonneren op de %smailing lists%s."
+
+#: ../view/application/index/index.phtml:24
+msgid "Ping us on IRC"
+msgstr "Ping ons via IRC"
+
+#: ../view/error/index.phtml:1
+msgid "An error occurred"
+msgstr "Er is een fout opgetreden"
+
+#: ../view/error/index.phtml:8
+msgid "Additional information"
+msgstr "Additionele informatie"
+
+#: ../view/error/index.phtml:11
+#: ../view/error/index.phtml:35
+msgid "File"
+msgstr "Bestand"
+
+#: ../view/error/index.phtml:15
+#: ../view/error/index.phtml:39
+msgid "Message"
+msgstr "Bericht"
+
+#: ../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 "Vorige excepties"
+
+#: ../view/error/index.phtml:58
+msgid "No Exception available"
+msgstr "Geen exceptie beschikbaar"
+
+#: ../view/error/404.phtml:1
+msgid "A 404 error occurred"
+msgstr "De pagina kon niet worden gevonden."
+
+#: ../view/error/404.phtml:10
+msgid "The requested controller was unable to dispatch the request."
+msgstr "De opgevraagde controller kon deze aanvraag niet verwerken."
+
+#: ../view/error/404.phtml:13
+msgid "The requested controller could not be mapped to an existing controller class."
+msgstr "Er is geen mapping beschikbaar voor de opgevraagde controller."
+
+#: ../view/error/404.phtml:16
+msgid "The requested controller was not dispatchable."
+msgstr "De opgevraagde controller is niet bruikbaar (dispatchable)."
+
+#: ../view/error/404.phtml:19
+msgid "The requested URL could not be matched by routing."
+msgstr "Er is geen route gevonden die overeenkomt met de opgevraagde URL."
+
+#: ../view/error/404.phtml:22
+msgid "We cannot determine at this time why a 404 was generated."
+msgstr "We kunnen op dit moment niet achterhalen waarom de pagina niet kon worden gevonden."
+
+#: ../view/error/404.phtml:34
+msgid "Controller"
+msgstr "Controller"
+
+#: ../view/error/404.phtml:41
+#, php-format
+msgid "resolves to %s"
+msgstr "verwijst naar %s"
+
+#: ../view/error/404.phtml:51
+msgid "Exception"
+msgstr "Exceptie"
+

diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml
index b86c138..c821645 100644 (file)
--- a/module/Application/view/application/index/index.phtml
+++ b/module/Application/view/application/index/index.phtml
@@ -1,6 +1,6 @@
 <div class="hero-unit">
     <h1><?php echo sprintf($this->translate('Welcome to %sZend Framework 2%s'), '<span class="zf-green">', '</span>') ?></h1>
-    <p><?php echo sprintf($this->translate('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.'), '<a href="https://github.com/zendframework/ZendSkeletonApplication" target="_blank">', '</a>', \Zend\Version::VERSION) ?></p>
+    <p><?php echo sprintf($this->translate('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.'), '<a href="https://github.com/zendframework/ZendSkeletonApplication" target="_blank">', '</a>', \Zend\Version\Version::VERSION) ?></p>
     <p><a class="btn btn-success btn-large" href="https://github.com/zendframework/zf2" target="_blank"><?php echo $this->translate('Fork Zend Framework 2 on GitHub') ?> &raquo;</a></p>
 </div>
 

diff --git a/public/index.php b/public/index.php
index a39cf1e..2891a0c 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -9,4 +9,4 @@ chdir(dirname(__DIR__));
 include 'init_autoloader.php';
 
 // Run the application!
-Zend\Mvc\Application::init(include 'config/application.config.php')->run()->send();
+Zend\Mvc\Application::init(include 'config/application.config.php')->run();

diff --git a/vendor/ZF2 b/vendor/ZF2
index 725fb6f..c34e65a 160000 (submodule)
--- a/vendor/ZF2
+++ b/vendor/ZF2
@@ -1 +1 @@
-Subproject commit 725fb6fd85334b3183b2bbca49d7b0f2fe301db1
+Subproject commit c34e65aca73902b311a374b2f4a0a1d4ee9bf792