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 xdev_merge

Browse Source
This commit is contained in:
zotlabs 2018-11-04 13:58:02 -08:00
commit af82aab3a6
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Zotlabs/Module/Linkinfo.php
View File

@ -229,7 +229,12 @@ class Linkinfo extends \Zotlabs\Web\Controller {
$header = $result['header']; $header = $result['header'];
$body = $result['body']; $body = $result['body'];
$body = mb_convert_encoding($body, 'UTF-8', (preg_match('/meta.+content=["|\']text\/html;\s+charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'UTF-8')); // Check codepage in HTTP headers or HTML if not exist
$cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : '');
if(empty($cp))
$cp = (preg_match('/meta.+content=["|\']text\/html; charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'AUTO');
$body = mb_convert_encoding($body, 'UTF-8', $cp);
$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
$doc = new \DOMDocument(); $doc = new \DOMDocument();

4
include/network.php
View File

@ -711,9 +711,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
foreach($matches as $mtch) { foreach($matches as $mtch) {
logger('data: ' . $mtch[2] . ' ' . $mtch[3]); logger('data: ' . $mtch[2] . ' ' . $mtch[3]);
if(substr($mtch[1],0,1) == '=') { if(substr($mtch[2],0,1) == '=') {
$owidth = intval(substr($mtch[2],1)); $owidth = intval(substr($mtch[2],1));
if(intval($owidth) > 0 && intval($owidth) < 1024) if($owidth > 0 && $owidth < 1024)
continue; continue;
} }

2
view/es-es/hstrings.php
View File

@ -5,7 +5,7 @@ function string_plural_select_es_es($n){
return ($n != 1);; return ($n != 1);;
}} }}
App::$rtl = 0; App::$rtl = 0;
App::$strings["plural_function_code"] = "(n != 1);"; App::$strings["plural_function_code"] = "(n != 1)";
App::$strings["Can view my channel stream and posts"] = "Pueden verse la actividad y publicaciones de mi canal"; App::$strings["Can view my channel stream and posts"] = "Pueden verse la actividad y publicaciones de mi canal";
App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal"; App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal";
App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado."; App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";

6
view/it/hmessages.po
View File

@ -5849,7 +5849,7 @@ msgstr "Impossibile creare il menù."
#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 #: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
msgid "Menu Name" msgid "Menu Name"
msgstr "Nome del menu" msgstr "Nome del menù"
#: ../../Zotlabs/Module/Menu.php:98 #: ../../Zotlabs/Module/Menu.php:98
msgid "Unique name (not visible on webpage) - required" msgid "Unique name (not visible on webpage) - required"
@ -6543,7 +6543,7 @@ msgstr "Homepage del progetto"
#: ../../Zotlabs/Module/Siteinfo.php:32 #: ../../Zotlabs/Module/Siteinfo.php:32
msgid "Developer homepage" msgid "Developer homepage"
msgstr "Homepege dello sviluppatore" msgstr "Homepage dello sviluppatore"
#: ../../Zotlabs/Module/Ratings.php:70 #: ../../Zotlabs/Module/Ratings.php:70
msgid "No ratings" msgid "No ratings"
@ -6623,7 +6623,7 @@ msgstr "Importazione completata."
msgid "" msgid ""
"Channel name changes are not allowed within 48 hours of changing the account" "Channel name changes are not allowed within 48 hours of changing the account"
" password." " password."
msgstr "Non è possibile cambiare il nome del canale entro le 48 dal cambio della password dell'account." msgstr "Non è possibile cambiare il nome del canale entro le 48 ore dal cambio della password dell'account."
#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214 #: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214
#: ../../include/channel.php:599 #: ../../include/channel.php:599

2
view/it/hstrings.php
View File

@ -1393,7 +1393,7 @@ App::$strings["This site is powered by \$Projectname"] = "Questo sito è costrui
App::$strings["Federated and decentralised networking and identity services provided by Zot"] = ""; App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "";
App::$strings["Version %s"] = "Versione %s"; App::$strings["Version %s"] = "Versione %s";
App::$strings["Project homepage"] = "Homepage del progetto"; App::$strings["Project homepage"] = "Homepage del progetto";
App::$strings["Developer homepage"] = "Homepege dello sviluppatore"; App::$strings["Developer homepage"] = "Homepage dello sviluppatore";
App::$strings["No ratings"] = "Nessuna valutazione"; App::$strings["No ratings"] = "Nessuna valutazione";
App::$strings["Ratings"] = "Valutazioni"; App::$strings["Ratings"] = "Valutazioni";
App::$strings["Rating: "] = "Valutazione:"; App::$strings["Rating: "] = "Valutazione:";