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
|
|
@ -40,7 +40,7 @@
|
|||
</div>
|
||||
|
||||
<div class="upload">
|
||||
<button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
|
||||
<button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{$upload}}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,73 +1,78 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Theme settings
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function theme_content(App $a) {
|
||||
function theme_content(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$colorset = PConfig::get( local_user(), 'duepuntozero', 'colorset');
|
||||
$colorset = PConfig::get(local_user(), 'duepuntozero', 'colorset');
|
||||
$user = true;
|
||||
|
||||
return clean_form($a, $colorset, $user);
|
||||
}
|
||||
|
||||
function theme_post(App $a) {
|
||||
function theme_post(App $a)
|
||||
{
|
||||
if (! local_user()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isset($_POST['duepuntozero-settings-submit'])){
|
||||
if (isset($_POST['duepuntozero-settings-submit'])) {
|
||||
PConfig::set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
|
||||
}
|
||||
}
|
||||
|
||||
function theme_admin(App $a) {
|
||||
$colorset = Config::get( 'duepuntozero', 'colorset');
|
||||
function theme_admin(App $a)
|
||||
{
|
||||
$colorset = Config::get('duepuntozero', 'colorset');
|
||||
$user = false;
|
||||
|
||||
return clean_form($a, $colorset, $user);
|
||||
}
|
||||
|
||||
function theme_admin_post(App $a) {
|
||||
if (isset($_POST['duepuntozero-settings-submit'])){
|
||||
function theme_admin_post(App $a)
|
||||
{
|
||||
if (isset($_POST['duepuntozero-settings-submit'])) {
|
||||
Config::set('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
|
||||
}
|
||||
}
|
||||
|
||||
/// @TODO $a is no longer used
|
||||
function clean_form(App $a, &$colorset, $user) {
|
||||
function clean_form(App $a, &$colorset, $user)
|
||||
{
|
||||
$colorset = [
|
||||
'default' =>t('default'),
|
||||
'greenzero' =>t('greenzero'),
|
||||
'purplezero' =>t('purplezero'),
|
||||
'easterbunny' =>t('easterbunny'),
|
||||
'darkzero' =>t('darkzero'),
|
||||
'comix' =>t('comix'),
|
||||
'slackr' =>t('slackr'),
|
||||
'default' => L10n::t('default'),
|
||||
'greenzero' => L10n::t('greenzero'),
|
||||
'purplezero' => L10n::t('purplezero'),
|
||||
'easterbunny' => L10n::t('easterbunny'),
|
||||
'darkzero' => L10n::t('darkzero'),
|
||||
'comix' => L10n::t('comix'),
|
||||
'slackr' => L10n::t('slackr'),
|
||||
];
|
||||
|
||||
if ($user) {
|
||||
$color = PConfig::get(local_user(), 'duepuntozero', 'colorset');
|
||||
} else {
|
||||
$color = Config::get( 'duepuntozero', 'colorset');
|
||||
$color = Config::get('duepuntozero', 'colorset');
|
||||
}
|
||||
|
||||
$t = get_markup_template("theme_settings.tpl" );
|
||||
$t = get_markup_template("theme_settings.tpl");
|
||||
/// @TODO No need for adding string here, $o is not defined
|
||||
$o .= replace_macros($t, [
|
||||
'$submit' => t('Submit'),
|
||||
'$submit' => L10n::t('Submit'),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$title' => t("Theme settings"),
|
||||
'$colorset' => ['duepuntozero_colorset', t('Variations'), $color, '', $colorset],
|
||||
'$title' => L10n::t("Theme settings"),
|
||||
'$colorset' => ['duepuntozero_colorset', L10n::t('Variations'), $color, '', $colorset],
|
||||
]);
|
||||
|
||||
return $o;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,11 @@
|
|||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('view/theme/frio/php/Image.php');
|
||||
require_once 'view/theme/frio/php/Image.php';
|
||||
|
||||
function theme_post(App $a) {
|
||||
if (!local_user()) {
|
||||
|
|
@ -93,7 +94,7 @@ function frio_form($arr) {
|
|||
}
|
||||
|
||||
$scheme_choices = [];
|
||||
$scheme_choices["---"] = t("Default");
|
||||
$scheme_choices["---"] = L10n::t("Default");
|
||||
$files = glob('view/theme/frio/schema/*.php');
|
||||
if ($files) {
|
||||
foreach ($files as $file) {
|
||||
|
|
@ -105,28 +106,28 @@ function frio_form($arr) {
|
|||
}
|
||||
}
|
||||
|
||||
$background_image_help = "<strong>" . t("Note"). ": </strong>".t("Check image permissions if all users are allowed to visit the image");
|
||||
$background_image_help = "<strong>" . L10n::t("Note"). ": </strong>".L10n::t("Check image permissions if all users are allowed to visit the image");
|
||||
|
||||
$t = get_markup_template('theme_settings.tpl');
|
||||
$ctx = [
|
||||
'$submit' => t('Submit'),
|
||||
'$submit' => L10n::t('Submit'),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$title' => t("Theme settings"),
|
||||
'$schema' => ['frio_schema', t("Select scheme"), $arr["schema"], '', $scheme_choices],
|
||||
'$nav_bg' => array_key_exists("nav_bg", $disable) ? "" : ['frio_nav_bg', t('Navigation bar background color'), $arr['nav_bg']],
|
||||
'$nav_icon_color' => array_key_exists("nav_icon_color", $disable) ? "" : ['frio_nav_icon_color', t('Navigation bar icon color '), $arr['nav_icon_color']],
|
||||
'$link_color' => array_key_exists("link_color", $disable) ? "" : ['frio_link_color', t('Link color'), $arr['link_color'], '', $link_colors],
|
||||
'$bgcolor' => array_key_exists("bgcolor", $disable) ? "" : ['frio_background_color', t('Set the background color'), $arr['bgcolor']],
|
||||
'$contentbg_transp' => array_key_exists("contentbg_transp", $disable) ? "" : ['frio_contentbg_transp', t("Content background transparency"), ((isset($arr["contentbg_transp"]) && $arr["contentbg_transp"] != "") ? $arr["contentbg_transp"] : 100)],
|
||||
'$background_image' => array_key_exists("background_image", $disable ) ? "" : ['frio_background_image', t('Set the background image'), $arr['background_image'], $background_image_help],
|
||||
'$title' => L10n::t("Theme settings"),
|
||||
'$schema' => ['frio_schema', L10n::t("Select scheme"), $arr["schema"], '', $scheme_choices],
|
||||
'$nav_bg' => array_key_exists("nav_bg", $disable) ? "" : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg']],
|
||||
'$nav_icon_color' => array_key_exists("nav_icon_color", $disable) ? "" : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color']],
|
||||
'$link_color' => array_key_exists("link_color", $disable) ? "" : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', $link_colors],
|
||||
'$bgcolor' => array_key_exists("bgcolor", $disable) ? "" : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor']],
|
||||
'$contentbg_transp' => array_key_exists("contentbg_transp", $disable) ? "" : ['frio_contentbg_transp', L10n::t("Content background transparency"), ((isset($arr["contentbg_transp"]) && $arr["contentbg_transp"] != "") ? $arr["contentbg_transp"] : 100)],
|
||||
'$background_image' => array_key_exists("background_image", $disable) ? "" : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help],
|
||||
'$bg_image_options' => Image::get_options($arr),
|
||||
];
|
||||
|
||||
if ( array_key_exists("login_bg_image", $arr ) && !array_key_exists("login_bg_image", $disable ) ) {
|
||||
$ctx['$login_bg_image'] = ['frio_login_bg_image', t('Login page background image'), $arr['login_bg_image'], $background_image_help];
|
||||
if (array_key_exists("login_bg_image", $arr) && !array_key_exists("login_bg_image", $disable)) {
|
||||
$ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help];
|
||||
}
|
||||
if ( array_key_exists("login_bg_color", $arr ) && !array_key_exists("login_bg_color", $disable ) ) {
|
||||
$ctx['$login_bg_color'] = ['frio_login_bg_color', t('Login page background color'), $arr['login_bg_color'], t('Leave background image and color empty for theme defaults')];
|
||||
if (array_key_exists("login_bg_color", $arr) && !array_key_exists("login_bg_color", $disable)) {
|
||||
$ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults')];
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file view/theme/frio/php/Image.php
|
||||
* @brief contain methods to deal with images
|
||||
|
|
@ -8,8 +7,10 @@
|
|||
/**
|
||||
* @brief This class contains methods to deal with images
|
||||
*/
|
||||
class Image {
|
||||
use Friendica\Core\L10n;
|
||||
|
||||
class Image
|
||||
{
|
||||
/**
|
||||
* @brief Give all available options for the background image
|
||||
*
|
||||
|
|
@ -17,18 +18,19 @@ class Image {
|
|||
*
|
||||
* @return array Array with the immage options
|
||||
*/
|
||||
public static function get_options($arr) {
|
||||
public static function get_options($arr)
|
||||
{
|
||||
$bg_image_options = [
|
||||
'repeat' => [
|
||||
'frio_bg_image_option', t("Repeat the image"), "repeat", t("Will repeat your image to fill the background."), ($arr["bg_image_option"] == "repeat")],
|
||||
'frio_bg_image_option', L10n::t("Repeat the image"), "repeat", L10n::t("Will repeat your image to fill the background."), ($arr["bg_image_option"] == "repeat")],
|
||||
'stretch' => [
|
||||
'frio_bg_image_option', t("Stretch"), "stretch", t("Will stretch to width/height of the image."), ($arr["bg_image_option"] == "stretch")],
|
||||
'frio_bg_image_option', L10n::t("Stretch"), "stretch", L10n::t("Will stretch to width/height of the image."), ($arr["bg_image_option"] == "stretch")],
|
||||
'cover' => [
|
||||
'frio_bg_image_option', t("Resize fill and-clip"), "cover", t("Resize to fill and retain aspect ratio."), ($arr["bg_image_option"] == "cover")],
|
||||
'frio_bg_image_option', L10n::t("Resize fill and-clip"), "cover", L10n::t("Resize to fill and retain aspect ratio."), ($arr["bg_image_option"] == "cover")],
|
||||
'contain' => [
|
||||
'frio_bg_image_option', t("Resize best fit"), "contain", t("Resize to best fit and retain aspect ratio."), ($arr["bg_image_option"] == "contain")],
|
||||
'frio_bg_image_option', L10n::t("Resize best fit"), "contain", L10n::t("Resize to best fit and retain aspect ratio."), ($arr["bg_image_option"] == "contain")],
|
||||
];
|
||||
|
||||
return $bg_image_options;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
</div>
|
||||
|
||||
<div class="upload">
|
||||
<button id="upload-{{$type}}">{{"Upload"|t}}</button>
|
||||
<button id="upload-{{$type}}">{{$upload}}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ use Friendica\App;
|
|||
use Friendica\Content\Widget;
|
||||
use Friendica\Core\Addon;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
|
|
@ -234,12 +235,12 @@ function frio_remote_nav($a, &$nav)
|
|||
$r[0]['name'] = $a->user['username'];
|
||||
} elseif (!local_user() && remote_user()) {
|
||||
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
|
||||
$nav['remote'] = t("Guest");
|
||||
$nav['remote'] = L10n::t("Guest");
|
||||
} elseif (Profile::getMyURL()) {
|
||||
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
|
||||
WHERE `addr` = '%s' AND `network` = 'dfrn'",
|
||||
dbesc($webbie));
|
||||
$nav['remote'] = t("Visitor");
|
||||
$nav['remote'] = L10n::t("Visitor");
|
||||
} else {
|
||||
$r = false;
|
||||
}
|
||||
|
|
@ -252,21 +253,21 @@ function frio_remote_nav($a, &$nav)
|
|||
}
|
||||
|
||||
if (!local_user() && !empty($server_url)) {
|
||||
$nav['logout'] = [$server_url . '/logout', t('Logout'), "", t('End this session')];
|
||||
$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), "", L10n::t('End this session')];
|
||||
|
||||
// user menu
|
||||
$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations')];
|
||||
$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', t('Profile'), "", t('Your profile page')];
|
||||
$nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')];
|
||||
$nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], t('Videos'), "", t('Your videos')];
|
||||
$nav['usermenu'][] = [$server_url . '/events/', t('Events'), "", t('Your events')];
|
||||
$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), "", L10n::t('Your posts and conversations')];
|
||||
$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), "", L10n::t('Your profile page')];
|
||||
$nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), "", L10n::t('Your photos')];
|
||||
$nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), "", L10n::t('Your videos')];
|
||||
$nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), "", L10n::t('Your events')];
|
||||
|
||||
// navbar links
|
||||
$nav['network'] = [$server_url . '/network', t('Network'), "", t('Conversations from your friends')];
|
||||
$nav['events'] = [$server_url . '/events', t('Events'), "", t('Events and Calendar')];
|
||||
$nav['messages'] = [$server_url . '/message', t('Messages'), "", t('Private mail')];
|
||||
$nav['settings'] = [$server_url . '/settings', t('Settings'), "", t('Account settings')];
|
||||
$nav['contacts'] = [$server_url . '/contacts', t('Contacts'), "", t('Manage/edit friends and contacts')];
|
||||
$nav['network'] = [$server_url . '/network', L10n::t('Network'), "", L10n::t('Conversations from your friends')];
|
||||
$nav['events'] = [$server_url . '/events', L10n::t('Events'), "", L10n::t('Events and Calendar')];
|
||||
$nav['messages'] = [$server_url . '/message', L10n::t('Messages'), "", L10n::t('Private mail')];
|
||||
$nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), "", L10n::t('Account settings')];
|
||||
$nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), "", L10n::t('Manage/edit friends and contacts')];
|
||||
$nav['sitename'] = $a->config['sitename'];
|
||||
}
|
||||
}
|
||||
|
|
@ -352,7 +353,7 @@ function frio_display_item(App $a, &$arr)
|
|||
if (local_user() == $arr['item']['uid'] && $arr['item']['parent'] == $arr['item']['id'] && !$arr['item']['self']) {
|
||||
$subthread = [
|
||||
'menu' => 'follow_thread',
|
||||
'title' => t('Follow Thread'),
|
||||
'title' => L10n::t('Follow Thread'),
|
||||
'action' => 'dosubthread(' . $arr['item']['id'] . '); return false;',
|
||||
'href' => '#'
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Theme settings
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
|
||||
|
|
@ -70,13 +70,13 @@ function quattro_form(App $a, $align, $color, $tfs, $pfs) {
|
|||
|
||||
$t = get_markup_template("theme_settings.tpl" );
|
||||
$o .= replace_macros($t, [
|
||||
'$submit' => t('Submit'),
|
||||
'$submit' => L10n::t('Submit'),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$title' => t("Theme settings"),
|
||||
'$align' => ['quattro_align', t('Alignment'), $align, '', ['left'=>t('Left'), 'center'=>t('Center')]],
|
||||
'$color' => ['quattro_color', t('Color scheme'), $color, '', $colors],
|
||||
'$pfs' => ['quattro_pfs', t('Posts font size'), $pfs],
|
||||
'$tfs' => ['quattro_tfs', t('Textareas font size'), $tfs],
|
||||
'$title' => L10n::t("Theme settings"),
|
||||
'$align' => ['quattro_align', L10n::t('Alignment'), $align, '', ['left' => L10n::t('Left'), 'center' => L10n::t('Center')]],
|
||||
'$color' => ['quattro_color', L10n::t('Color scheme'), $color, '', $colors],
|
||||
'$pfs' => ['quattro_pfs', L10n::t('Posts font size'), $pfs],
|
||||
'$tfs' => ['quattro_tfs', L10n::t('Textareas font size'), $tfs],
|
||||
]);
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Theme settings
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function theme_content(App $a) {
|
||||
function theme_content(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -39,12 +40,13 @@ function theme_content(App $a) {
|
|||
$show_services, $show_friends, $show_lastusers);
|
||||
}
|
||||
|
||||
function theme_post(App $a) {
|
||||
function theme_post(App $a)
|
||||
{
|
||||
if (! local_user()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isset($_POST['vier-settings-submit'])){
|
||||
if (isset($_POST['vier-settings-submit'])) {
|
||||
PConfig::set(local_user(), 'vier', 'style', $_POST['vier_style']);
|
||||
PConfig::set(local_user(), 'vier', 'show_pages', $_POST['vier_show_pages']);
|
||||
PConfig::set(local_user(), 'vier', 'show_profiles', $_POST['vier_show_profiles']);
|
||||
|
|
@ -70,7 +72,7 @@ function theme_admin(App $a) {
|
|||
|
||||
$t = get_markup_template("theme_admin_settings.tpl");
|
||||
$o .= replace_macros($t, [
|
||||
'$helperlist' => ['vier_helperlist', t('Comma separated list of helper forums'), $helperlist, '', ''],
|
||||
'$helperlist' => ['vier_helperlist', L10n::t('Comma separated list of helper forums'), $helperlist, '', ''],
|
||||
]);
|
||||
|
||||
$show_pages = get_vier_config('show_pages', true, true);
|
||||
|
|
@ -110,20 +112,20 @@ function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $
|
|||
"shadow"=>"Shadow"
|
||||
];
|
||||
|
||||
$show_or_not = ['0'=>t("don't show"), '1'=>t("show"),];
|
||||
$show_or_not = ['0' => L10n::t("don't show"), '1' => L10n::t("show"),];
|
||||
|
||||
$t = get_markup_template("theme_settings.tpl");
|
||||
$o .= replace_macros($t, [
|
||||
'$submit' => t('Submit'),
|
||||
'$submit' => L10n::t('Submit'),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$title' => t("Theme settings"),
|
||||
'$style' => ['vier_style',t ('Set style'),$style,'',$styles],
|
||||
'$show_pages' => ['vier_show_pages', t('Community Pages'), $show_pages, '', $show_or_not],
|
||||
'$show_profiles' => ['vier_show_profiles', t('Community Profiles'), $show_profiles, '', $show_or_not],
|
||||
'$show_helpers' => ['vier_show_helpers', t('Help or @NewHere ?'), $show_helpers, '', $show_or_not],
|
||||
'$show_services' => ['vier_show_services', t('Connect Services'), $show_services, '', $show_or_not],
|
||||
'$show_friends' => ['vier_show_friends', t('Find Friends'), $show_friends, '', $show_or_not],
|
||||
'$show_lastusers' => ['vier_show_lastusers', t('Last users'), $show_lastusers, '', $show_or_not]
|
||||
'$title' => L10n::t("Theme settings"),
|
||||
'$style' => ['vier_style', L10n::t('Set style'), $style, '', $styles],
|
||||
'$show_pages' => ['vier_show_pages', L10n::t('Community Pages'), $show_pages, '', $show_or_not],
|
||||
'$show_profiles' => ['vier_show_profiles', L10n::t('Community Profiles'), $show_profiles, '', $show_or_not],
|
||||
'$show_helpers' => ['vier_show_helpers', L10n::t('Help or @NewHere ?'), $show_helpers, '', $show_or_not],
|
||||
'$show_services' => ['vier_show_services', L10n::t('Connect Services'), $show_services, '', $show_or_not],
|
||||
'$show_friends' => ['vier_show_friends', L10n::t('Find Friends'), $show_friends, '', $show_or_not],
|
||||
'$show_lastusers' => ['vier_show_lastusers', L10n::t('Last users'), $show_lastusers, '', $show_or_not]
|
||||
]);
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Content\ForumManager;
|
||||
use Friendica\Core\Addon;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
|
|
@ -21,8 +22,8 @@ use Friendica\Model\Profile;
|
|||
|
||||
require_once "mod/proxy.php";
|
||||
|
||||
function vier_init(App $a) {
|
||||
|
||||
function vier_init(App $a)
|
||||
{
|
||||
$a->theme_events_in_profile = false;
|
||||
|
||||
$a->set_template_engine('smarty3');
|
||||
|
|
@ -84,7 +85,7 @@ function cmtBbClose(id) {
|
|||
</script>
|
||||
EOT;
|
||||
|
||||
if ($a->is_mobile || $a->is_tablet){
|
||||
if ($a->is_mobile || $a->is_tablet) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
|
@ -108,7 +109,8 @@ EOT;
|
|||
}
|
||||
}
|
||||
|
||||
function get_vier_config($key, $default = false, $admin = false) {
|
||||
function get_vier_config($key, $default = false, $admin = false)
|
||||
{
|
||||
if (local_user() && !$admin) {
|
||||
$result = PConfig::get(local_user(), "vier", $key);
|
||||
if (!is_null($result)) {
|
||||
|
|
@ -124,7 +126,8 @@ function get_vier_config($key, $default = false, $admin = false) {
|
|||
return $default;
|
||||
}
|
||||
|
||||
function vier_community_info() {
|
||||
function vier_community_info()
|
||||
{
|
||||
$a = get_app();
|
||||
|
||||
$show_pages = get_vier_config("show_pages", 1);
|
||||
|
|
@ -144,12 +147,11 @@ function vier_community_info() {
|
|||
|
||||
$tpl = get_markup_template('ch_directory_item.tpl');
|
||||
if (DBM::is_result($r)) {
|
||||
|
||||
$aside['$comunity_profiles_title'] = t('Community Profiles');
|
||||
$aside['$comunity_profiles_title'] = L10n::t('Community Profiles');
|
||||
$aside['$comunity_profiles_items'] = [];
|
||||
|
||||
foreach ($r as $rr) {
|
||||
$entry = replace_macros($tpl,[
|
||||
$entry = replace_macros($tpl, [
|
||||
'$id' => $rr['id'],
|
||||
//'$profile_link' => Profile::zrl($rr['url']),
|
||||
'$profile_link' => 'follow/?url='.urlencode($rr['url']),
|
||||
|
|
@ -171,16 +173,17 @@ function vier_community_info() {
|
|||
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
|
||||
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
|
||||
0, 9);
|
||||
0,
|
||||
9
|
||||
);
|
||||
|
||||
if (DBM::is_result($r)) {
|
||||
|
||||
$aside['$lastusers_title'] = t('Last users');
|
||||
$aside['$lastusers_title'] = L10n::t('Last users');
|
||||
$aside['$lastusers_items'] = [];
|
||||
|
||||
foreach ($r as $rr) {
|
||||
$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
|
||||
$entry = replace_macros($tpl,[
|
||||
$entry = replace_macros($tpl, [
|
||||
'$id' => $rr['id'],
|
||||
'$profile_link' => $profile_link,
|
||||
'$photo' => $a->remove_baseurl($rr['thumb']),
|
||||
|
|
@ -193,12 +196,12 @@ function vier_community_info() {
|
|||
//right_aside FIND FRIENDS
|
||||
if ($show_friends && local_user()) {
|
||||
$nv = [];
|
||||
$nv['title'] = ["", t('Find Friends'), "", ""];
|
||||
$nv['directory'] = ['directory', t('Local Directory'), "", ""];
|
||||
$nv['global_directory'] = [get_server(), t('Global Directory'), "", ""];
|
||||
$nv['match'] = ['match', t('Similar Interests'), "", ""];
|
||||
$nv['suggest'] = ['suggest', t('Friend Suggestions'), "", ""];
|
||||
$nv['invite'] = ['invite', t('Invite Friends'), "", ""];
|
||||
$nv['title'] = ["", L10n::t('Find Friends'), "", ""];
|
||||
$nv['directory'] = ['directory', L10n::t('Local Directory'), "", ""];
|
||||
$nv['global_directory'] = [get_server(), L10n::t('Global Directory'), "", ""];
|
||||
$nv['match'] = ['match', L10n::t('Similar Interests'), "", ""];
|
||||
$nv['suggest'] = ['suggest', L10n::t('Friend Suggestions'), "", ""];
|
||||
$nv['invite'] = ['invite', L10n::t('Invite Friends'), "", ""];
|
||||
|
||||
$nv['search'] = '<form name="simple_bar" method="get" action="dirfind">
|
||||
<span class="sbox_l"></span>
|
||||
|
|
@ -247,12 +250,12 @@ function vier_community_info() {
|
|||
$page .= replace_macros(
|
||||
$tpl,
|
||||
[
|
||||
'$title' => t('Forums'),
|
||||
'$title' => L10n::t('Forums'),
|
||||
'$forums' => $entries,
|
||||
'$link_desc' => t('External link to forum'),
|
||||
'$link_desc' => L10n::t('External link to forum'),
|
||||
'$total' => $total,
|
||||
'$visible_forums' => $visible_forums,
|
||||
'$showmore' => t('show more')]
|
||||
'$showmore' => L10n::t('show more')]
|
||||
);
|
||||
|
||||
$aside['$page'] = $page;
|
||||
|
|
@ -266,13 +269,14 @@ function vier_community_info() {
|
|||
|
||||
$helperlist = Config::get("vier", "helperlist");
|
||||
|
||||
$helpers = explode(",",$helperlist);
|
||||
$helpers = explode(",", $helperlist);
|
||||
|
||||
if ($helpers) {
|
||||
$query = "";
|
||||
foreach ($helpers AS $index=>$helper) {
|
||||
if ($query != "")
|
||||
foreach ($helpers as $index => $helper) {
|
||||
if ($query != "") {
|
||||
$query .= ",";
|
||||
}
|
||||
|
||||
$query .= "'".dbesc(normalise_link(trim($helper)))."'";
|
||||
}
|
||||
|
|
@ -280,22 +284,22 @@ function vier_community_info() {
|
|||
$r = q("SELECT `url`, `name` FROM `gcontact` WHERE `nurl` IN (%s)", $query);
|
||||
}
|
||||
|
||||
foreach ($r AS $index => $helper)
|
||||
foreach ($r as $index => $helper) {
|
||||
$r[$index]["url"] = Profile::zrl($helper["url"]);
|
||||
}
|
||||
|
||||
$r[] = ["url" => "help/Quick-Start-guide", "name" => t("Quick Start")];
|
||||
$r[] = ["url" => "help/Quick-Start-guide", "name" => L10n::t("Quick Start")];
|
||||
|
||||
$tpl = get_markup_template('ch_helpers.tpl');
|
||||
|
||||
if ($r) {
|
||||
|
||||
$helpers = [];
|
||||
$helpers['title'] = ["", t('Help'), "", ""];
|
||||
$helpers['title'] = ["", L10n::t('Help'), "", ""];
|
||||
|
||||
$aside['$helpers_items'] = [];
|
||||
|
||||
foreach ($r as $rr) {
|
||||
$entry = replace_macros($tpl,[
|
||||
$entry = replace_macros($tpl, [
|
||||
'$url' => $rr['url'],
|
||||
'$title' => $rr['name'],
|
||||
]);
|
||||
|
|
@ -309,7 +313,6 @@ function vier_community_info() {
|
|||
|
||||
// connectable services
|
||||
if ($show_services) {
|
||||
|
||||
/// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
|
||||
$r = [];
|
||||
|
||||
|
|
@ -374,20 +377,19 @@ function vier_community_info() {
|
|||
$r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"];
|
||||
}
|
||||
|
||||
if (function_exists("imap_open") && !Config::get("system","imap_disabled") && !Config::get("system","dfrn_only")) {
|
||||
if (function_exists("imap_open") && !Config::get("system", "imap_disabled") && !Config::get("system", "dfrn_only")) {
|
||||
$r[] = ["photo" => "images/mail.png", "name" => "E-Mail"];
|
||||
}
|
||||
|
||||
$tpl = get_markup_template('ch_connectors.tpl');
|
||||
|
||||
if (DBM::is_result($r)) {
|
||||
|
||||
$con_services = [];
|
||||
$con_services['title'] = ["", t('Connect Services'), "", ""];
|
||||
$con_services['title'] = ["", L10n::t('Connect Services'), "", ""];
|
||||
$aside['$con_services'] = $con_services;
|
||||
|
||||
foreach ($r as $rr) {
|
||||
$entry = replace_macros($tpl,[
|
||||
$entry = replace_macros($tpl, [
|
||||
'$url' => $url,
|
||||
'$photo' => $rr['photo'],
|
||||
'$alt_text' => $rr['name'],
|
||||
|
|
@ -395,7 +397,6 @@ function vier_community_info() {
|
|||
$aside['$connector_items'][] = $entry;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//end connectable services
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue