Merge branch 'hotfix/docs' into develop

Forward port #86 Forward port #87
zendframework · Apr 25, 2018 · 8fc3d0e · 8fc3d0e
2 parents e6b095c + da49601
commit 8fc3d0e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/docs/book/view-helpers.md b/docs/book/view-helpers.md
@@ -426,7 +426,7 @@ The `xgettext` utility can be used to compile `*.po` files from PHP source files
 translate view helper.
 
 ```bash
-$ xgettext --language=php --add-location --keyword=translate my-view-file.phtml
+$ xgettext --language=php --add-location --keyword=translate --keyword=translatePlural:1,2 my-view-file.phtml
 ```
 
 See the [Gettext Wikipedia page](http://en.wikipedia.org/wiki/Gettext) for more information.
@@ -489,6 +489,17 @@ where:
   `en_US`). If unset, it will use the default locale (return value of
   `Locale::getDefault()`).
 
+### Gettext
+
+The `xgettext` utility can be used to compile `*.po` files from PHP source files containing the
+translate view helper.
+
+```bash
+$ xgettext --language=php --add-location --keyword=translate --keyword=translatePlural:1,2 my-view-file.phtml
+```
+
+See the [Gettext Wikipedia page](http://en.wikipedia.org/wiki/Gettext) for more information.
+
 ### Public Methods
 
 Public methods for setting a `Zend\I18n\Translator\Translator` and a default

diff --git a/src/Translator/TranslatorServiceFactory.php b/src/Translator/TranslatorServiceFactory.php
@@ -41,7 +41,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
      * Proxies to `__invoke()`.
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @returns Translator
+     * @return Translator
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {