use post-content table instead of item-content

This reverts commit 0f5ba218f6.

.woodpecker/.code_standards_check.yml

@@ -56,10 +56,6 @@ steps:
       - /tmp/drone-cache:/tmp/cache
     when:
       event: pull_request
-  phpstan:
-    image: friendicaci/php8.3:php8.3.3
-    commands:
-      - ./bin/composer.phar run phpstan;
   check:
     image: friendicaci/php-cs
     commands:

.woodpecker/.continuous-deployment-allinone.yml

@@ -1,115 +0,0 @@
-# This prevents executing this pipeline at other servers than ci.friendi.ca
-labels:
-  location: friendica
-  type: releaser
-
-skip_clone: true
-
-steps:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git config --global user.email "no-reply@friendi.ca"
-      - git config --global user.name "Friendica"
-      - git config --global --add safe.directory $CI_WORKSPACE
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  clone_friendica_addon:
-    image: alpine/git
-    commands:
-      - git config --global user.email "no-reply@friendi.ca"
-      - git config --global user.name "Friendica"
-      - git clone $CI_REPO_CLONE_URL addon
-      - cd addon/
-      - git checkout $CI_COMMIT_BRANCH
-      - git fetch origin $CI_COMMIT_REF
-      - git merge $CI_COMMIT_SHA
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  restore_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  composer_install:
-    image: friendicaci/php8.2:php8.2.28
-    commands:
-      - export COMPOSER_HOME=.composer
-      - composer validate
-      - composer install --no-dev --optimize-autoloader
-    volumes:
-      - /etc/hosts:/etc/hosts
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  create_artifacts:
-    image: debian
-    commands:
-      - apt-get update
-      - apt-get install bzip2
-      - mkdir ./build
-      - export VERSION="$(cat VERSION)"
-      - export RELEASE="friendica-all-in-one-$VERSION"
-      - export ARTIFACT="$RELEASE.tar.gz"
-      - tar
-        --exclude='.tx'
-        --exclude='.git'
-        --exclude='.editorconfig'
-        --exclude='.gitattributes'
-        --exclude='.gitignore'
-        --exclude='.woodpecker'
-        --exclude='**/*/messages.po'
-        -cvzf ./build/$ARTIFACT /
-      - cd ./build
-      - sha256sum "$ARTIFACT" > "$ARTIFACT.sum256"
-      - chmod 664 ./*
-      - ls -lh
-      - cat "$ARTIFACT.sum256"
-      - sha256sum "$ARTIFACT"
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  sign_artifacts:
-    image: plugins/gpgsign
-    settings:
-      key:
-        from_secret: gpg_key
-      passphrase:
-        from_secret: gpg_password
-      files:
-        - build/*
-      exclude:
-        - build/*.sum256
-      detach_sign: true
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  publish_artifacts:
-    image: alpine
-    commands:
-      - cp -fr build/* /tmp/friendica_files/
-    volumes:
-      - files:/tmp/friendica_files
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push

.woodpecker/.continuous-deployment.yml

@@ -48,7 +48,7 @@ steps:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php8.2:php8.2.28
+    image: friendicaci/php8.2:php8.2.16
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

.woodpecker/.phpunit.yml

@@ -5,13 +5,11 @@ matrix:
     - PHP_MAJOR_VERSION: 8.0
       PHP_VERSION: 8.0.30
     - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.31
+      PHP_VERSION: 8.1.27
     - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.28
+      PHP_VERSION: 8.2.16
     - PHP_MAJOR_VERSION: 8.3
-      PHP_VERSION: 8.3.17
-    - PHP_MAJOR_VERSION: 8.4
-      PHP_VERSION: 8.4.5
+      PHP_VERSION: 8.3.3
 
 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
 labels:

.woodpecker/.releaser.yml

@@ -45,7 +45,7 @@ steps:
       repo: friendica/friendica-addons
       event: tag
   composer_install:
-    image: friendicaci/php8.2:php8.2.28
+    image: friendicaci/php8.2:php8.2.16
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

README.md

@@ -24,6 +24,6 @@ See the [documentation](https://github.com/friendica/friendica/blob/stable/doc/A
 ## Translation
 
 Addons can be translated like any other part of Friendica.
-Translation for addons is done at [the Transifex Friendica page](https://app.transifex.com/Friendica/friendica/dashboard/).
+Translation for addons is done at [the Transifex Friendica page](https://www.transifex.com/Friendica/friendica/dashboard/).
 
 Read more about the workflow in the [Friendica translation documentation](https://github.com/friendica/friendica/blob/stable/doc/translations.md#addon).

advancedcontentfilter/advancedcontentfilter.php

@@ -36,6 +36,7 @@
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
@@ -61,7 +62,7 @@ function advancedcontentfilter_install()
 	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	DBStructure::performUpdate();
 
-	DI::logger()->notice('installed advancedcontentfilter');
+	Logger::notice('installed advancedcontentfilter');
 }
 
 /*
@@ -120,22 +121,21 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}
 
-	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
-	if (!$uid) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
 	$vars = advancedcontentfilter_get_filter_fields($hook_data['item']);
 
-	$rules = DI::cache()->get('rules_' . $uid);
+	$rules = DI::cache()->get('rules_' . DI::userSession()->getLocalUserId());
 	if (!isset($rules)) {
 		$rules = DBA::toArray(DBA::select(
 			'advancedcontentfilter_rules',
 			['name', 'expression', 'serialized'],
-			['uid' => $uid, 'active' => true]
+			['uid' => DI::userSession()->getLocalUserId(), 'active' => true]
 		));
 
-		DI::cache()->set('rules_' . $uid, $rules);
+		DI::cache()->set('rules_' . DI::userSession()->getLocalUserId(), $rules);
 	}
 
 	if ($rules) {

advancedcontentfilter/lang/bg/messages.po

@@ -1,161 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Language-Team: Bulgarian (https://app.transifex.com/Friendica/teams/12172/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr ""
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr ""
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr ""
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr ""
-
-#: advancedcontentfilter.php:228
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr ""
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr ""
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr ""
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr ""
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr ""
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr ""
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr ""
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr ""
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr ""
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr ""
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr ""
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr ""
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr ""
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr ""
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr ""
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr ""
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr ""

advancedcontentfilter/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

advancedcontentfilter/lang/eo/messages.po

@@ -1,161 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Language-Team: Esperanto (https://app.transifex.com/Friendica/teams/12172/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr ""
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr ""
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr ""
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr ""
-
-#: advancedcontentfilter.php:228
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr ""
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr ""
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr ""
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr ""
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr ""
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr ""
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr ""
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr ""
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr ""
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr ""
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr ""
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr ""
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr ""
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr ""
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr ""
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr ""
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr ""

advancedcontentfilter/lang/eo/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

advancedcontentfilter/lang/et/messages.po

@@ -1,161 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Language-Team: Estonian (https://app.transifex.com/Friendica/teams/12172/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr ""
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr ""
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr ""
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr ""
-
-#: advancedcontentfilter.php:228
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr ""
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr ""
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr ""
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr ""
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr ""
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr ""
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr ""
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr ""
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr ""
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr ""
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr ""
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr ""
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr ""
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr ""
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr ""
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr ""
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr ""

advancedcontentfilter/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

advancedcontentfilter/lang/gd/messages.po

@@ -1,161 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Language-Team: Gaelic, Scottish (https://app.transifex.com/Friendica/teams/12172/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr ""
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr ""
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr ""
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr ""
-
-#: advancedcontentfilter.php:228
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr ""
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr ""
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr ""
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr ""
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr ""
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr ""
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr ""
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr ""
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr ""
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr ""
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr ""
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr ""
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr ""
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr ""
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr ""
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr ""
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr ""

advancedcontentfilter/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

advancedcontentfilter/lang/is/messages.po

@@ -1,161 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Language-Team: Icelandic (https://app.transifex.com/Friendica/teams/12172/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr ""
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr ""
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr ""
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr ""
-
-#: advancedcontentfilter.php:228
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr ""
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr ""
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr ""
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr ""
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr ""
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr ""
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr ""
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr ""
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr ""
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr ""
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr ""
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr ""
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr ""
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr ""
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr ""
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr ""
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr ""

advancedcontentfilter/lang/is/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}

advancedcontentfilter/lang/pl/messages.po

@@ -6,7 +6,7 @@
 # Translators:
 # Waldemar Stoczkowski, 2018
 # Joe Doe, 2021
-# Bartosz Kozień, 2025
+# Piotr Strębski <strebski@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
@@ -15,8 +15,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Bartosz Kozień, 2025\n"
-"Language-Team: Polish (https://app.transifex.com/Friendica/teams/12172/pl/)\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -126,7 +126,7 @@ msgstr "Anuluj"
 
 #: advancedcontentfilter.php:295
 msgid "This addon requires this node having at least one post"
-msgstr "Ten dodatek wymaga, aby ta instancja miała co najmniej jeden wpis"
+msgstr "Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis"
 
 #: advancedcontentfilter.php:325 advancedcontentfilter.php:336
 #: advancedcontentfilter.php:347 advancedcontentfilter.php:383

advancedcontentfilter/lang/pl/strings.php

@@ -27,7 +27,7 @@ $a->strings['Add new rule'] = 'Dodaj nową regułę';
 $a->strings['Rule Name'] = 'Nazwa reguły';
 $a->strings['Rule Expression'] = 'Wyrażanie reguły';
 $a->strings['Cancel'] = 'Anuluj';
-$a->strings['This addon requires this node having at least one post'] = 'Ten dodatek wymaga, aby ta instancja miała co najmniej jeden wpis';
+$a->strings['This addon requires this node having at least one post'] = 'Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis';
 $a->strings['You must be logged in to use this method'] = 'Musisz być zalogowany, aby skorzystać z tej metody';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Nieprawidłowy token zabezpieczający formularz, odśwież stronę.';
 $a->strings['The rule name and expression are required.'] = 'Nazwa reguły i wyrażenie są wymagane.';

audon/audon.php

@@ -6,7 +6,6 @@
  * Author: Stephen Mahood <https://friends.mayfirst.org/profile/marxistvegan>
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Matthias Ebers <https://loma.ml/profile/feb>
- * Status: Unsupported
  */
 
 use Friendica\Core\Hook;

birdavatar/birdavatar.php

@@ -7,6 +7,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -26,7 +27,7 @@ function birdavatar_install()
 	Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
 
-	DI::logger()->info('registered birdavatar');
+	Logger::info('registered birdavatar');
 }
 
 /**

blackout/blackout.php

@@ -45,6 +45,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -76,7 +77,7 @@ function blackout_redirect ($b)
 	}
 
 	if (( $date1 <= $now ) && ( $now <= $date2 )) {
-		DI::logger()->notice('redirecting user to blackout page');
+		Logger::notice('redirecting user to blackout page');
 		System::externalRedirect($myurl);
 	}
 }

blackout/lang/bg/messages.po

@@ -1,66 +0,0 @@
-# ADDON blackout
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blackout addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr ""
-
-#: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr ""
-
-#: blackout.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: blackout.php:103
-msgid "Redirect URL"
-msgstr ""
-
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr ""
-
-#: blackout.php:104
-msgid "Begin of the Blackout"
-msgstr ""
-
-#: blackout.php:104
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr ""
-
-#: blackout.php:105
-msgid "End of the Blackout"
-msgstr ""
-
-#: blackout.php:107
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr ""

blackout/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

blackout/lang/eo/messages.po

@@ -1,66 +0,0 @@
-# ADDON blackout
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blackout addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr ""
-
-#: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr ""
-
-#: blackout.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: blackout.php:103
-msgid "Redirect URL"
-msgstr ""
-
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr ""
-
-#: blackout.php:104
-msgid "Begin of the Blackout"
-msgstr ""
-
-#: blackout.php:104
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr ""
-
-#: blackout.php:105
-msgid "End of the Blackout"
-msgstr ""
-
-#: blackout.php:107
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr ""

blackout/lang/eo/strings.php

@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Sendi";

blackout/lang/et/messages.po

@@ -1,66 +0,0 @@
-# ADDON blackout
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blackout addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr ""
-
-#: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr ""
-
-#: blackout.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: blackout.php:103
-msgid "Redirect URL"
-msgstr ""
-
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr ""
-
-#: blackout.php:104
-msgid "Begin of the Blackout"
-msgstr ""
-
-#: blackout.php:104
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr ""
-
-#: blackout.php:105
-msgid "End of the Blackout"
-msgstr ""
-
-#: blackout.php:107
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr ""

blackout/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

blackout/lang/gd/messages.po

@@ -1,66 +0,0 @@
-# ADDON blackout
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blackout addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr ""
-
-#: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr ""
-
-#: blackout.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: blackout.php:103
-msgid "Redirect URL"
-msgstr ""
-
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr ""
-
-#: blackout.php:104
-msgid "Begin of the Blackout"
-msgstr ""
-
-#: blackout.php:104
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr ""
-
-#: blackout.php:105
-msgid "End of the Blackout"
-msgstr ""
-
-#: blackout.php:107
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr ""

blackout/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

blockbot/blockbot.php

@@ -11,6 +11,7 @@
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\ForbiddenException;
@@ -69,7 +70,7 @@ function blockbot_init_1()
 	}
 
 	if (empty($parts)) {
-		DI::logger()->debug('Known frontend found - accept', $logdata);
+		Logger::debug('Known frontend found - accept', $logdata);
 		if ($isCrawler) {
 			blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
 		}
@@ -79,66 +80,66 @@ function blockbot_init_1()
 	blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
 
 	if (blockbot_is_crawler($parts)) {
-		DI::logger()->debug('Crawler found - reject', $logdata);
+		Logger::debug('Crawler found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_searchbot($parts)) {
-		DI::logger()->debug('Search bot found - reject', $logdata);
+		Logger::debug('Search bot found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_unwanted($parts)) {
-		DI::logger()->debug('Uncategorized unwanted agent found - reject', $logdata);
+		Logger::debug('Uncategorized unwanted agent found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_security_checker($parts)) {
 		if (!DI::config()->get('blockbot', 'security_checker')) {
-			DI::logger()->debug('Security checker found - reject', $logdata);
+			Logger::debug('Security checker found - reject', $logdata);
 			blockbot_reject();
 		}
-		DI::logger()->debug('Security checker found - accept', $logdata);
+		Logger::debug('Security checker found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_social_media($parts)) {
-		DI::logger()->debug('Social media service found - accept', $logdata);
+		Logger::debug('Social media service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_client($parts)) {
-		DI::logger()->debug('Fediverse client found - accept', $logdata);
+		Logger::debug('Fediverse client found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_feed_reader($parts)) {
-		DI::logger()->debug('Feed reader found - accept', $logdata);
+		Logger::debug('Feed reader found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_tool($parts)) {
-		DI::logger()->debug('Fediverse tool found - accept', $logdata);
+		Logger::debug('Fediverse tool found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_service_agent($parts)) {
-		DI::logger()->debug('Service agent found - accept', $logdata);
+		Logger::debug('Service agent found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_monitor($parts)) {
-		DI::logger()->debug('Monitoring service found - accept', $logdata);
+		Logger::debug('Monitoring service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_validator($parts)) {
-		DI::logger()->debug('Validation service found - accept', $logdata);
+		Logger::debug('Validation service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_good_tool($parts)) {
-		DI::logger()->debug('Uncategorized helpful service found - accept', $logdata);
+		Logger::debug('Uncategorized helpful service found - accept', $logdata);
 		return;
 	}
 
@@ -146,10 +147,10 @@ function blockbot_init_1()
 	if (blockbot_is_http_library($parts)) {
 		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
 		if (!DI::config()->get('blockbot', 'http_libraries')) {
-			DI::logger()->debug('HTTP Library found - reject', $logdata);
+			Logger::debug('HTTP Library found - reject', $logdata);
 			blockbot_reject();
 		}
-		DI::logger()->debug('HTTP Library found - accept', $logdata);
+		Logger::debug('HTTP Library found - accept', $logdata);
 		return;
 	}
 
@@ -160,12 +161,12 @@ function blockbot_init_1()
 
 	if (!$isCrawler) {
 		blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']);
-		DI::logger()->debug('Non-bot user agent detected', $logdata);
+		Logger::debug('Non-bot user agent detected', $logdata);
 		return;
 	}
 
 	blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
-	DI::logger()->notice('Possible bot found - reject', $logdata);
+	Logger::notice('Possible bot found - reject', $logdata);
 	blockbot_reject();
 }
 
@@ -208,7 +209,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 		blockbot_save('activitypub-inbox-agents', $agent);
 	}
 
-	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER, false))) {
+	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER))) {
 		blockbot_save('activitypub-signature-agents', $agent);
 	}
 }
@@ -216,7 +217,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 function blockbot_check_login_attempt(string $url, array $logdata)
 {
 	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
-		DI::logger()->debug('Login attempt detected - reject', $logdata);
+		Logger::debug('Login attempt detected - reject', $logdata);
 		blockbot_reject();
 	}
 }
@@ -442,7 +443,7 @@ function blockbot_is_monitor(array $parts): bool
 }
 
 /**
- * Services in the centralized and decentralized social media environment
+ * Services in the centralized and decentralized social media environment 
  *
  * @param array $parts
  * @return boolean

bluesky/bluesky.php

@@ -30,6 +30,7 @@ use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
@@ -105,16 +106,16 @@ function bluesky_item_by_link(array &$hookData)
 		if (empty($did)) {
 			return;
 		}
-
-		DI::logger()->debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
-
+	
+		Logger::debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
+	
 		$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
 	} else {
 		$uri = $hookData['uri'];
 	}
 
 	$uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0);
-	DI::logger()->debug('Got post', ['uri' => $uri]);
+	Logger::debug('Got post', ['uri' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {
@@ -137,8 +138,8 @@ function bluesky_follow(array &$hook_data)
 		return;
 	}
 
-	DI::logger()->debug('Check if contact is bluesky', ['data' => $hook_data]);
-	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'nurl' => Strings::normaliseLink($hook_data['url']), 'uid' => [0, $hook_data['uid']]]);
+	Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
+	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'url' => $hook_data['url'], 'uid' => [0, $hook_data['uid']]]);
 	if (empty($contact)) {
 		return;
 	}
@@ -158,7 +159,7 @@ function bluesky_follow(array &$hook_data)
 	$activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
 		$hook_data['contact'] = $contact;
-		DI::logger()->debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
+		Logger::debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
 	}
 }
 
@@ -212,7 +213,7 @@ function bluesky_block(array &$hook_data)
 		if ($ucid) {
 			Contact::remove($ucid);
 		}
-		DI::logger()->debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
+		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
 	}
 }
 
@@ -420,11 +421,11 @@ function bluesky_cron()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			DI::logger()->notice('poll interval not reached');
+			Logger::notice('poll interval not reached');
 			return;
 		}
 	}
-	DI::logger()->notice('cron_start');
+	Logger::notice('cron_start');
 
 	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
@@ -436,19 +437,19 @@ function bluesky_cron()
 	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
 		if (empty(DI::atProtocol()->getUserDid($pconfig['uid']))) {
-			DI::logger()->debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
+			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
 			continue;
 		}
 
 		if ($abandon_days != 0) {
 			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-				DI::logger()->notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
+				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
 				continue;
 			}
 		}
 
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
-		DI::logger()->debug('Refresh the token', ['uid' => $pconfig['uid']]);
+		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		DI::atProtocol()->getUserToken($pconfig['uid']);
 
 		$last_sync = DI::pConfig()->get($pconfig['uid'], 'bluesky', 'last_contact_sync');
@@ -462,32 +463,32 @@ function bluesky_cron()
 			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid']);
 		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
-			DI::logger()->debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
+			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {
 				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed);
 			}
 		}
-		DI::logger()->debug('Polling done for user', ['uid' => $pconfig['uid']]);
+		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
 	}
 
-	DI::logger()->notice('Polling done for all users');
+	Logger::notice('Polling done for all users');
 
 	DI::keyValue()->set('bluesky_last_poll', time());
 
 	$last_clean = DI::keyValue()->get('bluesky_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
-		DI::logger()->notice('Start contact cleanup');
+		Logger::notice('Start contact cleanup');
 		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::BLUESKY, 0, Contact::NOTHING]);
 		while ($contact = DBA::fetch($contacts)) {
 			Worker::add(Worker::PRIORITY_LOW, 'MergeContact', $contact['pid'], $contact['id'], 0);
 		}
 		DBA::close($contacts);
 		DI::keyValue()->set('bluesky_last_clean', time());
-		DI::logger()->notice('Contact cleanup done');
+		Logger::notice('Contact cleanup done');
 	}
 
-	DI::logger()->notice('cron_end');
+	Logger::notice('cron_end');
 }
 
 function bluesky_hook_fork(array &$b)
@@ -507,7 +508,7 @@ function bluesky_hook_fork(array &$b)
 	if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
 		// Don't post if it isn't a reply to a bluesky post
 		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
-			DI::logger()->notice('No bluesky parent found', ['item' => $post['id']]);
+			Logger::notice('No bluesky parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
@@ -553,17 +554,13 @@ function bluesky_send(array &$b)
 		return;
 	}
 
-	if (Item::isGroupPost($b['uri-id'])) {
-		return;
-	}
-
 	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		DI::logger()->debug('Got comment', ['item' => $b]);
+		Logger::debug('Got comment', ['item' => $b]);
 
 		if ($b['deleted']) {
 			$uri = DI::atpProcessor()->getUriClass($b['uri']);
 			if (empty($uri)) {
-				DI::logger()->debug('Not a bluesky post', ['uri' => $b['uri']]);
+				Logger::debug('Not a bluesky post', ['uri' => $b['uri']]);
 				return;
 			}
 			bluesky_delete_post($b['uri'], $b['uid']);
@@ -574,12 +571,12 @@ function bluesky_send(array &$b)
 		$parent = DI::atpProcessor()->getUriClass($b['thr-parent']);
 
 		if (empty($root) || empty($parent)) {
-			DI::logger()->debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
+			Logger::debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
 			return;
 		}
 
 		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			DI::logger()->debug('Posting comment', ['root' => $root, 'parent' => $parent]);
+			Logger::debug('Posting comment', ['root' => $root, 'parent' => $parent]);
 			bluesky_create_post($b, $root, $parent);
 			return;
 		} elseif (in_array($b['verb'], [Activity::LIKE, Activity::ANNOUNCE])) {
@@ -638,10 +635,10 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 	if (empty($activity->uri)) {
 		return;
 	}
-	DI::logger()->debug('Activity done', ['return' => $activity]);
+	Logger::debug('Activity done', ['return' => $activity]);
 	$uri = DI::atpProcessor()->getUri($activity);
 	Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-	DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
+	Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
 }
 
 function bluesky_create_post(array $item, stdClass $root = null, stdClass $parent = null)
@@ -676,8 +673,6 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 		}
 	}
 
-	$item['body'] = bluesky_set_mentions($item['body']);
-
 	$urls = bluesky_get_urls($item['body']);
 	$item['body'] = $urls['body'];
 
@@ -727,53 +722,26 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			}
 			return;
 		}
-		DI::logger()->debug('Posting done', ['return' => $parent]);
+		Logger::debug('Posting done', ['return' => $parent]);
 		if (empty($root)) {
 			$root = $parent;
 		}
 		if (($key == 0) && ($item['gravity'] != Item::GRAVITY_PARENT)) {
 			$uri = DI::atpProcessor()->getUri($parent);
 			Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-			DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
+			Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
 		}
 	}
 }
 
-function bluesky_set_mentions(string $body): string
-{
-	// Remove all url based mention links
-	$body = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $body);
-
-	if (!preg_match_all("/[@!]\[url\=(did:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
-		return $body;
-	}
-
-	foreach ($matches as $match) {
-		$contact = Contact::selectFirst(['addr'], ['nurl' => $match[1]]);
-		if (!empty($contact['addr'])) {
-			$body = str_replace($match[0], '@[url=' . $match[1] . ']' . $contact['addr'] . '[/url]', $body);
-		} else {
-			$body = str_replace($match[0], '@' . $match[2], $body);
-		}
-	}
-
-	return $body;
-}
-
 function bluesky_get_urls(string $body): array
 {
+	// Remove all hashtag and mention links
+	$body = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $body);
+
 	$body = BBCode::expandVideoLinks($body);
 	$urls = [];
 
-	// Search for Mentions
-	if (preg_match_all("/[@!]\[url\=(did:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
-		foreach ($matches as $match) {
-			$text = '@' . $match[2];
-			$urls[strpos($body, $match[0])] = ['mention' => $match[1], 'text' => $text, 'hash' => $text];
-			$body = str_replace($match[0], $text, $body);
-		}
-	}
-
 	// Search for hash tags
 	if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $match) {
@@ -858,9 +826,6 @@ function bluesky_get_facets(string $body, array $urls): array
 		} elseif (!empty($url['url'])) {
 			$feature->uri = $url['url'];
 			$feature->$type = 'app.bsky.richtext.facet#link';
-		} elseif (!empty($url['mention'])) {
-			$feature->did = $url['mention'];
-			$feature->$type = 'app.bsky.richtext.facet#mention';
 		} else {
 			continue;
 		}
@@ -934,20 +899,20 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	$new_size   = strlen($content);
 
 	if (($size != 0) && ($new_size == 0) && ($retrial == 0)) {
-		DI::logger()->warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		Logger::warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		$content = Photo::getImageForPhoto($photo);
 	} else {
-		DI::logger()->info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	}
 
 	$data = DI::atProtocol()->post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . DI::atProtocol()->getUserToken($uid)]]);
 	if (empty($data) || empty($data->blob)) {
-		DI::logger()->info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		Logger::info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		return null;
 	}
 
 	Item::incrementOutbound(Protocol::BLUESKY);
-	DI::logger()->debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+	Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	return $data->blob;
 }
 
@@ -955,11 +920,11 @@ function bluesky_delete_post(string $uri, int $uid)
 {
 	$parts = DI::atpProcessor()->getUriParts($uri);
 	if (empty($parts)) {
-		DI::logger()->debug('No uri delected', ['uri' => $uri]);
+		Logger::debug('No uri delected', ['uri' => $uri]);
 		return;
 	}
 	DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.deleteRecord', $parts);
-	DI::logger()->debug('Deleted', ['parts' => $parts]);
+	Logger::debug('Deleted', ['parts' => $parts]);
 }
 
 function bluesky_fetch_timeline(int $uid)
@@ -1041,10 +1006,6 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 		return;
 	}
 
-	if (Post::exists(['uid' => $item['uid'], 'thr-parent' => $item['thr-parent'], 'verb' => $item['verb'], 'contact-id' => $item['contact-id']])) {
-		return;
-	}
-
 	$item['guid']         = Item::guidFromUri($item['uri'], $contact['alias']);
 	$item['owner-name']   = $item['author-name'];
 	$item['owner-link']   = $item['author-link'];
@@ -1065,10 +1026,10 @@ function bluesky_fetch_notifications(int $uid)
 	foreach ($data->notifications as $notification) {
 		$uri = DI::atpProcessor()->getUri($notification);
 		if (Post::exists(['uri' => $uri, 'uid' => $uid]) || Post::exists(['extid' => $uri, 'uid' => $uid])) {
-			DI::logger()->debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+			Logger::debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 			continue;
 		}
-		DI::logger()->debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 		switch ($notification->reason) {
 			case 'like':
 				$item = DI::atpProcessor()->getHeaderFromPost($notification, $uri, $uid, Conversation::PARCEL_CONNECTOR);
@@ -1078,9 +1039,9 @@ function bluesky_fetch_notifications(int $uid)
 				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
-					DI::logger()->debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
@@ -1092,37 +1053,37 @@ function bluesky_fetch_notifications(int $uid)
 				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
-					DI::logger()->debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
 			case 'follow':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, $uid);
-				DI::logger()->debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
+				Logger::debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
 				break;
 
 			case 'mention':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_TO, $contact['id'], 0);
-				DI::logger()->debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'reply':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_COMMENT, $contact['id'], 0);
-				DI::logger()->debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'quote':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_PUSHED, $contact['id'], 0);
-				DI::logger()->debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			default:
-				DI::logger()->notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
+				Logger::notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
 				break;
 		}
 	}
@@ -1153,16 +1114,16 @@ function bluesky_fetch_feed(int $uid, string $feed)
 		$languages = $entry->post->record->langs ?? [];
 
 		if (!Relay::isWantedLanguage($entry->post->record->text, 0, $contact['id'] ?? 0, $languages)) {
-			DI::logger()->debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
+			Logger::debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
 			continue;
 		}
 		$causer = DI::atpActor()->getContactByDID($entry->post->author->did, $uid, 0);
 		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], Conversation::PARCEL_CONNECTOR);
 		if (!empty($uri_id)) {
 			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
-			DI::logger()->debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
 		} else {
-			DI::logger()->notice('Post not found', ['entry' => $entry]);
+			Logger::notice('Post not found', ['entry' => $entry]);
 		}
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, DI::atpProcessor()->getUri($entry->post), $uid);
@@ -1178,14 +1139,8 @@ function bluesky_get_feeds(int $uid): array
 		return [];
 	}
 	foreach ($preferences->preferences as $preference) {
-		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPrefV2') {
-			$pinned = [];
-			foreach ($preference->items as $item) {
-				if (($item->type == 'feed') && $item->pinned) {
-					$pinned[] = $item->value;
-				}
-			}
-			return $pinned;
+		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
+			return $preference->pinned ?? [];
 		}
 	}
 	return [];

bluesky/bluesky_feed.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\DI;
+use Friendica\Core\Logger;
 
 function bluesky_feed_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_feed_run($argv, $argc)
 		return;
 	}
 
-	DI::logger()->debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
+	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
 	bluesky_fetch_feed($argv[1], $argv[2]);
-	DI::logger()->debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
+	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
 }

bluesky/bluesky_notifications.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\DI;
+use Friendica\Core\Logger;
 
 function bluesky_notifications_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_notifications_run($argv, $argc)
 		return;
 	}
 
-	DI::logger()->notice('importing notifications - start', ['user' => $argv[1]]);
+	Logger::notice('importing notifications - start', ['user' => $argv[1]]);
 	bluesky_fetch_notifications($argv[1]);
-	DI::logger()->notice('importing notifications - done', ['user' => $argv[1]]);
+	Logger::notice('importing notifications - done', ['user' => $argv[1]]);
 }

bluesky/bluesky_timeline.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\DI;
+use Friendica\Core\Logger;
 
 function bluesky_timeline_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_timeline_run($argv, $argc)
 		return;
 	}
 
-	DI::logger()->notice('importing timeline - start', ['user' => $argv[1]]);
+	Logger::notice('importing timeline - start', ['user' => $argv[1]]);
 	bluesky_fetch_timeline($argv[1]);
-	DI::logger()->notice('importing timeline - done', ['user' => $argv[1]]);
+	Logger::notice('importing timeline - done', ['user' => $argv[1]]);
 }

buglink/lang/bg/messages.po

@@ -1,23 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: buglink.php:20
-msgid "Report Bug"
-msgstr ""

buglink/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

buglink/lang/eo/messages.po

@@ -1,23 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: buglink.php:20
-msgid "Report Bug"
-msgstr ""

buglink/lang/eo/strings.php

@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Report Bug"] = "Skribi cimraporton";

buglink/lang/et/messages.po

@@ -1,23 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: buglink.php:20
-msgid "Report Bug"
-msgstr ""

buglink/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

catavatar/catavatar.php

@@ -7,6 +7,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -26,7 +27,7 @@ function catavatar_install()
 	Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
 
-	DI::logger()->notice('registered catavatar');
+	Logger::notice('registered catavatar');
 }
 
 /**

catavatar/lang/bg/messages.po

@@ -1,54 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Language-Team: Bulgarian (https://app.transifex.com/Friendica/teams/12172/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr ""
-
-#: catavatar.php:56
-msgid "Use Cat as Avatar"
-msgstr ""
-
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr ""
-
-#: catavatar.php:58
-msgid "Reset to email Cat"
-msgstr ""
-
-#: catavatar.php:77
-msgid "The cat hadn't found itself."
-msgstr ""
-
-#: catavatar.php:86
-msgid "There was an error, the cat ran away."
-msgstr ""
-
-#: catavatar.php:92
-msgid "Profile Photos"
-msgstr ""
-
-#: catavatar.php:102
-msgid "Meow!"
-msgstr ""

catavatar/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

catavatar/lang/eo/messages.po

@@ -1,54 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Language-Team: Esperanto (https://app.transifex.com/Friendica/teams/12172/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr ""
-
-#: catavatar.php:56
-msgid "Use Cat as Avatar"
-msgstr ""
-
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr ""
-
-#: catavatar.php:58
-msgid "Reset to email Cat"
-msgstr ""
-
-#: catavatar.php:77
-msgid "The cat hadn't found itself."
-msgstr ""
-
-#: catavatar.php:86
-msgid "There was an error, the cat ran away."
-msgstr ""
-
-#: catavatar.php:92
-msgid "Profile Photos"
-msgstr ""
-
-#: catavatar.php:102
-msgid "Meow!"
-msgstr ""

catavatar/lang/eo/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

catavatar/lang/et/messages.po

@@ -1,54 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Language-Team: Estonian (https://app.transifex.com/Friendica/teams/12172/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr ""
-
-#: catavatar.php:56
-msgid "Use Cat as Avatar"
-msgstr ""
-
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr ""
-
-#: catavatar.php:58
-msgid "Reset to email Cat"
-msgstr ""
-
-#: catavatar.php:77
-msgid "The cat hadn't found itself."
-msgstr ""
-
-#: catavatar.php:86
-msgid "There was an error, the cat ran away."
-msgstr ""
-
-#: catavatar.php:92
-msgid "Profile Photos"
-msgstr ""
-
-#: catavatar.php:102
-msgid "Meow!"
-msgstr ""

catavatar/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

catavatar/lang/gd/messages.po

@@ -1,54 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Language-Team: Gaelic, Scottish (https://app.transifex.com/Friendica/teams/12172/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr ""
-
-#: catavatar.php:56
-msgid "Use Cat as Avatar"
-msgstr ""
-
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr ""
-
-#: catavatar.php:58
-msgid "Reset to email Cat"
-msgstr ""
-
-#: catavatar.php:77
-msgid "The cat hadn't found itself."
-msgstr ""
-
-#: catavatar.php:86
-msgid "There was an error, the cat ran away."
-msgstr ""
-
-#: catavatar.php:92
-msgid "Profile Photos"
-msgstr ""
-
-#: catavatar.php:102
-msgid "Meow!"
-msgstr ""

catavatar/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

cld/cld.php

@@ -7,6 +7,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\DI;
 
 function cld_install()
@@ -17,17 +18,17 @@ function cld_install()
 function cld_detect_languages(array &$data)
 {
 	if (!in_array('cld2', get_loaded_extensions())) {
-		DI::logger()->warning('CLD2 is not installed.');
+		Logger::warning('CLD2 is not installed.');
 		return;
 	}
 
 	if (!class_exists('CLD2Detector')) {
-		DI::logger()->warning('CLD2Detector class does not exist.');
+		Logger::warning('CLD2Detector class does not exist.');
 		return;
 	}
 
 	if (!class_exists('CLD2Encoding')) {
-		DI::logger()->warning('CLD2Encoding class does not exist.');
+		Logger::warning('CLD2Encoding class does not exist.');
 		return;
 	}
 
@@ -52,7 +53,7 @@ function cld_detect_languages(array &$data)
 	}
 
 	if (!$result['is_reliable']) {
-		DI::logger()->debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		Logger::debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 		if (($original == $detected) && ($data['detected'][$original] < $result['language_probability'] / 100)) {
 			$data['detected'][$original] = $result['language_probability'] / 100;
 		}
@@ -62,12 +63,12 @@ function cld_detect_languages(array &$data)
 	$available = array_keys(DI::l10n()->getLanguageCodes());
 
 	if (!in_array($detected, $available)) {
-		DI::logger()->debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		Logger::debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 		return;
 	}
 
 	if ($original != $detected) {
-		DI::logger()->debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		Logger::debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 	}
 
 	$length = count($data['detected']);

cookienotice/lang/bg/messages.po

@@ -1,53 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Language-Team: Bulgarian (https://app.transifex.com/Friendica/teams/12172/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr ""
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr ""
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr ""
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr ""
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""

cookienotice/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

cookienotice/lang/eo/messages.po

@@ -1,53 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Language-Team: Esperanto (https://app.transifex.com/Friendica/teams/12172/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr ""
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr ""
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr ""
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr ""
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""

cookienotice/lang/eo/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

cookienotice/lang/et/messages.po

@@ -1,53 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Language-Team: Estonian (https://app.transifex.com/Friendica/teams/12172/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr ""
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr ""
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr ""
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr ""
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""

cookienotice/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

cookienotice/lang/fr/messages.po

@@ -6,7 +6,6 @@
 # Translators:
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2019
 # bob lebonche <lebonche@tutanota.com>, 2021
-# cracrayol, 2025
 # 
 #, fuzzy
 msgid ""
@@ -15,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Last-Translator: cracrayol, 2025\n"
-"Language-Team: French (https://app.transifex.com/Friendica/teams/12172/fr/)\n"
+"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,7 +55,7 @@ msgstr "Bouton OK Texte "
 
 #: cookienotice.php:50
 msgid "Save Settings"
-msgstr "Sauvegarder les paramètres "
+msgstr "Sauvegarder les réglages"
 
 #: cookienotice.php:107
 msgid ""
@@ -64,5 +63,5 @@ msgid ""
 "accept the usage of these cookies by continue browsing this website."
 msgstr ""
 "Ce site utilise des cookies pour reconnaître les visiteurs et les "
-"utilisateurs connectés. Vous acceptez l'utilisation de ces cookies en "
+"utilisateurs connectés. Vous accepter l'utilisation de ces cookies en "
 "continuant sur ce site."

cookienotice/lang/fr/strings.php

@@ -10,5 +10,5 @@ $a->strings['OK'] = 'Ok';
 $a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Configurez votre politique d\'utilisation des cookies.</b> Cela devrait juste être un avertissement, signalant l\'utilisation de cookies par le site. Cela sera affiché tant que l\'utilisateur n\'aura pas confirmé en cliquant sur le bouton OK.';
 $a->strings['Cookie Usage Notice'] = 'Politique d\'utilisation des cookies.';
 $a->strings['OK Button Text'] = 'Bouton OK Texte ';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres ';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Ce site utilise des cookies pour reconnaître les visiteurs et les utilisateurs connectés. Vous acceptez l\'utilisation de ces cookies en continuant sur ce site.';
+$a->strings['Save Settings'] = 'Sauvegarder les réglages';
+$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Ce site utilise des cookies pour reconnaître les visiteurs et les utilisateurs connectés. Vous accepter l\'utilisation de ces cookies en continuant sur ce site.';

cookienotice/lang/gd/messages.po

@@ -1,53 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Language-Team: Gaelic, Scottish (https://app.transifex.com/Friendica/teams/12172/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr ""
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr ""
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr ""
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr ""
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""

cookienotice/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

cookienotice/lang/is/messages.po

@@ -1,53 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Language-Team: Icelandic (https://app.transifex.com/Friendica/teams/12172/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr ""
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr ""
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr ""
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr ""
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""

cookienotice/lang/is/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}

cookienotice/lang/ru/messages.po

@@ -1,53 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Language-Team: Russian (https://app.transifex.com/Friendica/teams/12172/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr ""
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr ""
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr ""
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr ""
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""

cookienotice/lang/ru/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}

curweather/lang/bg/messages.po

@@ -1,123 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr ""
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr ""
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr ""
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr ""
-
-#: curweather.php:139
-msgid "Wind"
-msgstr ""
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr ""
-
-#: curweather.php:141
-msgid "Data by"
-msgstr ""
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr ""
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr ""
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr ""
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr ""
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr ""
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr ""
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr ""
-
-#: curweather.php:190
-msgid "Units"
-msgstr ""
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr ""
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr ""
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr ""
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr ""
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr ""
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr ""
-
-#: curweather.php:233
-msgid "no cache"
-msgstr ""
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr ""

curweather/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

curweather/lang/eo/messages.po

@@ -1,123 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr ""
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr ""
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr ""
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr ""
-
-#: curweather.php:139
-msgid "Wind"
-msgstr ""
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr ""
-
-#: curweather.php:141
-msgid "Data by"
-msgstr ""
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr ""
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr ""
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr ""
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr ""
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr ""
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr ""
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr ""
-
-#: curweather.php:190
-msgid "Units"
-msgstr ""
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr ""
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr ""
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr ""
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr ""
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr ""
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr ""
-
-#: curweather.php:233
-msgid "no cache"
-msgstr ""
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr ""

curweather/lang/eo/strings.php

@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Sendi";

curweather/lang/et/messages.po

@@ -1,123 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr ""
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr ""
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr ""
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr ""
-
-#: curweather.php:139
-msgid "Wind"
-msgstr ""
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr ""
-
-#: curweather.php:141
-msgid "Data by"
-msgstr ""
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr ""
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr ""
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr ""
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr ""
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr ""
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr ""
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr ""
-
-#: curweather.php:190
-msgid "Units"
-msgstr ""
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr ""
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr ""
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr ""
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr ""
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr ""
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr ""
-
-#: curweather.php:233
-msgid "no cache"
-msgstr ""
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr ""

curweather/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

curweather/lang/gd/messages.po

@@ -1,123 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr ""
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr ""
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr ""
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr ""
-
-#: curweather.php:139
-msgid "Wind"
-msgstr ""
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr ""
-
-#: curweather.php:141
-msgid "Data by"
-msgstr ""
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr ""
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr ""
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr ""
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr ""
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr ""
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr ""
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr ""
-
-#: curweather.php:190
-msgid "Units"
-msgstr ""
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr ""
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr ""
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr ""
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr ""
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr ""
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr ""
-
-#: curweather.php:233
-msgid "no cache"
-msgstr ""
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr ""

curweather/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

curweather/lang/is/messages.po

@@ -1,123 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr ""
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr ""
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr ""
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr ""
-
-#: curweather.php:139
-msgid "Wind"
-msgstr ""
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr ""
-
-#: curweather.php:141
-msgid "Data by"
-msgstr ""
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr ""
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr ""
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr ""
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr ""
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr ""
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr ""
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr ""
-
-#: curweather.php:190
-msgid "Units"
-msgstr ""
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr ""
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr ""
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr ""
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr ""
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr ""
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr ""
-
-#: curweather.php:233
-msgid "no cache"
-msgstr ""
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr ""

curweather/lang/is/strings.php

@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}
+<?php
+
+$a->strings["Submit"] = "Senda inn";

diaspora/Diaspora_Connection.php

@@ -33,6 +33,7 @@ class Diaspora_Connection {
 		}
 
 		$this->cookiejar = tempnam(System::getTempPath(), 'cookies');
+		return $this;
 	}
 
 	public function __destruct() {

diaspora/diaspora.php

@@ -11,6 +11,7 @@ require_once 'addon/diaspora/Diaspora_Connection.php';
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
@@ -185,7 +186,7 @@ function diaspora_send(array &$b)
 {
 	$hostname = DI::baseUrl()->getHost();
 
-	DI::logger()->notice('diaspora_send: invoked');
+	Logger::notice('diaspora_send: invoked');
 
 	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
@@ -195,10 +196,6 @@ function diaspora_send(array &$b)
 		return;
 	}
 
-	if (Item::isGroupPost($b['uri-id'])) {
-		return;
-	}
-
 	if ($b['parent'] != $b['id']) {
 		return;
 	}
@@ -213,14 +210,14 @@ function diaspora_send(array &$b)
 		return;
 	}
 
-	DI::logger()->info('diaspora_send: prepare posting');
+	Logger::info('diaspora_send: prepare posting');
 
 	$handle = DI::pConfig()->get($b['uid'], 'diaspora', 'handle');
 	$password = DI::pConfig()->get($b['uid'], 'diaspora', 'password');
 	$aspect = DI::pConfig()->get($b['uid'], 'diaspora', 'aspect');
 
 	if ($handle && $password) {
-		DI::logger()->info('diaspora_send: all values seem to be okay');
+		Logger::info('diaspora_send: all values seem to be okay');
 
 		$title = $b['title'];
 		$body = $b['body'];
@@ -251,20 +248,20 @@ function diaspora_send(array &$b)
 		require_once "addon/diaspora/diasphp.php";
 
 		try {
-			DI::logger()->info('diaspora_send: prepare');
+			Logger::info('diaspora_send: prepare');
 			$conn = new Diaspora_Connection($handle, $password);
-			DI::logger()->info('diaspora_send: try to log in ' . $handle);
+			Logger::info('diaspora_send: try to log in ' . $handle);
 			$conn->logIn();
-			DI::logger()->info('diaspora_send: try to send ' . $body);
+			Logger::info('diaspora_send: try to send ' . $body);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
 
-			DI::logger()->notice('diaspora_send: success');
+			Logger::notice('diaspora_send: success');
 		} catch (Exception $e) {
-			DI::logger()->notice("diaspora_send: Error submitting the post: " . $e->getMessage());
+			Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			DI::logger()->info('diaspora_send: requeueing ' . $b['uid']);
+			Logger::info('diaspora_send: requeueing ' . $b['uid']);
 
 			Worker::defer();
 		}

diaspora/lang/bg/messages.po

@@ -1,101 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:48-0400\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: diaspora.php:43
-msgid "Post to Diaspora"
-msgstr ""
-
-#: diaspora.php:66
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr ""
-
-#: diaspora.php:67
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr ""
-
-#: diaspora.php:68
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr ""
-
-#: diaspora.php:78
-msgid "All aspects"
-msgstr ""
-
-#: diaspora.php:79
-msgid "Public"
-msgstr ""
-
-#: diaspora.php:85
-msgid "Post to aspect:"
-msgstr ""
-
-#: diaspora.php:86
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr ""
-
-#: diaspora.php:89
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr ""
-
-#: diaspora.php:96
-msgid "Information"
-msgstr ""
-
-#: diaspora.php:97
-msgid "Error"
-msgstr ""
-
-#: diaspora.php:103
-msgid "Enable Diaspora Post Addon"
-msgstr ""
-
-#: diaspora.php:104
-msgid "Diaspora handle"
-msgstr ""
-
-#: diaspora.php:105
-msgid "Diaspora password"
-msgstr ""
-
-#: diaspora.php:105
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr ""
-
-#: diaspora.php:107
-msgid "Post to Diaspora by default"
-msgstr ""
-
-#: diaspora.php:112
-msgid "Diaspora Export"
-msgstr ""

diaspora/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

diaspora/lang/eo/messages.po

@@ -1,101 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:48-0400\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: diaspora.php:43
-msgid "Post to Diaspora"
-msgstr ""
-
-#: diaspora.php:66
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr ""
-
-#: diaspora.php:67
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr ""
-
-#: diaspora.php:68
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr ""
-
-#: diaspora.php:78
-msgid "All aspects"
-msgstr ""
-
-#: diaspora.php:79
-msgid "Public"
-msgstr ""
-
-#: diaspora.php:85
-msgid "Post to aspect:"
-msgstr ""
-
-#: diaspora.php:86
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr ""
-
-#: diaspora.php:89
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr ""
-
-#: diaspora.php:96
-msgid "Information"
-msgstr ""
-
-#: diaspora.php:97
-msgid "Error"
-msgstr ""
-
-#: diaspora.php:103
-msgid "Enable Diaspora Post Addon"
-msgstr ""
-
-#: diaspora.php:104
-msgid "Diaspora handle"
-msgstr ""
-
-#: diaspora.php:105
-msgid "Diaspora password"
-msgstr ""
-
-#: diaspora.php:105
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr ""
-
-#: diaspora.php:107
-msgid "Post to Diaspora by default"
-msgstr ""
-
-#: diaspora.php:112
-msgid "Diaspora Export"
-msgstr ""

diaspora/lang/eo/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

diaspora/lang/et/messages.po

@@ -1,101 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:48-0400\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: diaspora.php:43
-msgid "Post to Diaspora"
-msgstr ""
-
-#: diaspora.php:66
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr ""
-
-#: diaspora.php:67
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr ""
-
-#: diaspora.php:68
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr ""
-
-#: diaspora.php:78
-msgid "All aspects"
-msgstr ""
-
-#: diaspora.php:79
-msgid "Public"
-msgstr ""
-
-#: diaspora.php:85
-msgid "Post to aspect:"
-msgstr ""
-
-#: diaspora.php:86
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr ""
-
-#: diaspora.php:89
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr ""
-
-#: diaspora.php:96
-msgid "Information"
-msgstr ""
-
-#: diaspora.php:97
-msgid "Error"
-msgstr ""
-
-#: diaspora.php:103
-msgid "Enable Diaspora Post Addon"
-msgstr ""
-
-#: diaspora.php:104
-msgid "Diaspora handle"
-msgstr ""
-
-#: diaspora.php:105
-msgid "Diaspora password"
-msgstr ""
-
-#: diaspora.php:105
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr ""
-
-#: diaspora.php:107
-msgid "Post to Diaspora by default"
-msgstr ""
-
-#: diaspora.php:112
-msgid "Diaspora Export"
-msgstr ""

diaspora/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

diaspora/lang/gd/messages.po

@@ -1,101 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:48-0400\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: diaspora.php:43
-msgid "Post to Diaspora"
-msgstr ""
-
-#: diaspora.php:66
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr ""
-
-#: diaspora.php:67
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr ""
-
-#: diaspora.php:68
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr ""
-
-#: diaspora.php:78
-msgid "All aspects"
-msgstr ""
-
-#: diaspora.php:79
-msgid "Public"
-msgstr ""
-
-#: diaspora.php:85
-msgid "Post to aspect:"
-msgstr ""
-
-#: diaspora.php:86
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr ""
-
-#: diaspora.php:89
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr ""
-
-#: diaspora.php:96
-msgid "Information"
-msgstr ""
-
-#: diaspora.php:97
-msgid "Error"
-msgstr ""
-
-#: diaspora.php:103
-msgid "Enable Diaspora Post Addon"
-msgstr ""
-
-#: diaspora.php:104
-msgid "Diaspora handle"
-msgstr ""
-
-#: diaspora.php:105
-msgid "Diaspora password"
-msgstr ""
-
-#: diaspora.php:105
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr ""
-
-#: diaspora.php:107
-msgid "Post to Diaspora by default"
-msgstr ""
-
-#: diaspora.php:112
-msgid "Diaspora Export"
-msgstr ""

diaspora/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

diaspora/lang/pl/messages.po

@@ -4,101 +4,100 @@
 # 
 # 
 # Translators:
-# Bartosz Kozień, 2025
-# Piotr Strebski <strebski@gmail.com>, 2022
+# Piotr Strębski <strebski@gmail.com>, 2022
 # Waldemar Stoczkowski, 2018,2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:48-0400\n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
 "PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: Bartosz Kozień, 2025\n"
-"Language-Team: Polish (http://app.transifex.com/Friendica/friendica/language/pl/)\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: diaspora.php:43
+#: diaspora.php:44
 msgid "Post to Diaspora"
 msgstr "Napisz do Diaspory"
 
-#: diaspora.php:66
+#: diaspora.php:67
 #, php-format
 msgid ""
 "Please remember: You can always be reached from Diaspora with your Friendica"
 " handle <strong>%s</strong>. "
 msgstr "Pamiętaj: Zawsze można do Ciebie dotrzeć z Diaspory za pomocą uchwytu Friendica <strong>%s</strong>. "
 
-#: diaspora.php:67
+#: diaspora.php:68
 msgid ""
 "This connector is only meant if you still want to use your old Diaspora "
 "account for some time. "
 msgstr "Ten łącznik jest przeznaczony do tego, gdy nadal chcesz korzystać ze starego konta Diaspora przez jakiś czas."
 
-#: diaspora.php:68
+#: diaspora.php:69
 #, php-format
 msgid ""
 "However, it is preferred that you tell your Diaspora contacts the new handle"
 " <strong>%s</strong> instead."
 msgstr "Jednak zaleca się, aby zamiast tego poinformować swoją Diasporę o kontakt z nowym uchwytem <strong>%s</strong>."
 
-#: diaspora.php:78
+#: diaspora.php:79
 msgid "All aspects"
 msgstr "Wszystkie aspekty"
 
-#: diaspora.php:79
+#: diaspora.php:80
 msgid "Public"
 msgstr "Publiczny"
 
-#: diaspora.php:85
+#: diaspora.php:86
 msgid "Post to aspect:"
 msgstr "Napisz do aspektu:"
 
-#: diaspora.php:86
+#: diaspora.php:87
 #, php-format
 msgid "Connected with your Diaspora account <strong>%s</strong>"
 msgstr "Połączony ze swoim kontem Diaspora <strong>%s</strong>"
 
-#: diaspora.php:89
+#: diaspora.php:90
 msgid ""
 "Can't login to your Diaspora account. Please check handle (in the format "
 "user@domain.tld) and password."
 msgstr "Nie można zalogować się na Twoje konto w Diasporze. Sprawdź uchwyt (w formacie użytkownik@domena.tld) i hasło."
 
-#: diaspora.php:96
+#: diaspora.php:97
 msgid "Information"
 msgstr "Informacja"
 
-#: diaspora.php:97
+#: diaspora.php:98
 msgid "Error"
 msgstr "Błąd"
 
-#: diaspora.php:103
+#: diaspora.php:104
 msgid "Enable Diaspora Post Addon"
 msgstr "Włącz dodatek Diaspora"
 
-#: diaspora.php:104
+#: diaspora.php:105
 msgid "Diaspora handle"
 msgstr "Uchwyt Diaspory"
 
-#: diaspora.php:105
+#: diaspora.php:106
 msgid "Diaspora password"
 msgstr "Hasło Diaspora"
 
-#: diaspora.php:105
+#: diaspora.php:106
 msgid ""
 "Privacy notice: Your Diaspora password will be stored unencrypted to "
 "authenticate you with your Diaspora pod. This means your Friendica node "
 "administrator can have access to it."
-msgstr "Informacja o prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika w instancji Diaspora. Oznacza to, że administrator instancji Friendica może mieć do niego dostęp."
+msgstr "Informacja o ochronie prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika za pomocą Diaspora. Oznacza to, że administrator węzła Friendica może mieć do niego dostęp."
 
-#: diaspora.php:107
+#: diaspora.php:108
 msgid "Post to Diaspora by default"
 msgstr "Wyślij domyślnie do Diaspory"
 
-#: diaspora.php:112
+#: diaspora.php:113
 msgid "Diaspora Export"
 msgstr "Eksportuj do Diaspory"

diaspora/lang/pl/strings.php

@@ -19,6 +19,6 @@ $a->strings['Error'] = 'Błąd';
 $a->strings['Enable Diaspora Post Addon'] = 'Włącz dodatek Diaspora';
 $a->strings['Diaspora handle'] = 'Uchwyt Diaspory';
 $a->strings['Diaspora password'] = 'Hasło Diaspora';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Informacja o prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika w instancji Diaspora. Oznacza to, że administrator instancji Friendica może mieć do niego dostęp.';
+$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Informacja o ochronie prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika za pomocą Diaspora. Oznacza to, że administrator węzła Friendica może mieć do niego dostęp.';
 $a->strings['Post to Diaspora by default'] = 'Wyślij domyślnie do Diaspory';
 $a->strings['Diaspora Export'] = 'Eksportuj do Diaspory';

discourse/discourse.php

@@ -10,6 +10,7 @@
 
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
@@ -78,13 +79,13 @@ function discourse_email_getmessage(&$message)
 	// We do assume that all Discourse servers are running with SSL
 	if (preg_match('=topic/(.*\d)/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
 		discourse_fetch_post_from_api($message, $matches[2], $matches[3])) {
-		DI::logger()->info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
+		Logger::info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
 		return;
 	}
 
 	if (preg_match('=topic/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
 		discourse_fetch_topic_from_api($message, 'https://' . $matches[2], $matches[1], 1)) {
-		DI::logger()->info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
+		Logger::info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
 		return;
 	}
 
@@ -94,16 +95,16 @@ function discourse_email_getmessage(&$message)
 	}
 
 	if (empty($message['item']['plink']) || !preg_match('=(http.*)/t/.*/(.*\d)/(.*\d)=', $message['item']['plink'], $matches)) {
-		DI::logger()->info('This is no Discourse post');
+		Logger::info('This is no Discourse post');
 		return;
 	}
 
 	if (discourse_fetch_topic_from_api($message, $matches[1], $matches[2], $matches[3])) {
-		DI::logger()->info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
+		Logger::info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
 		return;
 	}
 
-	DI::logger()->info('Fallback mode', ['plink' => $message['item']['plink']]);
+	Logger::info('Fallback mode', ['plink' => $message['item']['plink']]);
 	// Search in the HTML part for the discourse entry and the author profile
 	if (!empty($message['html'])) {
 		$message = discourse_get_html($message);
@@ -120,7 +121,7 @@ function discourse_fetch_post($host, $topic, $pid)
 	$url = $host . '/t/' . $topic . '/' . $pid . '.json';
 	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
-		DI::logger()->info('No success', ['url' => $url]);
+		Logger::info('No success', ['url' => $url]);
 		return false;
 	}
 
@@ -132,11 +133,11 @@ function discourse_fetch_post($host, $topic, $pid)
 			/// @todo Possibly fetch missing posts here
 			continue;
 		}
-		DI::logger()->info('Got post data from topic', $post);
+		Logger::info('Got post data from topic', $post);
 		return $post;
 	}
 
-	DI::logger()->info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
+	Logger::info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
 	return false;
 }
 
@@ -168,7 +169,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 
 	$message = discourse_process_post($message, $data, $hostaddr);
 
-	DI::logger()->info('Got API data', $message);
+	Logger::info('Got API data', $message);
 	return true;
 }
 
@@ -201,7 +202,7 @@ function discourse_get_user($post, $hostaddr)
 	$contact['url'] = $hostaddr . '/u/' . $contact['nick'];
 	$contact['nurl'] = Strings::normaliseLink($contact['url']);
 	$contact['baseurl'] = $hostaddr;
-	DI::logger()->info('Contact', $contact);
+	Logger::info('Contact', $contact);
 	$contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact);
         if (!empty($contact['id'])) {
 		$avatar = $contact['photo'];
@@ -267,11 +268,11 @@ function discourse_get_html($message)
 	$div = $doc2->importNode($result->item(0), true);
 	$doc2->appendChild($div);
 	$message['html'] = $doc2->saveHTML();
-	DI::logger()->info('Found html body', ['html' => $message['html']]);
+	Logger::info('Found html body', ['html' => $message['html']]);
 
 	$profile = discourse_get_profile($xpath);
 	if (!empty($profile['url'])) {
-		DI::logger()->info('Found profile', $profile);
+		Logger::info('Found profile', $profile);
 		$message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, false, $profile);
 		$message['item']['author-link'] = $profile['url'];
 		$message['item']['author-name'] = $profile['name'];
@@ -287,21 +288,21 @@ function discourse_get_text($message)
 	$text = str_replace("\r", '', $text);
 	$pos = strpos($text, "\n---\n");
 	if ($pos == 0) {
-		DI::logger()->info('No separator found', ['text' => $text]);
+		Logger::info('No separator found', ['text' => $text]);
 		return $message;
 	}
 
 	$message['text'] = trim(substr($text, 0, $pos));
 
-	DI::logger()->info('Found text body', ['text' => $message['text']]);
+	Logger::info('Found text body', ['text' => $message['text']]);
 
 	$message['text'] = Markdown::toBBCode($message['text']);
 
 	$text = substr($text, $pos);
-	DI::logger()->info('Found footer', ['text' => $text]);
+	Logger::info('Found footer', ['text' => $text]);
 	if (preg_match('=\((http.*/t/.*/.*\d/.*\d)\)=', $text, $link)) {
 		$message['item']['plink'] = $link[1];
-		DI::logger()->info('Found plink', ['plink' => $message['item']['plink']]);
+		Logger::info('Found plink', ['plink' => $message['item']['plink']]);
 	}
 	return $message;
 }

dwpost/dwpost.php

@@ -10,6 +10,7 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -125,10 +126,6 @@ function dwpost_send(array &$b)
 		return;
 	}
 
-	if (Item::isGroupPost($b['uri-id'])) {
-		return;
-	}
-
 	if ($b['parent'] != $b['id']) {
 		return;
 	}
@@ -188,12 +185,12 @@ function dwpost_send(array &$b)
 
 EOT;
 
-		DI::logger()->debug('dwpost: data: ' . $xml);
+		Logger::debug('dwpost: data: ' . $xml);
 
 		if ($dw_blog !== 'test') {
 			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		DI::logger()->info('posted to dreamwidth: ' . ($x) ? $x : '');
+		Logger::info('posted to dreamwidth: ' . ($x) ? $x : '');
 	}
 }

dwpost/lang/bg/messages.po

@@ -1,43 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: dwpost.php:43
-msgid "Post to Dreamwidth"
-msgstr ""
-
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr ""
-
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr ""
-
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr ""
-
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr ""
-
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr ""

dwpost/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

dwpost/lang/eo/messages.po

@@ -1,43 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: dwpost.php:43
-msgid "Post to Dreamwidth"
-msgstr ""
-
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr ""
-
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr ""
-
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr ""
-
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr ""
-
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr ""

dwpost/lang/eo/strings.php

@@ -1,7 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Post to Dreamwidth"] = "Afiŝi al Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Agordoj por Afiŝoj al Dreamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "Ŝalti la Dreamwidth Kromprogramon";
+$a->strings["dreamwidth username"] = "Dreamwidth salutnomo";
+$a->strings["dreamwidth password"] = "Dreamwidth pasvorto";
+$a->strings["Post to dreamwidth by default"] = "Defaŭlte afiŝi al Dreamwidth";
+$a->strings["Submit"] = "Sendi";

dwpost/lang/et/messages.po

@@ -1,44 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-# Rain Hawk, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: Rain Hawk, 2020\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: dwpost.php:43
-msgid "Post to Dreamwidth"
-msgstr ""
-
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr ""
-
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr ""
-
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr ""
-
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr ""
-
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr ""

dwpost/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

dwpost/lang/gd/messages.po

@@ -1,43 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: dwpost.php:43
-msgid "Post to Dreamwidth"
-msgstr ""
-
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr ""
-
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr ""
-
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr ""
-
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr ""
-
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr ""

dwpost/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

dwpost/lang/is/messages.po

@@ -1,43 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: dwpost.php:43
-msgid "Post to Dreamwidth"
-msgstr ""
-
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr ""
-
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr ""
-
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr ""
-
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr ""
-
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr ""

dwpost/lang/is/strings.php

@@ -1,7 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}
+<?php
+
+$a->strings["Post to Dreamwidth"] = "";
+$a->strings["Dreamwidth Post Settings"] = "";
+$a->strings["Enable dreamwidth Post Addon"] = "";
+$a->strings["dreamwidth username"] = "";
+$a->strings["dreamwidth password"] = "";
+$a->strings["Post to dreamwidth by default"] = "";
+$a->strings["Submit"] = "Senda inn";

forumdirectory/lang/bg/messages.po

@@ -1,47 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr ""
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr ""
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr ""
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr ""
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr ""
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr ""

forumdirectory/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

forumdirectory/lang/eo/messages.po

@@ -1,47 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr ""
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr ""
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr ""
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr ""
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr ""
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr ""

forumdirectory/lang/eo/strings.php

@@ -1,7 +1,16 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Public access denied."] = "Publika atingo ne permesita.";
+$a->strings["Global Directory"] = "Tutmonda Katalogo";
+$a->strings["Find on this site"] = "Trovi en ĉi retejo";
+$a->strings["Finding: "] = "Trovata:";
+$a->strings["Site Directory"] = "Reteja Katalogo";
+$a->strings["Find"] = "Trovi";
+$a->strings["Age: "] = "Aĝo:";
+$a->strings["Gender: "] = "Sekso:";
+$a->strings["Location:"] = "Loko:";
+$a->strings["Gender:"] = "Sekso:";
+$a->strings["Status:"] = "Stato:";
+$a->strings["Homepage:"] = "Hejmpaĝo:";
+$a->strings["About:"] = "Pri:";
+$a->strings["No entries (some entries may be hidden)."] = "Neniom da afiŝoj (kelkaj afiŝoj eble ne estas videbla).";

forumdirectory/lang/et/messages.po

@@ -1,47 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr ""
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr ""
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr ""
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr ""
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr ""
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr ""

forumdirectory/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

forumdirectory/lang/gd/messages.po

@@ -1,47 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr ""
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr ""
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr ""
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr ""
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr ""
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr ""

forumdirectory/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

forumdirectory/lang/is/messages.po

@@ -1,47 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr ""
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr ""
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr ""
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr ""
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr ""
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr ""

forumdirectory/lang/is/strings.php

@@ -1,7 +1,16 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}
+<?php
+
+$a->strings["Public access denied."] = "Alemennings aðgangur ekki veittur.";
+$a->strings["Global Directory"] = "Heims tengiliða skrá";
+$a->strings["Find on this site"] = "Leita á þessum vef";
+$a->strings["Finding: "] = "Niðurstöður:";
+$a->strings["Site Directory"] = "Vef tengiliða skrá";
+$a->strings["Find"] = "Finna";
+$a->strings["Age: "] = "Aldur:";
+$a->strings["Gender: "] = "Kyn:";
+$a->strings["Location:"] = "Staðsetning:";
+$a->strings["Gender:"] = "Kyn:";
+$a->strings["Status:"] = "Staða:";
+$a->strings["Homepage:"] = "Heimasíða:";
+$a->strings["About:"] = "Um:";
+$a->strings["No entries (some entries may be hidden)."] = "Engar færslur (sumar geta verið faldar).";

fromapp/fromapp.php

@@ -8,6 +8,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -16,7 +17,7 @@ function fromapp_install()
 	Hook::register('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
 	Hook::register('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
 	Hook::register('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-	DI::logger()->notice("installed fromapp");
+	Logger::notice("installed fromapp");
 }
 
 function fromapp_settings_post($post)

fromapp/lang/bg/messages.po

@@ -1,34 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr ""
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr ""
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr ""

fromapp/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

fromapp/lang/eo/messages.po

@@ -1,34 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr ""
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr ""
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr ""

fromapp/lang/eo/strings.php

@@ -1,7 +1,7 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Fromapp settings updated."] = "";
+$a->strings["FromApp Settings"] = "";
+$a->strings["The application name you would like to show your posts originating from."] = "";
+$a->strings["Use this application name even if another application was used."] = "";
+$a->strings["Submit"] = "Sendi";

fromapp/lang/et/messages.po

@@ -1,34 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr ""
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr ""
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr ""

fromapp/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

fromapp/lang/gd/messages.po

@@ -1,34 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr ""
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr ""
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr ""

fromapp/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

fromapp/lang/is/messages.po

@@ -1,34 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr ""
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr ""
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr ""

fromapp/lang/is/strings.php

@@ -1,7 +1,7 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}
+<?php
+
+$a->strings["Fromapp settings updated."] = "";
+$a->strings["FromApp Settings"] = "";
+$a->strings["The application name you would like to show your posts originating from."] = "";
+$a->strings["Use this application name even if another application was used."] = "";
+$a->strings["Submit"] = "Senda inn";

geocoordinates/geocoordinates.php

@@ -7,6 +7,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -50,25 +51,25 @@ function geocoordinates_resolve_item(array &$item)
 	$s = DI::httpClient()->fetch('https://api.opencagedata.com/geocode/v1/json?q=' . $coords[0] . ',' . $coords[1] . '&key=' . $key . '&language=' . $language);
 
 	if (!$s) {
-		DI::logger()->info('API could not be queried');
+		Logger::info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s);
 
 	if ($data->status->code != '200') {
-		DI::logger()->info('API returned error ' . $data->status->code . ' ' . $data->status->message);
+		Logger::info('API returned error ' . $data->status->code . ' ' . $data->status->message);
 		return;
 	}
 
 	if (($data->total_results == 0) || (count($data->results) == 0)) {
-		DI::logger()->info('No results found for coordinates ' . $item['coord']);
+		Logger::info('No results found for coordinates ' . $item['coord']);
 		return;
 	}
 
 	$item['location'] = $data->results[0]->formatted;
 
-	DI::logger()->info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
+	Logger::info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
 
 	if ($item['location'] != '') {
 		DI::cache()->set('geocoordinates:' . $language.':' . $coords[0] . '-' . $coords[1], $item['location']);

geonames/geonames.php

@@ -7,6 +7,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -44,7 +45,7 @@ function geonames_post_hook(array &$item)
 	 *      - The profile owner must have allowed our addon
 	 */
 
-	 DI::logger()->notice('geonames invoked');
+	Logger::notice('geonames invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {   /* non-zero if this is a logged in user of this system */
 		return;

geonames/lang/bg/messages.po

@@ -1,33 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr ""
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr ""
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr ""

geonames/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

geonames/lang/ca/messages.po

@@ -1,34 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-# Rafael Garau, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: Rafael Garau, 2018\n"
-"Language-Team: Catalan (http://app.transifex.com/Friendica/friendica/language/ca/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr ""
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr "Activa els Ajustos de Geonoms"
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr "Ajustos de Geonoms"

geonames/lang/ca/strings.php

@@ -1,9 +1,6 @@
-<?php
-
-if(! function_exists("string_plural_select_ca")) {
-function string_plural_select_ca($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Geonames Addon'] = 'Activa els Ajustos de Geonoms';
-$a->strings['Geonames Settings'] = 'Ajustos de Geonoms';
+<?php
+
+$a->strings["Geonames settings updated."] = "Actualitzada la configuració de Geonames.";
+$a->strings["Geonames Settings"] = "Configuració de Geonames";
+$a->strings["Enable Geonames Addon"] = "Habilitar Addon de Geonames";
+$a->strings["Submit"] = "Enviar";

geonames/lang/eo/messages.po

@@ -1,33 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr ""
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr ""
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr ""

geonames/lang/eo/strings.php

@@ -1,7 +1,6 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Geonames settings updated."] = "Ĝidatigis la Geonames agordojn.";
+$a->strings["Geonames Settings"] = "Geonames Agordoj";
+$a->strings["Enable Geonames Addon"] = "Ŝalti la Geonames Kromprogramon";
+$a->strings["Submit"] = "Sendi";

geonames/lang/et/messages.po

@@ -1,33 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr ""
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr ""
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr ""

geonames/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

geonames/lang/gd/messages.po

@@ -1,33 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr ""
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr ""
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr ""

geonames/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

gnot/gnot.php

@@ -9,6 +9,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Notification;
@@ -19,7 +20,7 @@ function gnot_install()
 	Hook::register('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
 	Hook::register('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
-	DI::logger()->notice("installed gnot");
+	Logger::notice("installed gnot");
 }
 
 /**

gnot/lang/bg/messages.po

@@ -1,38 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr ""
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr ""
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr ""
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr ""

gnot/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

gnot/lang/eo/messages.po

@@ -1,38 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr ""
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr ""
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr ""
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr ""

gnot/lang/eo/strings.php

@@ -1,7 +1,8 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Gnot settings updated."] = "Ĝisdatigis Gnot agordojn.";
+$a->strings["Gnot Settings"] = "Agordoj por Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permesas la ĉenadon de retpoŝtaj atentigoj pri komentoj ĉe Gmail kan anonimigado de la temlinio.";
+$a->strings["Enable this addon?"] = "Ŝalti tiun kromprogramon?";
+$a->strings["Submit"] = "Sendi";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Atentigo] Komento pri konversacio #%d";

gnot/lang/et/messages.po

@@ -1,39 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-# Rain Hawk, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: Rain Hawk, 2020\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr ""
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr ""
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr ""
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr ""

gnot/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

gnot/lang/gd/messages.po

@@ -1,38 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr ""
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr ""
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr ""
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr ""

gnot/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

gnot/lang/is/messages.po

@@ -1,38 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr ""
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr ""
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr ""
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr ""

gnot/lang/is/strings.php

@@ -1,7 +1,8 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}
+<?php
+
+$a->strings["Gnot settings updated."] = "";
+$a->strings["Gnot Settings"] = "";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
+$a->strings["Enable this addon?"] = "";
+$a->strings["Submit"] = "Senda inn";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";

googlemaps/googlemaps.php

@@ -8,13 +8,13 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\Logger;
 
 function googlemaps_install()
 {
 	Hook::register('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-	DI::logger()->notice('installed googlemaps');
+	Logger::notice('installed googlemaps');
 }
 
 function googlemaps_location(&$item)

gravatar/gravatar.php

@@ -8,6 +8,7 @@
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -19,7 +20,7 @@ function gravatar_install() {
 	Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	DI::logger()->notice("registered gravatar in avatar_lookup hook");
+	Logger::notice("registered gravatar in avatar_lookup hook");
 }
 
 function gravatar_load_config(ConfigFileManager $loader)

gravatar/lang/bg/messages.po

@@ -1,70 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr ""
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr ""
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr ""
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr ""
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr ""
-
-#: gravatar.php:96
-msgid "Information"
-msgstr ""
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr ""
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""

gravatar/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

gravatar/lang/eo/messages.po

@@ -1,70 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr ""
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr ""
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr ""
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr ""
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr ""
-
-#: gravatar.php:96
-msgid "Information"
-msgstr ""
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr ""
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""

gravatar/lang/eo/strings.php

@@ -1,7 +1,15 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["generic profile image"] = "komuna profilbildo";
+$a->strings["random geometric pattern"] = "loteca geometria skemo";
+$a->strings["monster face"] = "monstrobildo";
+$a->strings["computer generated face"] = "komputita vizaĝo";
+$a->strings["retro arcade style face"] = "retrostila videoludstila vizaĝo";
+$a->strings["Information"] = "Informo";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "La Libravatar kromprogramo estas ankaŭ instaltga. Bonvolu malŝalti la Libravatar kromprogramon.<br>La Libravatar kromprogramo retropaŝos al Gravatar se neniu troveblis ĉe Libravatar.";
+$a->strings["Submit"] = "Sendi";
+$a->strings["Default avatar image"] = "Defaŭlta avatarbildo";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Elektu defaŭltan avatarbildon se neniu troviĝis ĉe Gravatar. Vidu README.";
+$a->strings["Rating of images"] = "Pritakso de bildoj";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Elektu la ĝustan pritakson de via avataro por via retejo. Vidu README.";
+$a->strings["Gravatar settings updated."] = "Gravatar agordoj ĝisdatigitaj.";

gravatar/lang/et/messages.po

@@ -1,71 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-# Rain Hawk, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: Rain Hawk, 2020\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr ""
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr ""
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr ""
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr ""
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr ""
-
-#: gravatar.php:96
-msgid "Information"
-msgstr ""
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr ""
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""

gravatar/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

gravatar/lang/gd/messages.po

@@ -1,70 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr ""
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr ""
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr ""
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr ""
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr ""
-
-#: gravatar.php:96
-msgid "Information"
-msgstr ""
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr ""
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""

gravatar/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

gravatar/lang/is/messages.po

@@ -1,70 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr ""
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr ""
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr ""
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr ""
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr ""
-
-#: gravatar.php:96
-msgid "Information"
-msgstr ""
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr ""
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""

gravatar/lang/is/strings.php

@@ -1,7 +1,15 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}
+<?php
+
+$a->strings["generic profile image"] = "";
+$a->strings["random geometric pattern"] = "";
+$a->strings["monster face"] = "";
+$a->strings["computer generated face"] = "";
+$a->strings["retro arcade style face"] = "";
+$a->strings["Information"] = "";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
+$a->strings["Submit"] = "Senda inn";
+$a->strings["Default avatar image"] = "";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
+$a->strings["Rating of images"] = "";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
+$a->strings["Gravatar settings updated."] = "";

group_text/lang/bg/messages.po

@@ -1,27 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr ""

group_text/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

group_text/lang/eo/messages.po

@@ -1,27 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr ""

group_text/lang/eo/strings.php

@@ -1,7 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Group Text"] = "";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Submit"] = "Sendi";

group_text/lang/et/messages.po

@@ -1,28 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Rain Hawk, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Rain Hawk, 2020\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr ""

group_text/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

group_text/lang/gd/messages.po

@@ -1,27 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr ""

group_text/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

group_text/lang/is/messages.po

@@ -1,27 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr ""

group_text/lang/is/strings.php

@@ -1,7 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}
+<?php
+
+$a->strings["Group Text"] = "";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Submit"] = "Senda inn";

ifttt/ifttt.php

@@ -8,6 +8,7 @@
  */
 use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -85,16 +86,16 @@ function ifttt_post()
 
 	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBA::isResult($user)) {
-		DI::logger()->info('User ' . $nickname . ' not found.');
+		Logger::info('User ' . $nickname . ' not found.');
 		return;
 	}
 
 	$uid = $user['uid'];
 
-	DI::logger()->info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
+	Logger::info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
 
 	if (!isset($_REQUEST['key'])) {
-		DI::logger()->notice('No key found.');
+		Logger::notice('No key found.');
 		return;
 	}
 
@@ -102,7 +103,7 @@ function ifttt_post()
 
 	// Check the key
 	if ($key != DI::pConfig()->get($uid, 'ifttt', 'key')) {
-		DI::logger()->info('Invalid key for user ' . $uid);
+		Logger::info('Invalid key for user ' . $uid);
 		return;
 	}
 
@@ -113,7 +114,7 @@ function ifttt_post()
 	}
 
 	if (!in_array($item['type'], ['status', 'link', 'photo'])) {
-		DI::logger()->info('Unknown item type ' . $item['type']);
+		Logger::info('Unknown item type ' . $item['type']);
 		return;
 	}
 
@@ -178,5 +179,5 @@ function ifttt_message($uid, $item)
 		$link = hash('ripemd128', $item['msg']);
 	}
 
-	Post\Delayed::add($link, $post, Worker::PRIORITY_MEDIUM, Post\Delayed::PREPARED);
+	Post\Delayed::add($link, $post, Worker::PRIORITY_MEDIUM, Post\Delayed::UNPREPARED);
 }

ifttt/lang/bg/messages.po

@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Language-Team: Bulgarian (https://app.transifex.com/Friendica/teams/12172/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""

ifttt/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

ifttt/lang/ca/messages.po

@@ -1,66 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-# Translators:
-# Rafael Garau, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Rafael Garau, 2018\n"
-"Language-Team: Catalan (https://app.transifex.com/Friendica/teams/12172/ca/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-"Crear un compte en <a href=\"http://www.ifttt.com\">IFTTT</a>. Crear tres "
-"fórmules per Facebook que estiguin connectades amb <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (de la següent forma \"si "
-"Facebook llavors Maker\") amb els següents paràmetres:"
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr "Cos pel \"nou missatge de estatus\""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr "Cos per la \"nova foto pujada\""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr "Cos pel \"nou enllaç de l'enviament\""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr "Espill IFTTT"
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr "Generar nova clau"

ifttt/lang/ca/strings.php

@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ca")) {
-function string_plural_select_ca($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Crear un compte en <a href="http://www.ifttt.com">IFTTT</a>. Crear tres fórmules per Facebook que estiguin connectades amb <a href="https://ifttt.com/maker">Maker</a> (de la següent forma "si Facebook llavors Maker") amb els següents paràmetres:';
-$a->strings['Body for "new status message"'] = 'Cos pel "nou missatge de estatus"';
-$a->strings['Body for "new photo upload"'] = 'Cos per la "nova foto pujada"';
-$a->strings['Body for "new link post"'] = 'Cos pel "nou enllaç de l\'enviament"';
-$a->strings['IFTTT Mirror'] = 'Espill IFTTT';
-$a->strings['Generate new key'] = 'Generar nova clau';

ifttt/lang/eo/messages.po

@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Language-Team: Esperanto (https://app.transifex.com/Friendica/teams/12172/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""

ifttt/lang/eo/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

ifttt/lang/et/messages.po

@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Language-Team: Estonian (https://app.transifex.com/Friendica/teams/12172/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""

ifttt/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

ifttt/lang/gd/messages.po

@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Language-Team: Gaelic, Scottish (https://app.transifex.com/Friendica/teams/12172/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""

ifttt/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

ifttt/lang/is/messages.po

@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Language-Team: Icelandic (https://app.transifex.com/Friendica/teams/12172/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""

ifttt/lang/is/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}

ifttt/lang/it/messages.po

@@ -1,67 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2023
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
-"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-"Crea un accout su <a href=\"http://www.ifttt.com\">IFTTT</a>. Crea tre "
-"ricette Facebook  collegate con <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (del tipo \"if Facebook then "
-"Maker\") con i seguenti parametri:"
-
-#: ifttt.php:53
-msgid "URL"
-msgstr "URL"
-
-#: ifttt.php:54
-msgid "Method"
-msgstr "Metodo"
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr "Tipo di Contenuto"
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr "Contenuto per \"nuovo messaggio di stato\""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr "Contenuto per \"nuova foto caricata\""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr "Contenuto per \"nuovo collegamento\""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr "Mirror IFTTT"
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr "Genera una nuova chiave"

ifttt/lang/it/strings.php

@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_it")) {
-function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Crea un accout su <a href="http://www.ifttt.com">IFTTT</a>. Crea tre ricette Facebook  collegate con <a href="https://ifttt.com/maker">Maker</a> (del tipo "if Facebook then Maker") con i seguenti parametri:';
-$a->strings['URL'] = 'URL';
-$a->strings['Method'] = 'Metodo';
-$a->strings['Content Type'] = 'Tipo di Contenuto';
-$a->strings['Body for "new status message"'] = 'Contenuto per "nuovo messaggio di stato"';
-$a->strings['Body for "new photo upload"'] = 'Contenuto per "nuova foto caricata"';
-$a->strings['Body for "new link post"'] = 'Contenuto per "nuovo collegamento"';
-$a->strings['IFTTT Mirror'] = 'Mirror IFTTT';
-$a->strings['Generate new key'] = 'Genera una nuova chiave';

ifttt/lang/nl/messages.po

@@ -1,62 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-# Translators:
-# Jeroen De Meerleer <me@jeroened.be>, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Jeroen De Meerleer <me@jeroened.be>, 2018\n"
-"Language-Team: Dutch (https://app.transifex.com/Friendica/teams/12172/nl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr "IFTTT Mirror"
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""

ifttt/lang/nl/strings.php

@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_nl")) {
-function string_plural_select_nl($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['IFTTT Mirror'] = 'IFTTT Mirror';

ifttt/lang/ru/messages.po

@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Language-Team: Russian (https://app.transifex.com/Friendica/teams/12172/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""

ifttt/lang/ru/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}

ijpost/ijpost.php

@@ -10,6 +10,7 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -122,10 +123,6 @@ function ijpost_send(array &$b)
 		return;
 	}
 
-	if (Item::isGroupPost($b['uri-id'])) {
-		return;
-	}
-
 	if ($b['parent'] != $b['id']) {
 		return;
 	}
@@ -181,11 +178,11 @@ function ijpost_send(array &$b)
 
 EOT;
 
-		DI::logger()->debug('ijpost: data: ' . $xml);
+		Logger::debug('ijpost: data: ' . $xml);
 
 		if ($ij_blog !== 'test') {
 			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
-		DI::logger()->info('posted to insanejournal: ' . $x ? $x : '');
+		Logger::info('posted to insanejournal: ' . $x ? $x : '');
 	}
 }

ijpost/lang/bg/messages.po

@@ -1,43 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr ""
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr ""
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr ""
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr ""
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr ""
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr ""

ijpost/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

ijpost/lang/eo/messages.po

@@ -1,43 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr ""
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr ""
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr ""
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr ""
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr ""
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr ""

ijpost/lang/eo/strings.php

@@ -1,7 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Post to Insanejournal"] = "Afiŝi al Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Agordoj pri Insaenejournal Afiŝoj";
+$a->strings["Enable InsaneJournal Post Addon"] = "Ŝalti la InsaneJournal afiŝo kromprogramon.";
+$a->strings["InsaneJournal username"] = "Salutnomo ĉe InsaneJournal";
+$a->strings["InsaneJournal password"] = "Pasvorto ĉe InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Defaŭlte afiŝi ĉe InsaneJournal";
+$a->strings["Submit"] = "Sendi";

ijpost/lang/et/messages.po

@@ -1,44 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-# Rain Hawk, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: Rain Hawk, 2020\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr ""
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr ""
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr ""
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr ""
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr ""
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr ""

ijpost/lang/et/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

ijpost/lang/gd/messages.po

@@ -1,43 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr ""
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr ""
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr ""
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr ""
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr ""
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr ""

ijpost/lang/gd/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}

ijpost/lang/is/messages.po

@@ -1,43 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr ""
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr ""
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr ""
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr ""
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr ""
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr ""

ijpost/lang/is/strings.php

@@ -1,7 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_is")) {
-function string_plural_select_is($n){
-	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
-}}
+<?php
+
+$a->strings["Post to Insanejournal"] = "";
+$a->strings["InsaneJournal Post Settings"] = "";
+$a->strings["Enable InsaneJournal Post Addon"] = "";
+$a->strings["InsaneJournal username"] = "";
+$a->strings["InsaneJournal password"] = "";
+$a->strings["Post to InsaneJournal by default"] = "";
+$a->strings["Submit"] = "Senda inn";

impressum/impressum.php

@@ -9,6 +9,7 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -19,7 +20,7 @@ function impressum_install()
 	Hook::register('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
 	Hook::register('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
 	Hook::register('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-	DI::logger()->notice("installed impressum Addon");
+	Logger::notice("installed impressum Addon");
 }
 
 /**

impressum/lang/bg/messages.po

@@ -1,84 +0,0 @@
-# ADDON impressum
-# Copyright (C)
-# This file is distributed under the same license as the Friendica impressum addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: impressum.php:53
-msgid "Impressum"
-msgstr ""
-
-#: impressum.php:66 impressum.php:68 impressum.php:99
-msgid "Site Owner"
-msgstr ""
-
-#: impressum.php:66 impressum.php:103
-msgid "Email Address"
-msgstr ""
-
-#: impressum.php:71 impressum.php:101
-msgid "Postal Address"
-msgstr ""
-
-#: impressum.php:77
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr ""
-
-#: impressum.php:98
-msgid "Save Settings"
-msgstr ""
-
-#: impressum.php:99
-msgid "The page operators name."
-msgstr ""
-
-#: impressum.php:100
-msgid "Site Owners Profile"
-msgstr ""
-
-#: impressum.php:100
-msgid "Profile address of the operator."
-msgstr ""
-
-#: impressum.php:101
-msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr ""
-
-#: impressum.php:102
-msgid "Notes"
-msgstr ""
-
-#: impressum.php:102
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can"
-" use BBCode here."
-msgstr ""
-
-#: impressum.php:103
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr ""
-
-#: impressum.php:104
-msgid "Footer note"
-msgstr ""
-
-#: impressum.php:104
-msgid "Text for the footer. You can use BBCode here."
-msgstr ""

impressum/lang/bg/strings.php

@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}

impressum/lang/eo/messages.po

@@ -1,84 +0,0 @@
-# ADDON impressum
-# Copyright (C)
-# This file is distributed under the same license as the Friendica impressum addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: impressum.php:53
-msgid "Impressum"
-msgstr ""
-
-#: impressum.php:66 impressum.php:68 impressum.php:99
-msgid "Site Owner"
-msgstr ""
-
-#: impressum.php:66 impressum.php:103
-msgid "Email Address"
-msgstr ""
-
-#: impressum.php:71 impressum.php:101
-msgid "Postal Address"
-msgstr ""
-
-#: impressum.php:77
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr ""
-
-#: impressum.php:98
-msgid "Save Settings"
-msgstr ""
-
-#: impressum.php:99
-msgid "The page operators name."
-msgstr ""
-
-#: impressum.php:100
-msgid "Site Owners Profile"
-msgstr ""
-
-#: impressum.php:100
-msgid "Profile address of the operator."
-msgstr ""
-
-#: impressum.php:101
-msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr ""
-
-#: impressum.php:102
-msgid "Notes"
-msgstr ""
-
-#: impressum.php:102
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can"
-" use BBCode here."
-msgstr ""
-
-#: impressum.php:103
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr ""
-
-#: impressum.php:104
-msgid "Footer note"
-msgstr ""
-
-#: impressum.php:104
-msgid "Text for the footer. You can use BBCode here."
-msgstr ""

impressum/lang/eo/strings.php

@@ -1,7 +1,18 @@
-<?php
-
-if(! function_exists("string_plural_select_eo")) {
-function string_plural_select_eo($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Impressum"] = "Kolofono";
+$a->strings["Site Owner"] = "Proprietulo de la paĝo";
+$a->strings["Email Address"] = "Retpoŝta Adreso";
+$a->strings["Postal Address"] = "Poŝta Adreso";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "La kolofono (impressum) kromprogramo bezonas agordojn!<br />Bonvolu aldoni minimume la <tt>owner</tt> variablon al via agorda dosiero. Por aliaj variabloj, bonvolu legi la README dosieron de la kromprogramo.";
+$a->strings["Settings updated."] = "Agordoj ĝisdatigita.";
+$a->strings["Submit"] = "Sendi";
+$a->strings["The page operators name."] = "La nomo de la funkciigisto de la retejo.";
+$a->strings["Site Owners Profile"] = "Profilo de la Proprietulo de la Retejo";
+$a->strings["Profile address of the operator."] = "La profilo de la funkciigisto de la retejo.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kiel poŝte kontakti la funkciigisto de la retejo. Vi eblas uzi BBCode ĉi tie.";
+$a->strings["Notes"] = "Notoj";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Pli da notoj kiuj aperas sub la kontaktinformoj. Vi eblas uzi BBCode ĉi tie.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Kiel kontakti la funkciigiston de la retejo per retpoŝto. (montriĝos vuale) ";
+$a->strings["Footer note"] = "Paĝpiednoto";
+$a->strings["Text for the footer. You can use BBCode here."] = "Teksto por la paĝpiedo. Vie eblas uzi BBCode ĉi tie.";