tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Hopefully all t()

Browse source 
hopefully the last of the t()
This commit is contained in:
Adam Magness 2018-01-22 16:59:31 -05:00
commit f0725ae384
27 changed files with 124 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Core/UserImport.php
View file

@ -120,7 +120,7 @@ class UserImport
}
if (DBM::is_result($r) > 0) {
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
notice(sprintf(L10n::t("User '%s' already exists on this server!"), $account['user']['nickname']));
return;
}
@ -133,7 +133,7 @@ class UserImport
}
if (DBM::is_result($r) > 0) {
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
notice(sprintf(L10n::t("User '%s' already exists on this server!"), $account['user']['nickname']));
return;
}
@ -187,7 +187,7 @@ class UserImport
$r = self::dbImportAssoc('profile', $profile);
if ($r === false) {
logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
info(t("User profile creation error"));
info(L10n::t("User profile creation error"));
dba::delete('user', ['uid' => $newuid]);
return;
}
@ -296,7 +296,7 @@ class UserImport
// send relocate messages
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid);
info(t("Done. You can now login with your username and password"));
info(L10n::t("Done. You can now login with your username and password"));
goaway(System::baseUrl() . "/login");
}
}

5
src/Model/Photo.php
View file

@ -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;
@ -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);

5
src/Protocol/DFRN.php
View file

@ -12,6 +12,7 @@ use Friendica\App;
use Friendica\Content\OEmbed;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
@ -1393,8 +1394,8 @@ class DFRN
logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
$bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
$bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]");
$bdtext = sprintf(L10n::t("%s\'s birthday"), $contact["name"]);
$bdtext2 = sprintf(L10n::t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]");
$r = q(
"INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)