Merge pull request #4312 from zeroadam/feature/L10n

[friendica.git] / src / Model / Photo.php

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 62b6088d974bcbc6c8240b075f8815a26f26332b..94d5581bf0b0ad30f1a9c3c3db9bdf3aa4859a50 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -7,6 +7,7 @@ namespace Friendica\Model;
 
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
@@ -171,7 +172,7 @@ class Photo
                        $micro = System::baseUrl() . '/images/person-48.jpg';
                }
 
-               return array($image_url, $thumb, $micro);
+               return [$image_url, $thumb, $micro];
        }
 
        /**
@@ -184,9 +185,9 @@ class Photo
                $degrees = count($exifCoord) > 0 ? self::gps2Num($exifCoord[0]) : 0;
                $minutes = count($exifCoord) > 1 ? self::gps2Num($exifCoord[1]) : 0;
                $seconds = count($exifCoord) > 2 ? self::gps2Num($exifCoord[2]) : 0;
-       
+
                $flip = ($hemi == 'W' || $hemi == 'S') ? -1 : 1;
-       
+
                return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600)));
        }
 
@@ -197,15 +198,15 @@ class Photo
        private static function gps2Num($coordPart)
        {
                $parts = explode('/', $coordPart);
-       
+
                if (count($parts) <= 0) {
                        return 0;
                }
-       
+
                if (count($parts) == 1) {
                        return $parts[0];
                }
-       
+
                return floatval($parts[0]) / floatval($parts[1]);
        }
 
@@ -235,7 +236,7 @@ class Photo
                                        GROUP BY `album` ORDER BY `created` DESC",
                                        intval($uid),
                                        dbesc('Contact Photos'),
-                                       dbesc(t('Contact Photos'))
+                                       dbesc(L10n::t('Contact Photos'))
                                );
                        } else {
                                // This query doesn't do the count and is much faster
@@ -244,7 +245,7 @@ class Photo
                                        WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra",
                                        intval($uid),
                                        dbesc('Contact Photos'),
-                                       dbesc(t('Contact Photos'))
+                                       dbesc(L10n::t('Contact Photos'))
                                );
                        }
                        Cache::set($key, $albums, CACHE_DAY);