From be67cf663bc645d9825c7d6c6059663fead06645 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 19 Mar 2011 05:10:05 -0700 Subject: [PATCH] minor edits --- include/items.php | 2 -- util/README | 18 +++++++++--------- util/string_translator.php | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/include/items.php b/include/items.php index 6900c5920b..0516593218 100644 --- a/include/items.php +++ b/include/items.php @@ -905,8 +905,6 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { require_once('simplepie/simplepie.inc'); - if(! $contact) - logger('consume feed: anonymous'); $feed = new SimplePie(); $feed->set_raw_data($xml); if($datedir) diff --git a/util/README b/util/README index c6bc032a54..8518aafd27 100644 --- a/util/README +++ b/util/README @@ -49,8 +49,8 @@ Placeholders Do not translate placeholders in strings! Things like %s, %d, %1$s and $somename are used to add dynamic content to the string. -%s rappresent a dynamic string, like in "Welcome to %s" -%d rappresent a dynamic number, like in "%d new messages" +%s represents a dynamic string, like in "Welcome to %s" +%d represents a dynamic number, like in "%d new messages" $somename is a variable like in php In %1$s %2$s, the numbers are the position index of multiple dynamic content. You could swap position in string of indexed placeholders. @@ -78,11 +78,11 @@ More info at http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html Xgettext and .po workflow -1. Run utils/run_xgettext.sh script (on *unix sistems, with GNU xgettext installed) +1. Run util/run_xgettext.sh script (on *unix sistems, with GNU xgettext installed) This script runs xgettext on source tree, extracting strings from t() and tt() - functions, and creates a utils/messages.po file. -2. copy utils/messages.po to views//messages.po -3. open views//messages.po with a text editor and fill in infos in + functions, and creates a util/messages.po file. +2. copy util/messages.po to view//messages.po +3. open view//messages.po with a text editor and fill in infos in "Last-Translator: FULL NAME " "Language-Team: LANGUAGE \n" "Language: \n" @@ -102,17 +102,17 @@ Xgettext and .po workflow of the many .po editors out there, like QtLinguist 5. run - $ php utils/po2php.php views//messages.po + $ php util/po2php.php view//messages.po to create the strings.php file When strings are added or modified in source, you could run - $ utils/run_xgettext.sh views//messages.po + $ util/run_xgettext.sh view//messages.po to extraxt strings from source files and join them with the existing .po file: new strings are added, the existing are not overwritten. If you already translated Friendika using strings.php, you could import your old translation to messages.po. Run: -$ php utils/php2po.php views//strings.php +$ php util/php2po.php view//strings.php diff --git a/util/string_translator.php b/util/string_translator.php index 4112d9506a..a718130d87 100644 --- a/util/string_translator.php +++ b/util/string_translator.php @@ -99,7 +99,7 @@ if (isset($_GET['lang'])){ $n2 = count($strings[$lang]); echo "
";
-	echo "Tranlsate en to $lang
"; + echo "Translate en to $lang
"; //echo "Translated $n2 over $n1 strings
"; echo "

";