harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

Browse Source
This commit is contained in:
Mario Vavti
2018-07-31 14:39:51 +02:00
parent e8aeecc4c9 4e402dca7d
commit 569cd6c57c
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/network.php
View File

@@ -1937,7 +1937,7 @@ function scrape_vcard($url) {
if(attribute_contains($x->getAttribute('class'),'given_name'))
$ret['given_name'] = escape_tags($x->textContent);
if(attribute_contains($x->getAttribute('class'),'family_name'))
$ret['family_name'] = escxape_tags($x->textContent);
$ret['family_name'] = escape_tags($x->textContent);
if(attribute_contains($x->getAttribute('class'),'url'))
$ret['url'] = escape_tags($x->textContent);

21
util/php2po.php
View File

@@ -26,32 +26,36 @@
$out = "";
$infile = file($pofile);
$k="";
$k = "";
$c = "";
$ink = False;
foreach ($infile as $l) {
$l = trim($l, " ");
if (!preg_match("/^msgstr\[[1-9]/",$l)) {
if ($k!="" && (substr($l,0,7)=="msgstr " || substr($l,0,8)=="msgstr[0")){
$ink = False;
$k = str_replace('\"','"',$k);
$k = stripslashes($k);
$v = "";
if (isset(App::$strings[$k])) {
$v = App::$strings[$k];
} else {
$k = "__ctx:".$c."__ ".$k;
if (isset(App::$strings[$k]))
if (isset(App::$strings[$k])) {
$v = App::$strings[$k];
$c = "";
};
}
if (!empty($v)) {
if (is_array($v)) {
$l = "";
$n = 0;
foreach ($v as &$value) {
$l .= "msgstr[".$n."] \"".str_replace('"','\"',$value)."\"\n";
$l .= "msgstr[".$n."] \"".addcslashes($value,"\"\n")."\"\n";
$n++;
}
} else {
$l = "msgstr \"".str_replace('"','\"',$v)."\"\n";
$l = "msgstr \"".addcslashes($v,"\"\n")."\"\n";
}
}
}
@@ -59,17 +63,18 @@
if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[") $ink = False;
if ($ink) {
$k .= trim($l,"\"\r\n");
preg_match('/^"(.*)"$/',$l,$m);
$k .= $m[1];
}
if (substr($l,0,6)=="msgid ") {
preg_match('/^msgid "(.*)"/',$l,$m);
preg_match('/^msgid "(.*)"$/',$l,$m);
$k = $m[1];
$ink = True;
}
if (substr($l,0,8)=="msgctxt ") {
preg_match('/^msgctxt "(.*)"/',$l,$m);
preg_match('/^msgctxt "(.*)"$/',$l,$m);
$c = $m[1];
}