MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases 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

32
view/theme/vier/config.php
View file

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

71
view/theme/vier/theme.php
View file

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