Merge branch '3.6-rc'

This commit is contained in:
Tobias Diekershoff 2018-03-23 08:00:37 +01:00
commit 39dd3dffe0
733 changed files with 10943 additions and 8237 deletions

View file

@ -49,7 +49,7 @@ msgid "Widgets available"
msgstr ""
#: widgets.php:124
msgid "Plugin Settings"
msgid "Addon Settings"
msgstr ""
#: widget_friendheader.php:40

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Connectar en Friendica";
$a->strings["Generate new key"] = "Generar nova clau";
$a->strings["Widgets key"] = "Ginys clau";
$a->strings["Widgets available"] = "Ginys disponibles";
$a->strings["Plugin Settings"] = "Ajustos de Plugin";
$a->strings["Addon Settings"] = "Ajustos de Addon";
$a->strings["Get added to this list!"] = "S'afegeixen a aquesta llista!";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Připojit na Friendica!";
$a->strings["Generate new key"] = "Generovat nové klíče";
$a->strings["Widgets key"] = "Widgety klíč";
$a->strings["Widgets available"] = "Widgety k dispozici";
$a->strings["Plugin Settings"] = "Nastavení doplňku";
$a->strings["Addon Settings"] = "Nastavení doplňku";
$a->strings["Get added to this list!"] = "Nechte se přidat do tohoto listu!";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "In Friendica verbinden!";
$a->strings["Generate new key"] = "Neuen Schlüssel erstellen";
$a->strings["Widgets key"] = "Widgets Schlüssel";
$a->strings["Widgets available"] = "Verfügbare Widgets";
$a->strings["Plugin Settings"] = "Plugin-Einstellungen";
$a->strings["Addon Settings"] = "Addon-Einstellungen";
$a->strings["Get added to this list!"] = "Werde Mitglied dieser Liste";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Konekti ĉe Friendica!";
$a->strings["Generate new key"] = "Generi novan ĉifroŝlosilon";
$a->strings["Widgets key"] = "Ŝlosilo por fenestraĵoj";
$a->strings["Widgets available"] = "Disponeblaj fenestraĵoj";
$a->strings["Plugin Settings"] = "Kromprogramoagordoj";
$a->strings["Addon Settings"] = "Kromprogramoagordoj";
$a->strings["Get added to this list!"] = "Iĝu membro de ĉi tiu listo!";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "¡Conéctate en Friendica!";
$a->strings["Generate new key"] = "Generar clave nueva";
$a->strings["Widgets key"] = "Clave de aplicaciones";
$a->strings["Widgets available"] = "Aplicaciones disponibles";
$a->strings["Plugin Settings"] = "Configuración de los módulos";
$a->strings["Addon Settings"] = "Configuración de los módulos";
$a->strings["Get added to this list!"] = "¡Añadido a la lista!";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Se connecter sur Friendica!";
$a->strings["Generate new key"] = "Générer une nouvelle clé";
$a->strings["Widgets key"] = "Clé des widgets";
$a->strings["Widgets available"] = "Widgets disponibles";
$a->strings["Plugin Settings"] = "Extensions";
$a->strings["Addon Settings"] = "Extensions";
$a->strings["Get added to this list!"] = "Ajoutez-vous à cette liste!";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Tengist á Friendica!";
$a->strings["Generate new key"] = "Búa til nýjan lykil";
$a->strings["Widgets key"] = "Lykill smáforrits ";
$a->strings["Widgets available"] = "Smáforrit til";
$a->strings["Plugin Settings"] = "Eininga stillingar";
$a->strings["Addon Settings"] = "Eininga stillingar";
$a->strings["Get added to this list!"] = "Láta bæta þér við þennan lista!";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Connettiti su Friendica!";
$a->strings["Generate new key"] = "Genera una nuova chiave";
$a->strings["Widgets key"] = "Chiave Widget";
$a->strings["Widgets available"] = "Widget disponibili";
$a->strings["Plugin Settings"] = "Impostazioni plugin";
$a->strings["Addon Settings"] = "Impostazioni addon";
$a->strings["Get added to this list!"] = "Aggiungiti a questa lista!";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "";
$a->strings["Generate new key"] = "Lag ny nøkkel";
$a->strings["Widgets key"] = "Nøkkel til småprogrammer";
$a->strings["Widgets available"] = "Småprogrammer er tilgjengelige";
$a->strings["Plugin Settings"] = "Tilleggsinnstillinger";
$a->strings["Addon Settings"] = "Tilleggsinnstillinger";
$a->strings["Get added to this list!"] = "";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Połączono z Friendica!";
$a->strings["Generate new key"] = "Stwórz nowy klucz";
$a->strings["Widgets key"] = "";
$a->strings["Widgets available"] = "Widgety są dostępne";
$a->strings["Plugin Settings"] = "Ustawienia wtyczki";
$a->strings["Addon Settings"] = "Ustawienia wtyczki";
$a->strings["Get added to this list!"] = "Zostań dodany do listy!";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Conecte no Friendica!";
$a->strings["Generate new key"] = "Gerar nova chave";
$a->strings["Widgets key"] = "Chave de widgets";
$a->strings["Widgets available"] = "Widgets disponíveis";
$a->strings["Plugin Settings"] = "Configurações do plugin";
$a->strings["Addon Settings"] = "Configurações do addon";
$a->strings["Get added to this list!"] = "";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Подключены к Friendica!";
$a->strings["Generate new key"] = "Сгенерировать новый ключ";
$a->strings["Widgets key"] = "Ключ виджетов";
$a->strings["Widgets available"] = "Виджеты доступны";
$a->strings["Plugin Settings"] = "Настройки плагина";
$a->strings["Addon Settings"] = "Настройки плагина";
$a->strings["Get added to this list!"] = "";

View file

@ -1,3 +1,3 @@
<?php
$a->strings["Plugin Settings"] = "Inst&auml;llningar f&ouml;r insticksprogram";
$a->strings["Addon Settings"] = "Inst&auml;llningar f&ouml;r insticksprogram";

View file

@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "连接在Friendica";
$a->strings["Generate new key"] = "造成新钥匙";
$a->strings["Widgets key"] = "小窗口钥匙";
$a->strings["Widgets available"] = "可用的小窗口";
$a->strings["Plugin Settings"] = "插件设置";
$a->strings["Addon Settings"] = "插件设置";
$a->strings["Get added to this list!"] = "被在这个单子加入!";

View file

@ -1,29 +1,38 @@
<?php
function friendheader_widget_name() {
use Friendica\Core\L10n;
function friendheader_widget_name()
{
return "Shows friends as a bar";
}
function friendheader_widget_help() {
function friendheader_widget_help()
{
return "";
}
function friendheader_widget_args(){
return Array();
function friendheader_widget_args()
{
return [];
}
function friendheader_widget_size(){
return Array('780px','140px');
function friendheader_widget_size()
{
return ['780px','140px'];
}
function friendheader_widget_content(&$a, $conf){
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
function friendheader_widget_content(&$a, $conf)
{
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`uid` = %s AND `profile`.`is-default` = 1 LIMIT 1",
intval($conf['uid'])
intval($conf['uid'])
);
if(!count($r)) return;
if (!count($r)) {
return;
}
$a->profile = $r[0];
$o = "";
@ -37,7 +46,7 @@ function friendheader_widget_content(&$a, $conf){
</style>";
$o .= _abs_url(contact_block());
$o .= "<a href='".$a->get_baseurl().'/profile/'.$a->profile['nickname']."' target=new>". t('Get added to this list!') ."</a>";
$o .= "<a href='".$a->get_baseurl().'/profile/'.$a->profile['nickname']."' target=new>". L10n::t('Get added to this list!') ."</a>";
return $o;
}

View file

@ -1,29 +1,40 @@
<?php
function friends_widget_name() {
use Friendica\Core\L10n;
function friends_widget_name()
{
return "Shows profile contacts";
}
function friends_widget_help() {
function friends_widget_help()
{
return "";
}
function friends_widget_args(){
return Array();
function friends_widget_args()
{
return [];
}
function friends_widget_size(){
return Array('100%','200px');
function friends_widget_size()
{
return ['100%', '200px'];
}
function friends_widget_content(&$a, $conf){
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
function friends_widget_content(&$a, $conf)
{
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`uid` = %s AND `profile`.`is-default` = 1 LIMIT 1",
intval($conf['uid'])
intval($conf['uid'])
);
if(!count($r)) return;
if (!count($r)) {
return;
}
$a->profile = $r[0];
$o = "";
@ -37,6 +48,6 @@ function friends_widget_content(&$a, $conf){
</style>";
$o .= _abs_url(contact_block());
$o .= "<a href='".$a->get_baseurl().'/profile/'.$a->profile['nickname']."'>". t('Connect on Friendica!') ."</a>";
$o .= "<a href='".$a->get_baseurl().'/profile/'.$a->profile['nickname']."'>". L10n::t('Connect on Friendica!') ."</a>";
return $o;
}

View file

@ -1,5 +1,7 @@
<?php
use Friendica\Core\L10n;
function like_widget_name() {
return "Shows likes";
}
@ -56,11 +58,11 @@ function like_widget_content(&$a, $conf){
$t = get_markup_template("widget_like.tpl", "addon/widgets/");
$o .= replace_macros($t, array(
'$like' => $likes,
'$strlike' => sprintf( tt("%d person likes this", "%d people like this", $likes), $likes),
'$strlike' => L10n::tt("%d person likes this", "%d people like this", $likes),
'$dislike' => $dislikes,
'$strdislike'=> sprintf( tt("%d person doesn't like this", "%d people don't like this", $dislikes), $dislikes),
'$strdislike'=> L10n::tt("%d person doesn't like this", "%d people don't like this", $dislikes),
'$baseurl' => $a->get_baseurl(),
));

View file

@ -5,16 +5,18 @@
* Version: 1.0
* Author: Fabio Comuni <http://kirgroup.com/profile/fabrix/>
*/
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
function widgets_install() {
register_hook('plugin_settings', 'addon/widgets/widgets.php', 'widgets_settings');
register_hook('plugin_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
Addon::registerHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
Addon::registerHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
logger("installed widgets");
}
function widgets_uninstall() {
unregister_hook('plugin_settings', 'addon/widgets/widgets.php', 'widgets_settings');
unregister_hook('plugin_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
Addon::unregisterHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
Addon::unregisterHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
}
@ -53,13 +55,13 @@ function widgets_settings(&$a,&$o) {
# $t = file_get_contents( dirname(__file__). "/settings.tpl" );
$t = get_markup_template("settings.tpl", "addon/widgets/");
$o .= replace_macros($t, array(
'$submit' => t('Generate new key'),
$o .= replace_macros($t, [
'$submit' => L10n::t('Generate new key'),
'$baseurl' => $a->get_baseurl(),
'$title' => "Widgets",
'$label' => t('Widgets key'),
'$label' => L10n::t('Widgets key'),
'$key' => $key,
'$widgets_h' => t('Widgets available'),
'$widgets_h' => L10n::t('Widgets available'),
'$widgets' => $widgets,
));
@ -121,7 +123,7 @@ function widgets_content(&$a) {
if (isset($_GET['p']) && local_user()==$conf['uid'] ) {
$o .= "<style>.f9k_widget { float: left;border:1px solid black; }</style>";
$o .= "<h1>Preview Widget</h1>";
$o .= '<a href="'.$a->get_baseurl().'/settings/addon">'. t("Plugin Settings") .'</a>';
$o .= '<a href="'.$a->get_baseurl().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
$o .= "<h4>".call_user_func($a->argv[1].'_widget_name')."</h4>";
$o .= call_user_func($a->argv[1].'_widget_help');
@ -165,15 +167,9 @@ function widgets_content(&$a) {
return $o;
}
}
}
}
echo $o;
killme();
}
?>