Merge pull request #6746 from nupplaphil/issue/6338-notices

[friendica.git] / src / Core / Console / PhpToPo.php

diff --git a/src/Core/Console/PhpToPo.php b/src/Core/Console/PhpToPo.php
index fb7ecac43e3b0cf926f8537a11b040266ffb52e4..93d8274877cf7afccb2b9fc9737e0d9d28ce3a8c 100644 (file)
--- a/src/Core/Console/PhpToPo.php
+++ b/src/Core/Console/PhpToPo.php
@@ -27,7 +27,7 @@ Description
 
 Options
        -p <n>        Number of plural forms. Default: 2
-       --base <file> Path to base messages.po file. Default: util/messages.po
+       --base <file> Path to base messages.po file. Default: view/lang/C/messages.po
        -h|--help|-?  Show help information
        -v            Show more debug information.
 HELP;
@@ -51,7 +51,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               $a = get_app();
+               $a = \get_app();
 
                $phpfile = realpath($this->getArgument(0));
 
@@ -107,7 +107,7 @@ HELP;
                $out .= sprintf('"Plural-Forms: nplurals=%s; plural=%s;\n"', $lang_pnum, $lang_logic) . "\n";
                $out .= "\n";
 
-               $base_path = $this->getOption('base', 'util' . DIRECTORY_SEPARATOR . 'messages.po');
+               $base_path = $this->getOption('base', 'view/lang/C/messages.po');
 
                // load base messages.po and extract msgids
                $base_msgids = [];
@@ -206,6 +206,9 @@ HELP;
         * - replace " with \"
         * - replace tab char with \t
         * - manage multiline strings
+        *
+        * @param string $str
+        * @return string
         */
        private function massageString($str)
        {