mirror of
https://github.com/friendica/friendica
synced 2025-04-27 11:10:12 +00:00
Merge pull request #4312 from zeroadam/feature/L10n
Move pgettext to src
This commit is contained in:
Hypolite Petovan
GitHub
commit
30c1cc0e8c
144 changed files with 3411 additions and 3186 deletions
244
src/Core/L10n.php
Normal file
244
src/Core/L10n.php
Normal file
|
|
@ -0,0 +1,244 @@
|
|||
<?php
|
||||
/**
|
||||
* @file src/Core/L10n.php
|
||||
*/
|
||||
namespace Friendica\Core;
|
||||
|
||||
use Friendica\Core\Config;
|
||||
use dba;
|
||||
|
||||
require_once 'boot.php';
|
||||
require_once 'include/dba.php';
|
||||
|
||||
/**
|
||||
* Provide Languange, Translation, and Localisation functions to the application
|
||||
* Localisation can be referred to by the numeronym L10N (as in: "L", followed by ten more letters, and then "N").
|
||||
*/
|
||||
class L10n
|
||||
{
|
||||
/**
|
||||
* @brief get the prefered language from the HTTP_ACCEPT_LANGUAGE header
|
||||
*/
|
||||
public static function getBrowserLanguage()
|
||||
{
|
||||
$lang_list = [];
|
||||
|
||||
if (x($_SERVER, 'HTTP_ACCEPT_LANGUAGE')) {
|
||||
// break up string into pieces (languages and q factors)
|
||||
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
|
||||
|
||||
if (count($lang_parse[1])) {
|
||||
// go through the list of prefered languages and add a generic language
|
||||
// for sub-linguas (e.g. de-ch will add de) if not already in array
|
||||
for ($i = 0; $i < count($lang_parse[1]); $i++) {
|
||||
$lang_list[] = strtolower($lang_parse[1][$i]);
|
||||
if (strlen($lang_parse[1][$i])>3) {
|
||||
$dashpos = strpos($lang_parse[1][$i], '-');
|
||||
if (!in_array(substr($lang_parse[1][$i], 0, $dashpos), $lang_list)) {
|
||||
$lang_list[] = strtolower(substr($lang_parse[1][$i], 0, $dashpos));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// check if we have translations for the preferred languages and pick the 1st that has
|
||||
foreach ($lang_list as $lang) {
|
||||
if ($lang === 'en' || (file_exists("view/lang/$lang") && is_dir("view/lang/$lang"))) {
|
||||
$preferred = $lang;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (isset($preferred)) {
|
||||
return $preferred;
|
||||
}
|
||||
|
||||
// in case none matches, get the system wide configured language, or fall back to English
|
||||
return Config::get('system', 'language', 'en');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $language language
|
||||
*/
|
||||
public static function pushLang($language)
|
||||
{
|
||||
global $lang, $a;
|
||||
|
||||
$a->langsave = $lang;
|
||||
|
||||
if ($language === $lang) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isset($a->strings) && count($a->strings)) {
|
||||
$a->stringsave = $a->strings;
|
||||
}
|
||||
$a->strings = [];
|
||||
self::loadTranslationTable($language);
|
||||
$lang = $language;
|
||||
}
|
||||
|
||||
/**
|
||||
* Pop language off the top of the stack
|
||||
*/
|
||||
public static function popLang()
|
||||
{
|
||||
global $lang, $a;
|
||||
|
||||
if ($lang === $a->langsave) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isset($a->stringsave)) {
|
||||
$a->strings = $a->stringsave;
|
||||
} else {
|
||||
$a->strings = [];
|
||||
}
|
||||
|
||||
$lang = $a->langsave;
|
||||
}
|
||||
|
||||
/**
|
||||
* load string translation table for alternate language
|
||||
*
|
||||
* first addon strings are loaded, then globals
|
||||
*
|
||||
* @param string $lang language code to load
|
||||
*/
|
||||
public static function loadTranslationTable($lang)
|
||||
{
|
||||
$a = get_app();
|
||||
|
||||
$a->strings = [];
|
||||
// load enabled addons strings
|
||||
$addons = dba::select('addon', ['name'], ['installed' => true]);
|
||||
while ($p = dba::fetch($addons)) {
|
||||
$name = $p['name'];
|
||||
if (file_exists("addon/$name/lang/$lang/strings.php")) {
|
||||
include "addon/$name/lang/$lang/strings.php";
|
||||
}
|
||||
}
|
||||
|
||||
if (file_exists("view/lang/$lang/strings.php")) {
|
||||
include "view/lang/$lang/strings.php";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Return the localized version of the provided string with optional string interpolation
|
||||
*
|
||||
* This function takes a english string as parameter, and if a localized version
|
||||
* exists for the current language, substitutes it before performing an eventual
|
||||
* string interpolation (sprintf) with additional optional arguments.
|
||||
*
|
||||
* Usages:
|
||||
* - L10n::t('This is an example')
|
||||
* - L10n::t('URL %s returned no result', $url)
|
||||
* - L10n::t('Current version: %s, new version: %s', $current_version, $new_version)
|
||||
*
|
||||
* @param string $s
|
||||
* @return string
|
||||
*/
|
||||
public static function t($s)
|
||||
{
|
||||
$a = get_app();
|
||||
|
||||
if (x($a->strings, $s)) {
|
||||
$t = $a->strings[$s];
|
||||
$s = is_array($t) ? $t[0] : $t;
|
||||
}
|
||||
if (func_num_args() > 1) {
|
||||
$args = array_slice(func_get_args(), 1);
|
||||
$s = @vsprintf($s, $args);
|
||||
}
|
||||
|
||||
return $s;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Return the localized version of a singular/plural string with optional string interpolation
|
||||
*
|
||||
* This function takes two english strings as parameters, singular and plural, as
|
||||
* well as a count. If a localized version exists for the current language, they
|
||||
* are used instead. Discrimination between singular and plural is done using the
|
||||
* localized function if any or the default one. Finally, a string interpolation
|
||||
* is performed using the count as parameter.
|
||||
*
|
||||
* Usages:
|
||||
* - L10n::tt('Like', 'Likes', $count)
|
||||
* - L10n::tt("%s user deleted", "%s users deleted", count($users))
|
||||
*
|
||||
* @global type $lang
|
||||
* @param string $singular
|
||||
* @param string $plural
|
||||
* @param int $count
|
||||
* @return string
|
||||
*/
|
||||
public static function tt($singular, $plural, $count)
|
||||
{
|
||||
global $lang;
|
||||
$a = get_app();
|
||||
|
||||
if (x($a->strings, $singular)) {
|
||||
$t = $a->strings[$singular];
|
||||
if (is_array($t)) {
|
||||
$plural_function = 'string_plural_select_' . str_replace('-', '_', $lang);
|
||||
if (function_exists($plural_function)) {
|
||||
$i = $plural_function($count);
|
||||
} else {
|
||||
$i = self::stringPluralSelectDefault($count);
|
||||
}
|
||||
$s = $t[$i];
|
||||
} else {
|
||||
$s = $t;
|
||||
}
|
||||
} elseif (self::stringPluralSelectDefault($count)) {
|
||||
$s = $plural;
|
||||
} else {
|
||||
$s = $singular;
|
||||
}
|
||||
|
||||
$s = @sprintf($s, $count);
|
||||
|
||||
return $s;
|
||||
}
|
||||
|
||||
/**
|
||||
* Provide a fallback which will not collide with a function defined in any language file
|
||||
*/
|
||||
private static function stringPluralSelectDefault($n)
|
||||
{
|
||||
return $n != 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @brief Return installed languages codes as associative array
|
||||
*
|
||||
* Scans the view/lang directory for the existence of "strings.php" files, and
|
||||
* returns an alphabetical list of their folder names (@-char language codes).
|
||||
* Adds the english language if it's missing from the list.
|
||||
*
|
||||
* Ex: array('de' => 'de', 'en' => 'en', 'fr' => 'fr', ...)
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public static function getAvailableLanguages()
|
||||
{
|
||||
$langs = [];
|
||||
$strings_file_paths = glob('view/lang/*/strings.php');
|
||||
|
||||
if (is_array($strings_file_paths) && count($strings_file_paths)) {
|
||||
if (!in_array('view/lang/en/strings.php', $strings_file_paths)) {
|
||||
$strings_file_paths[] = 'view/lang/en/strings.php';
|
||||
}
|
||||
asort($strings_file_paths);
|
||||
foreach ($strings_file_paths as $strings_file_path) {
|
||||
$path_array = explode('/', $strings_file_path);
|
||||
$langs[$path_array[2]] = $path_array[2];
|
||||
}
|
||||
}
|
||||
return $langs;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file src/Core/NotificationsManager.php
|
||||
* @brief Methods for read and write notifications from/to database
|
||||
* or for formatting notifications
|
||||
*/
|
||||
|
||||
namespace Friendica\Core;
|
||||
|
||||
use Friendica\BaseObject;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
|
|
@ -167,35 +166,35 @@ class NotificationsManager extends BaseObject
|
|||
{
|
||||
$tabs = [
|
||||
[
|
||||
'label' => t('System'),
|
||||
'label' => L10n::t('System'),
|
||||
'url' => 'notifications/system',
|
||||
'sel' => ((self::getApp()->argv[1] == 'system') ? 'active' : ''),
|
||||
'id' => 'system-tab',
|
||||
'accesskey' => 'y',
|
||||
],
|
||||
[
|
||||
'label' => t('Network'),
|
||||
'label' => L10n::t('Network'),
|
||||
'url' => 'notifications/network',
|
||||
'sel' => ((self::getApp()->argv[1] == 'network') ? 'active' : ''),
|
||||
'id' => 'network-tab',
|
||||
'accesskey' => 'w',
|
||||
],
|
||||
[
|
||||
'label' => t('Personal'),
|
||||
'label' => L10n::t('Personal'),
|
||||
'url' => 'notifications/personal',
|
||||
'sel' => ((self::getApp()->argv[1] == 'personal') ? 'active' : ''),
|
||||
'id' => 'personal-tab',
|
||||
'accesskey' => 'r',
|
||||
],
|
||||
[
|
||||
'label' => t('Home'),
|
||||
'label' => L10n::t('Home'),
|
||||
'url' => 'notifications/home',
|
||||
'sel' => ((self::getApp()->argv[1] == 'home') ? 'active' : ''),
|
||||
'id' => 'home-tab',
|
||||
'accesskey' => 'h',
|
||||
],
|
||||
[
|
||||
'label' => t('Introductions'),
|
||||
'label' => L10n::t('Introductions'),
|
||||
'url' => 'notifications/intros',
|
||||
'sel' => ((self::getApp()->argv[1] == 'intros') ? 'active' : ''),
|
||||
'id' => 'intro-tab',
|
||||
|
|
@ -252,7 +251,7 @@ class NotificationsManager extends BaseObject
|
|||
$default_item_link = System::baseUrl(true) . '/display/' . $it['pguid'];
|
||||
$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
|
||||
$default_item_url = $it['author-link'];
|
||||
$default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']);
|
||||
$default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']);
|
||||
$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
|
||||
$default_item_ago = relative_date($it['created']);
|
||||
break;
|
||||
|
|
@ -263,8 +262,8 @@ class NotificationsManager extends BaseObject
|
|||
$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
|
||||
$default_item_url = $it['author-link'];
|
||||
$default_item_text = (($it['id'] == $it['parent'])
|
||||
? sprintf(t("%s created a new post"), $it['author-name'])
|
||||
: sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']));
|
||||
? L10n::t("%s created a new post", $it['author-name'])
|
||||
: L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']));
|
||||
$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
|
||||
$default_item_ago = relative_date($it['created']);
|
||||
}
|
||||
|
|
@ -277,7 +276,7 @@ class NotificationsManager extends BaseObject
|
|||
'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']),
|
||||
'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['pname']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $it['seen']
|
||||
|
|
@ -290,7 +289,7 @@ class NotificationsManager extends BaseObject
|
|||
'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']),
|
||||
'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['pname']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $it['seen']
|
||||
|
|
@ -303,7 +302,7 @@ class NotificationsManager extends BaseObject
|
|||
'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']),
|
||||
'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['pname']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $it['seen']
|
||||
|
|
@ -316,7 +315,7 @@ class NotificationsManager extends BaseObject
|
|||
'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
|
||||
'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['pname']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $it['seen']
|
||||
|
|
@ -329,7 +328,7 @@ class NotificationsManager extends BaseObject
|
|||
'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']),
|
||||
'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['pname']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $it['seen']
|
||||
|
|
@ -346,7 +345,7 @@ class NotificationsManager extends BaseObject
|
|||
'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']),
|
||||
'text' => L10n::t("%s is now friends with %s", $it['author-name'], $it['fname']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $it['seen']
|
||||
|
|
@ -809,7 +808,7 @@ class NotificationsManager extends BaseObject
|
|||
|
||||
$intro = [
|
||||
'label' => 'friend_suggestion',
|
||||
'notify_type' => t('Friend Suggestion'),
|
||||
'notify_type' => L10n::t('Friend Suggestion'),
|
||||
'intro_id' => $it['intro_id'],
|
||||
'madeby' => $it['name'],
|
||||
'contact_id' => $it['contact-id'],
|
||||
|
|
@ -835,7 +834,7 @@ class NotificationsManager extends BaseObject
|
|||
}
|
||||
$intro = [
|
||||
'label' => (($it['network'] !== NETWORK_OSTATUS) ? 'friend_request' : 'follower'),
|
||||
'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
|
||||
'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? L10n::t('Friend/Connect Request') : L10n::t('New Follower')),
|
||||
'dfrn_id' => $it['issued-id'],
|
||||
'uid' => $_SESSION['uid'],
|
||||
'intro_id' => $it['intro_id'],
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
namespace Friendica\Core;
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\Worker;
|
||||
|
|
@ -100,13 +101,13 @@ class UserImport
|
|||
|
||||
$account = json_decode(file_get_contents($file['tmp_name']), true);
|
||||
if ($account === null) {
|
||||
notice(t("Error decoding account file"));
|
||||
notice(L10n::t("Error decoding account file"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (!x($account, 'version')) {
|
||||
notice(t("Error! No version data in file! This is not a Friendica account file?"));
|
||||
notice(L10n::t("Error! No version data in file! This is not a Friendica account file?"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -114,12 +115,12 @@ class UserImport
|
|||
$r = dba::selectFirst('user', ['uid'], ['nickname' => $account['user']['nickname']]);
|
||||
if ($r === false) {
|
||||
logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
|
||||
notice(t('Error! Cannot check nickname'));
|
||||
notice(L10n::t('Error! Cannot check nickname'));
|
||||
return;
|
||||
}
|
||||
|
||||
if (DBM::is_result($r) > 0) {
|
||||
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
|
||||
notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -127,12 +128,12 @@ class UserImport
|
|||
$r = dba::selectFirst('userd', ['id'], ['username' => $account['user']['nickname']]);
|
||||
if ($r === false) {
|
||||
logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
|
||||
notice(t('Error! Cannot check nickname'));
|
||||
notice(L10n::t('Error! Cannot check nickname'));
|
||||
return;
|
||||
}
|
||||
|
||||
if (DBM::is_result($r) > 0) {
|
||||
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
|
||||
notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -165,7 +166,7 @@ class UserImport
|
|||
$r = self::dbImportAssoc('user', $account['user']);
|
||||
if ($r === false) {
|
||||
logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
|
||||
notice(t("User creation error"));
|
||||
notice(L10n::t("User creation error"));
|
||||
return;
|
||||
}
|
||||
$newuid = self::lastInsertId();
|
||||
|
|
@ -186,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;
|
||||
}
|
||||
|
|
@ -230,7 +231,7 @@ class UserImport
|
|||
}
|
||||
}
|
||||
if ($errorcount > 0) {
|
||||
notice(sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount));
|
||||
notice(L10n::tt("%d contact not imported", "%d contacts not imported", $errorcount));
|
||||
}
|
||||
|
||||
foreach ($account['group'] as &$group) {
|
||||
|
|
@ -295,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");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue