From 2226ed2949d9e22672edbfa897be1aae1f33b549 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 18 Mar 2018 23:47:38 -0400 Subject: [PATCH] Remove util/po2php - Updated documentation --- README.translate.md | 12 ++-- doc/translations.md | 12 ++-- util/README | 2 +- util/po2php.php | 151 -------------------------------------------- 4 files changed, 13 insertions(+), 164 deletions(-) delete mode 100755 util/po2php.php diff --git a/README.translate.md b/README.translate.md index 83c24e0542..8396c9a198 100644 --- a/README.translate.md +++ b/README.translate.md @@ -27,17 +27,17 @@ The location of the translated files in the source tree is /view/lang/LNG-CODE/ where LNG-CODE is the language code used, e.g. de for German or fr for French. The translated strings come as a "message.po" file from transifex which needs to be translated into the PHP file friendica uses. -To do so, place the file in the directory mentioned above and use the "po2php" utility from the util directory of your friendica installation. +To do so, place the file in the directory mentioned above and use the "po2php" command from the console. Assuming you want to convert the German localization which is placed in view/lang/de/message.po you would do the following. 1. Navigate at the command prompt to the base directory of your friendica installation - 2. Execute the po2php script, which will place the translation + 2. Execute the po2php command, which will place the translation in the strings.php file that is used by friendica. - $> php util/po2php.php view/lang/de/messages.po + $> php bin/console po2php view/lang/de/messages.po The output of the script will be placed at view/lang/de/strings.php where friendica is expecting it, so you can test your translation immediately. @@ -62,7 +62,7 @@ Otherwise your work might get lost, when the translation from Transifex is inclu Utilities --------- -Additional to the po2php script there are some more utilities for translation in the "util" directory of the friendica source tree. +Additional to the po2php command there are some more utilities for translation in the console. If you only want to translate friendica into another language you wont need any of these tools most likely but it gives you an idea how the translation process of friendica works. For further information see the utils/README file. @@ -90,9 +90,9 @@ To update the translation files after you have translated strings of e.g. Espera $> tx pull -l eo -And then use the `po2php` utility described above to convert the `messages.po` file to the `strings.php` file Friendica is loading. +And then use the `po2php` command described above to convert the `messages.po` file to the `strings.php` file Friendica is loading. - $> php util/po2php.php view/lang/eo/messages.po + $> php bin/console po2php view/lang/eo/messages.po Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes. diff --git a/doc/translations.md b/doc/translations.md index d6b48d9eac..02c1a23ea3 100644 --- a/doc/translations.md +++ b/doc/translations.md @@ -29,17 +29,17 @@ The location of the translated files in the source tree is /view/lang/LNG-CODE/ where LNG-CODE is the language code used, e.g. de for German or fr for French. The translated strings come as a "message.po" file from transifex which needs to be translated into the PHP file friendica uses. -To do so, place the file in the directory mentioned above and use the "po2php" utility from the util directory of your friendica installation. +To do so, place the file in the directory mentioned above and use the "po2php" command from the Friendica Console. Assuming you want to convert the German localization which is placed in view/lang/de/message.po you would do the following. 1. Navigate at the command prompt to the base directory of your friendica installation - 2. Execute the po2php script, which will place the translation + 2. Execute the po2php command, which will place the translation in the strings.php file that is used by friendica. - $> php util/po2php.php view/lang/de/messages.po + $> php bin/console po2php view/lang/de/messages.po The output of the script will be placed at view/lang/de/strings.php where friendica is expecting it, so you can test your translation immediately. @@ -64,7 +64,7 @@ Otherwise your work might get lost, when the translation from Transifex is inclu Utilities --------- -Additional to the po2php script there are some more utilities for translation in the "util" directory of the friendica source tree. +Additional to the po2php command there are some more utilities for translation in the console. If you only want to translate friendica into another language you wont need any of these tools most likely but it gives you an idea how the translation process of friendica works. For further information see the utils/README file. @@ -92,9 +92,9 @@ To update the translation files after you have translated strings of e.g. Espera $> tx pull -l eo -And then use the `po2php` utility described above to convert the `messages.po` file to the `strings.php` file Friendica is loading. +And then use the `po2php` command described above to convert the `messages.po` file to the `strings.php` file Friendica is loading. - $> php util/po2php.php view/lang/eo/messages.po + $> php bin/console po2php view/lang/eo/messages.po Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes. diff --git a/util/README b/util/README index 5808194ecb..725bef4525 100644 --- a/util/README +++ b/util/README @@ -107,7 +107,7 @@ Xgettext and .po workflow of the many .po editors out there, like QtLinguist 5. run - $ php util/po2php.php view/lang//messages.po + $ php bin/console po2php view/lang//messages.po to create the strings.php file When strings are added or modified in source, you could run diff --git a/util/po2php.php b/util/po2php.php deleted file mode 100755 index 819f99b80b..0000000000 --- a/util/po2php.php +++ /dev/null @@ -1,151 +0,0 @@ -#!/usr/bin/env php -\n\n"; - return; - } - - $pofile = $argv[1]; - $outfile = dirname($pofile)."/strings.php"; - - if (strstr($outfile, 'util')) { - $lang = 'en'; - } else { - $lang = str_replace('-','_',basename(dirname($pofile))); - } - - if (!file_exists($pofile)) { - print "Unable to find '$pofile'\n"; - return; - } - - print "Out to '$outfile'\n"; - - $out = "strings["' . $k . '"] = '; - } - if ($inv) { - $inv = false; - $out .= '"' . $v . '"'; - } - - $v = substr($l, 8, $len - 10); - $v = preg_replace_callback($escape_s_exp, 'escape_s', $v); - $inv = true; - //$out .= $v; - } - if ($k != "" && substr($l, 0, 7) == "msgstr[") { - if ($ink) { - $ink = false; - $out .= '$a->strings["' . $k . '"] = '; - } - if ($inv) { - $inv = false; - $out .= '"' . $v . '"'; - } - - if (!$arr) { - $arr=True; - $out .= "[\n"; - } - $match = []; - preg_match("|\[([0-9]*)\] (.*)|", $l, $match); - $out .= "\t" - . preg_replace_callback($escape_s_exp, 'escape_s', $match[1]) - . " => " - . preg_replace_callback($escape_s_exp, 'escape_s', $match[2]) - . ",\n"; - } - - if (substr($l, 0, 6) == "msgid_") { - $ink = false; - $out .= '$a->strings["' . $k . '"] = '; - } - - if ($ink) { - $k .= trim($l, "\"\r\n"); - $k = preg_replace_callback($escape_s_exp, 'escape_s', $k); - //$out .= '$a->strings['.$k.'] = '; - } - - if (substr($l, 0, 6) == "msgid ") { - if ($inv) { - $inv = false; - $out .= '"' . $v . '"'; - } - if ($k != "") { - $out .= ($arr) ? "];\n" : ";\n"; - } - $arr = false; - $k = str_replace("msgid ", "", $l); - if ($k != '""') { - $k = trim($k, "\"\r\n"); - } else { - $k = ""; - } - - $k = preg_replace_callback($escape_s_exp, 'escape_s', $k); - $ink = true; - } - - if ($inv && substr($l, 0, 6) != "msgstr") { - $v .= trim($l, "\"\r\n"); - $v = preg_replace_callback($escape_s_exp, 'escape_s', $v); - //$out .= '$a->strings['.$k.'] = '; - } - - - } - - if ($inv) { - $inv = false; - $out .= '"' . $v . '"'; - } - if ($k != "") { - $out .= ($arr ? "];\n" : ";\n"); - } - - $out = str_replace(DQ_ESCAPE, '\"', $out); - file_put_contents($outfile, $out); - -} - -if (array_search(__FILE__, get_included_files()) === 0) { - po2php_run($_SERVER["argv"],$_SERVER["argc"]); -} -- 2.39.5