Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 00:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse source
This commit is contained in:
redmatrix 2015-11-03 17:40:31 -08:00
commit 6aa98a1e91
5 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/photo/photo_driver.php
View file

@ -593,15 +593,24 @@ function import_profile_photo($photo,$xchan,$thing = false) {
if($photo) {
$filename = basename($photo);
$type = guess_image_type($photo);
if(! $type)
$type = 'image/jpeg';
$result = z_fetch_url($photo,true);
if($result['success'])
if($result['success']) {
$img_str = $result['body'];
$type = guess_image_type($photo, $result['header']);
$h = explode("\n",$result['header']);
if($h) {
foreach($h as $hl) {
if(stristr($hl,'content-type:')) {
if(! stristr($hl,'image/')) {
$photo_failure = true;
}
}
}
}
}
}
$img = photo_factory($img_str, $type);

8
view/es/messages.po
View file

@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-17 16:47-0700\n"
"PO-Revision-Date: 2015-10-18 15:17+0000\n"
"POT-Creation-Date: 2015-10-23 00:04-0700\n"
"PO-Revision-Date: 2015-10-31 19:26+0000\n"
"Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
"Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
"MIME-Version: 1.0\n"
@ -4530,6 +4530,10 @@ msgstr "Normas de Registro"
msgid "Location"
msgstr "Localización"
#: ../../mod/pubsites.php:26
msgid "Project"
msgstr "Proyecto"
#: ../../mod/pubsites.php:26
msgid "View hub ratings"
msgstr "Ver las valoraciones del sitio"

1
view/es/strings.php
View file

@ -1067,6 +1067,7 @@ $a->strings["Site URL"] = "Dirección del sitio";
$a->strings["Access Type"] = "Tipo de Acceso";
$a->strings["Registration Policy"] = "Normas de Registro";
$a->strings["Location"] = "Localización";
$a->strings["Project"] = "Proyecto";
$a->strings["View hub ratings"] = "Ver las valoraciones del sitio";
$a->strings["Rate"] = "Valorar";
$a->strings["View ratings"] = "Ver valoraciones";

8
view/nl/messages.po
View file

@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-17 16:47-0700\n"
"PO-Revision-Date: 2015-10-18 13:28+0000\n"
"POT-Creation-Date: 2015-10-23 00:04-0700\n"
"PO-Revision-Date: 2015-10-26 15:27+0000\n"
"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n"
@ -4526,6 +4526,10 @@ msgstr "Registratiebeleid"
msgid "Location"
msgstr "Locatie"
#: ../../mod/pubsites.php:26
msgid "Project"
msgstr "Project"
#: ../../mod/pubsites.php:26
msgid "View hub ratings"
msgstr "Bekijk hubbeoordelingen"

1
view/nl/strings.php
View file

@ -1067,6 +1067,7 @@ $a->strings["Site URL"] = "URL hub";
$a->strings["Access Type"] = "Toegangstype";
$a->strings["Registration Policy"] = "Registratiebeleid";
$a->strings["Location"] = "Locatie";
$a->strings["Project"] = "Project";
$a->strings["View hub ratings"] = "Bekijk hubbeoordelingen";
$a->strings["Rate"] = "Beoordeel";
$a->strings["View ratings"] = "Bekijk beoordelingen";