Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 09:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4312 from zeroadam/feature/L10n

Browse source 
Move pgettext to src
This commit is contained in:
Hypolite Petovan 2018-01-24 11:48:55 -05:00 • committed by GitHub
commit 30c1cc0e8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
144 changed files with 3411 additions and 3186 deletions
Download patch file Download diff file Expand all files Collapse all files

53
include/datetime.php
View file

@ -5,6 +5,7 @@
*/
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
@ -17,21 +18,21 @@ use Friendica\Database\DBM;
*/
function timezone_cmp($a, $b) {
if (strstr($a, '/') && strstr($b, '/')) {
if ( t($a) == t($b)) {
if (L10n::t($a) == L10n::t($b)) {
return 0;
}
return ( t($a) < t($b)) ? -1 : 1;
return (L10n::t($a) < L10n::t($b)) ? -1 : 1;
}
if (strstr($a, '/')) {
return -1;
} elseif (strstr($b, '/')) {
return 1;
} elseif ( t($a) == t($b)) {
} elseif (L10n::t($a) == L10n::t($b)) {
return 0;
}
return ( t($a) < t($b)) ? -1 : 1;
return (L10n::t($a) < L10n::t($b)) ? -1 : 1;
}
/**
@ -56,7 +57,7 @@ function select_timezone($current = 'America/Los_Angeles') {
$o .= '</optgroup>';
}
$continent = $ex[0];
$o .= '<optgroup label="' . t($continent) . '">';
$o .= '<optgroup label="' . L10n::t($continent) . '">';
}
if (count($ex) > 2) {
$city = substr($value,strpos($value,'/')+1);
@ -65,13 +66,13 @@ function select_timezone($current = 'America/Los_Angeles') {
}
} else {
$city = $ex[0];
if ($continent != t('Miscellaneous')) {
if ($continent != L10n::t('Miscellaneous')) {
$o .= '</optgroup>';
$continent = t('Miscellaneous');
$o .= '<optgroup label="' . t($continent) . '">';
$continent = L10n::t('Miscellaneous');
$o .= '<optgroup label="' . L10n::t($continent) . '">';
}
}
$city = str_replace('_', ' ', t($city));
$city = str_replace('_', ' ', L10n::t($city));
$selected = (($value == $current) ? " selected=\"selected\" " : "");
$o .= "<option value=\"$value\" $selected >$city</option>";
}
@ -192,11 +193,11 @@ function dob($dob)
$o = replace_macros(get_markup_template("field_input.tpl"), [
'$field' => [
'dob',
t('Birthday:'),
L10n::t('Birthday:'),
$value,
(((intval($age)) > 0 ) ? t('Age: ') . $age : ""),
(((intval($age)) > 0 ) ? L10n::t('Age: ') . $age : ""),
'',
'placeholder="' . t('YYYY-MM-DD or MM-DD') . '"'
'placeholder="' . L10n::t('YYYY-MM-DD or MM-DD') . '"'
]
]);
@ -270,7 +271,7 @@ function datetimesel($min, $max, $default, $label, $id = 'datetimepicker', $pick
// First day of the week (0 = Sunday)
$firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
$lang = substr(get_browser_language(), 0, 2);
$lang = substr(L10n::getBrowserLanguage(), 0, 2);
// Check if the detected language is supported by the picker
if (!in_array($lang, ["ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu"])) {
@ -352,23 +353,23 @@ function relative_date($posted_date, $format = null) {
$abs = strtotime($localtime);
if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === False) {
return t('never');
if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === false) {
return L10n::t('never');
}
$etime = time() - $abs;
if ($etime < 1) {
return t('less than a second ago');
return L10n::t('less than a second ago');
}
$a = [ 12 * 30 * 24 * 60 * 60 => [ t('year'), t('years')],
30 * 24 * 60 * 60 => [ t('month'), t('months')],
7 * 24 * 60 * 60 => [ t('week'), t('weeks')],
24 * 60 * 60 => [ t('day'), t('days')],
60 * 60 => [ t('hour'), t('hours')],
60 => [ t('minute'), t('minutes')],
1 => [ t('second'), t('seconds')]
$a = [ 12 * 30 * 24 * 60 * 60 => [L10n::t('year'), L10n::t('years')],
30 * 24 * 60 * 60 => [L10n::t('month'), L10n::t('months')],
7 * 24 * 60 * 60 => [L10n::t('week'), L10n::t('weeks')],
24 * 60 * 60 => [L10n::t('day'), L10n::t('days')],
60 * 60 => [L10n::t('hour'), L10n::t('hours')],
60 => [L10n::t('minute'), L10n::t('minutes')],
1 => [L10n::t('second'), L10n::t('seconds')]
];
foreach ($a as $secs => $str) {
@ -377,7 +378,7 @@ function relative_date($posted_date, $format = null) {
$r = round($d);
// translators - e.g. 22 hours ago, 1 minute ago
if (!$format) {
$format = t('%1$d %2$s ago');
$format = L10n::t('%1$d %2$s ago');
}
return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1]));
@ -604,8 +605,8 @@ function update_contact_birthdays() {
continue;
}
$bdtext = sprintf( t('%s\'s birthday'), $rr['name']);
$bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
$bdtext = L10n::t('%s\'s birthday', $rr['name']);
$bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]');
q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",