diff options
Diffstat (limited to 'apps/lookup_server_connector')
103 files changed, 412 insertions, 323 deletions
diff --git a/apps/lookup_server_connector/.noopenapi b/apps/lookup_server_connector/.noopenapi new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/apps/lookup_server_connector/.noopenapi diff --git a/apps/lookup_server_connector/appinfo/info.xml b/apps/lookup_server_connector/appinfo/info.xml index cf486e06228..bbb9dbdab3d 100644 --- a/apps/lookup_server_connector/appinfo/info.xml +++ b/apps/lookup_server_connector/appinfo/info.xml @@ -1,15 +1,18 @@ <?xml version="1.0"?> +<!-- + - SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors + - SPDX-License-Identifier: AGPL-3.0-or-later +--> <info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd"> <id>lookup_server_connector</id> <name>Lookup Server Connector</name> - <summary>Sync public user information with the lookup server</summary> - <description>Sync public user information with the lookup server</description> - <version>1.13.0</version> + <summary>Sync public account information with the lookup server</summary> + <description>Sync public account information with the lookup server</description> + <version>1.20.0</version> <licence>agpl</licence> <author>Bjoern Schiessle</author> <namespace>LookupServerConnector</namespace> - <default_enable/> <types> <authentication/> </types> @@ -17,6 +20,6 @@ <category>social</category> <bugs>https://github.com/nextcloud/server/issues</bugs> <dependencies> - <nextcloud min-version="25" max-version="25"/> + <nextcloud min-version="32" max-version="32"/> </dependencies> </info> diff --git a/apps/lookup_server_connector/composer/autoload.php b/apps/lookup_server_connector/composer/autoload.php index 521fd3630e4..1024b4412ab 100644 --- a/apps/lookup_server_connector/composer/autoload.php +++ b/apps/lookup_server_connector/composer/autoload.php @@ -3,8 +3,21 @@ // autoload.php @generated by Composer if (PHP_VERSION_ID < 50600) { - echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL; - exit(1); + if (!headers_sent()) { + header('HTTP/1.1 500 Internal Server Error'); + } + $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL; + if (!ini_get('display_errors')) { + if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { + fwrite(STDERR, $err); + } elseif (!headers_sent()) { + echo $err; + } + } + trigger_error( + $err, + E_USER_ERROR + ); } require_once __DIR__ . '/composer/autoload_real.php'; diff --git a/apps/lookup_server_connector/composer/composer/ClassLoader.php b/apps/lookup_server_connector/composer/composer/ClassLoader.php index afef3fa2ad8..7824d8f7eaf 100644 --- a/apps/lookup_server_connector/composer/composer/ClassLoader.php +++ b/apps/lookup_server_connector/composer/composer/ClassLoader.php @@ -42,35 +42,37 @@ namespace Composer\Autoload; */ class ClassLoader { - /** @var ?string */ + /** @var \Closure(string):void */ + private static $includeFile; + + /** @var string|null */ private $vendorDir; // PSR-4 /** - * @var array[] - * @psalm-var array<string, array<string, int>> + * @var array<string, array<string, int>> */ private $prefixLengthsPsr4 = array(); /** - * @var array[] - * @psalm-var array<string, array<int, string>> + * @var array<string, list<string>> */ private $prefixDirsPsr4 = array(); /** - * @var array[] - * @psalm-var array<string, string> + * @var list<string> */ private $fallbackDirsPsr4 = array(); // PSR-0 /** - * @var array[] - * @psalm-var array<string, array<string, string[]>> + * List of PSR-0 prefixes + * + * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) + * + * @var array<string, array<string, list<string>>> */ private $prefixesPsr0 = array(); /** - * @var array[] - * @psalm-var array<string, string> + * @var list<string> */ private $fallbackDirsPsr0 = array(); @@ -78,8 +80,7 @@ class ClassLoader private $useIncludePath = false; /** - * @var string[] - * @psalm-var array<string, string> + * @var array<string, string> */ private $classMap = array(); @@ -87,29 +88,29 @@ class ClassLoader private $classMapAuthoritative = false; /** - * @var bool[] - * @psalm-var array<string, bool> + * @var array<string, bool> */ private $missingClasses = array(); - /** @var ?string */ + /** @var string|null */ private $apcuPrefix; /** - * @var self[] + * @var array<string, self> */ private static $registeredLoaders = array(); /** - * @param ?string $vendorDir + * @param string|null $vendorDir */ public function __construct($vendorDir = null) { $this->vendorDir = $vendorDir; + self::initializeIncludeClosure(); } /** - * @return string[] + * @return array<string, list<string>> */ public function getPrefixes() { @@ -121,8 +122,7 @@ class ClassLoader } /** - * @return array[] - * @psalm-return array<string, array<int, string>> + * @return array<string, list<string>> */ public function getPrefixesPsr4() { @@ -130,8 +130,7 @@ class ClassLoader } /** - * @return array[] - * @psalm-return array<string, string> + * @return list<string> */ public function getFallbackDirs() { @@ -139,8 +138,7 @@ class ClassLoader } /** - * @return array[] - * @psalm-return array<string, string> + * @return list<string> */ public function getFallbackDirsPsr4() { @@ -148,8 +146,7 @@ class ClassLoader } /** - * @return string[] Array of classname => path - * @psalm-return array<string, string> + * @return array<string, string> Array of classname => path */ public function getClassMap() { @@ -157,8 +154,7 @@ class ClassLoader } /** - * @param string[] $classMap Class to filename map - * @psalm-param array<string, string> $classMap + * @param array<string, string> $classMap Class to filename map * * @return void */ @@ -175,24 +171,25 @@ class ClassLoader * Registers a set of PSR-0 directories for a given prefix, either * appending or prepending to the ones previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix + * @param list<string>|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories * * @return void */ public function add($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { if ($prepend) { $this->fallbackDirsPsr0 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr0 ); } else { $this->fallbackDirsPsr0 = array_merge( $this->fallbackDirsPsr0, - (array) $paths + $paths ); } @@ -201,19 +198,19 @@ class ClassLoader $first = $prefix[0]; if (!isset($this->prefixesPsr0[$first][$prefix])) { - $this->prefixesPsr0[$first][$prefix] = (array) $paths; + $this->prefixesPsr0[$first][$prefix] = $paths; return; } if ($prepend) { $this->prefixesPsr0[$first][$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixesPsr0[$first][$prefix] ); } else { $this->prefixesPsr0[$first][$prefix] = array_merge( $this->prefixesPsr0[$first][$prefix], - (array) $paths + $paths ); } } @@ -222,9 +219,9 @@ class ClassLoader * Registers a set of PSR-4 directories for a given namespace, either * appending or prepending to the ones previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list<string>|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException * @@ -232,17 +229,18 @@ class ClassLoader */ public function addPsr4($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { // Register directories for the root namespace. if ($prepend) { $this->fallbackDirsPsr4 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr4 ); } else { $this->fallbackDirsPsr4 = array_merge( $this->fallbackDirsPsr4, - (array) $paths + $paths ); } } elseif (!isset($this->prefixDirsPsr4[$prefix])) { @@ -252,18 +250,18 @@ class ClassLoader throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; + $this->prefixDirsPsr4[$prefix] = $paths; } elseif ($prepend) { // Prepend directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixDirsPsr4[$prefix] ); } else { // Append directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( $this->prefixDirsPsr4[$prefix], - (array) $paths + $paths ); } } @@ -272,8 +270,8 @@ class ClassLoader * Registers a set of PSR-0 directories for a given prefix, * replacing any others previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 base directories + * @param string $prefix The prefix + * @param list<string>|string $paths The PSR-0 base directories * * @return void */ @@ -290,8 +288,8 @@ class ClassLoader * Registers a set of PSR-4 directories for a given namespace, * replacing any others previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list<string>|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException * @@ -425,7 +423,8 @@ class ClassLoader public function loadClass($class) { if ($file = $this->findFile($class)) { - includeFile($file); + $includeFile = self::$includeFile; + $includeFile($file); return true; } @@ -476,9 +475,9 @@ class ClassLoader } /** - * Returns the currently registered loaders indexed by their corresponding vendor directories. + * Returns the currently registered loaders keyed by their corresponding vendor directories. * - * @return self[] + * @return array<string, self> */ public static function getRegisteredLoaders() { @@ -555,18 +554,26 @@ class ClassLoader return false; } -} -/** - * Scope isolated include. - * - * Prevents access to $this/self from included files. - * - * @param string $file - * @return void - * @private - */ -function includeFile($file) -{ - include $file; + /** + * @return void + */ + private static function initializeIncludeClosure() + { + if (self::$includeFile !== null) { + return; + } + + /** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + * + * @param string $file + * @return void + */ + self::$includeFile = \Closure::bind(static function($file) { + include $file; + }, null, null); + } } diff --git a/apps/lookup_server_connector/composer/composer/InstalledVersions.php b/apps/lookup_server_connector/composer/composer/InstalledVersions.php index 41bc143c114..51e734a774b 100644 --- a/apps/lookup_server_connector/composer/composer/InstalledVersions.php +++ b/apps/lookup_server_connector/composer/composer/InstalledVersions.php @@ -28,7 +28,7 @@ class InstalledVersions { /** * @var mixed[]|null - * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null + * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null */ private static $installed; @@ -39,7 +39,7 @@ class InstalledVersions /** * @var array[] - * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}> + * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}> */ private static $installedByVendor = array(); @@ -98,7 +98,7 @@ class InstalledVersions { foreach (self::getInstalled() as $installed) { if (isset($installed['versions'][$packageName])) { - return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); + return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false; } } @@ -119,7 +119,7 @@ class InstalledVersions */ public static function satisfies(VersionParser $parser, $packageName, $constraint) { - $constraint = $parser->parseConstraints($constraint); + $constraint = $parser->parseConstraints((string) $constraint); $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); return $provided->matches($constraint); @@ -243,7 +243,7 @@ class InstalledVersions /** * @return array - * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string} + * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool} */ public static function getRootPackage() { @@ -257,7 +257,7 @@ class InstalledVersions * * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. * @return array[] - * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} + * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} */ public static function getRawData() { @@ -280,7 +280,7 @@ class InstalledVersions * Returns the raw data of all installed.php which are currently loaded for custom implementations * * @return array[] - * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}> + * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}> */ public static function getAllRawData() { @@ -303,7 +303,7 @@ class InstalledVersions * @param array[] $data A vendor/composer/installed.php data set * @return void * - * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data + * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data */ public static function reload($data) { @@ -313,7 +313,7 @@ class InstalledVersions /** * @return array[] - * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}> + * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}> */ private static function getInstalled() { @@ -328,7 +328,9 @@ class InstalledVersions if (isset(self::$installedByVendor[$vendorDir])) { $installed[] = self::$installedByVendor[$vendorDir]; } elseif (is_file($vendorDir.'/composer/installed.php')) { - $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ + $required = require $vendorDir.'/composer/installed.php'; + $installed[] = self::$installedByVendor[$vendorDir] = $required; if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { self::$installed = $installed[count($installed) - 1]; } @@ -340,12 +342,17 @@ class InstalledVersions // only require the installed.php file if this file is loaded from its dumped location, // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 if (substr(__DIR__, -8, 1) !== 'C') { - self::$installed = require __DIR__ . '/installed.php'; + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ + $required = require __DIR__ . '/installed.php'; + self::$installed = $required; } else { self::$installed = array(); } } - $installed[] = self::$installed; + + if (self::$installed !== array()) { + $installed[] = self::$installed; + } return $installed; } diff --git a/apps/lookup_server_connector/composer/composer/installed.php b/apps/lookup_server_connector/composer/composer/installed.php index 5440719fa40..1a66c7f2416 100644 --- a/apps/lookup_server_connector/composer/composer/installed.php +++ b/apps/lookup_server_connector/composer/composer/installed.php @@ -1,22 +1,22 @@ <?php return array( 'root' => array( + 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', + 'reference' => 'b1797842784b250fb01ed5e3bf130705eb94751b', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), - 'reference' => 'c6429e6cd19c57582364338362e543580821cf99', - 'name' => '__root__', 'dev' => false, ), 'versions' => array( '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', + 'reference' => 'b1797842784b250fb01ed5e3bf130705eb94751b', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), - 'reference' => 'c6429e6cd19c57582364338362e543580821cf99', 'dev_requirement' => false, ), ), diff --git a/apps/lookup_server_connector/l10n/ar.js b/apps/lookup_server_connector/l10n/ar.js new file mode 100644 index 00000000000..46d6ba9e370 --- /dev/null +++ b/apps/lookup_server_connector/l10n/ar.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "أداة التوصيل بخادم البحث", + "Sync public account information with the lookup server" : "مُزامنة بيانات الحساب العامة مع خادم البحث" +}, +"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"); diff --git a/apps/lookup_server_connector/l10n/ar.json b/apps/lookup_server_connector/l10n/ar.json new file mode 100644 index 00000000000..463ce0ef53a --- /dev/null +++ b/apps/lookup_server_connector/l10n/ar.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "أداة التوصيل بخادم البحث", + "Sync public account information with the lookup server" : "مُزامنة بيانات الحساب العامة مع خادم البحث" +},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/ast.js b/apps/lookup_server_connector/l10n/ast.js new file mode 100644 index 00000000000..ed253eb5a9c --- /dev/null +++ b/apps/lookup_server_connector/l10n/ast.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Conector del sirvidor de busca", + "Sync public account information with the lookup server" : "Sincroniza la información de la cuenta pública col sirvidor de busca" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/ast.json b/apps/lookup_server_connector/l10n/ast.json new file mode 100644 index 00000000000..5644ba17afd --- /dev/null +++ b/apps/lookup_server_connector/l10n/ast.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Conector del sirvidor de busca", + "Sync public account information with the lookup server" : "Sincroniza la información de la cuenta pública col sirvidor de busca" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/be.js b/apps/lookup_server_connector/l10n/be.js new file mode 100644 index 00000000000..397c93957a4 --- /dev/null +++ b/apps/lookup_server_connector/l10n/be.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Злучальнік сервера пошуку", + "Sync public account information with the lookup server" : "Сінхранізацыя публічных звестак пра ўліковы запіс з серверам пошуку" +}, +"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);"); diff --git a/apps/lookup_server_connector/l10n/be.json b/apps/lookup_server_connector/l10n/be.json new file mode 100644 index 00000000000..91b91347e2c --- /dev/null +++ b/apps/lookup_server_connector/l10n/be.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Злучальнік сервера пошуку", + "Sync public account information with the lookup server" : "Сінхранізацыя публічных звестак пра ўліковы запіс з серверам пошуку" +},"pluralForm" :"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);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/bg.js b/apps/lookup_server_connector/l10n/bg.js index 6c0510ce7f8..2967997a0cd 100644 --- a/apps/lookup_server_connector/l10n/bg.js +++ b/apps/lookup_server_connector/l10n/bg.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Конектор за сървър за търсене", - "Sync public user information with the lookup server" : "Синхронизиране на публичната потребителска информация със сървъра за търсене " + "Lookup Server Connector" : "Конектор за сървър за търсене" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/bg.json b/apps/lookup_server_connector/l10n/bg.json index 1587cd23cd9..75083e5e4ea 100644 --- a/apps/lookup_server_connector/l10n/bg.json +++ b/apps/lookup_server_connector/l10n/bg.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "Конектор за сървър за търсене", - "Sync public user information with the lookup server" : "Синхронизиране на публичната потребителска информация със сървъра за търсене " + "Lookup Server Connector" : "Конектор за сървър за търсене" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/ca.js b/apps/lookup_server_connector/l10n/ca.js index 0852c280447..6ee1eae87c8 100644 --- a/apps/lookup_server_connector/l10n/ca.js +++ b/apps/lookup_server_connector/l10n/ca.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Connector del servidor de consulta", - "Sync public user information with the lookup server" : "Sincronitza la informació de l'usuari públic amb el servidor de consulta" + "Sync public account information with the lookup server" : "Sincronitzeu la informació pública dels comptes amb el servidor de consulta" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/ca.json b/apps/lookup_server_connector/l10n/ca.json index 77b96b5dd8a..98d69ff933a 100644 --- a/apps/lookup_server_connector/l10n/ca.json +++ b/apps/lookup_server_connector/l10n/ca.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Connector del servidor de consulta", - "Sync public user information with the lookup server" : "Sincronitza la informació de l'usuari públic amb el servidor de consulta" + "Sync public account information with the lookup server" : "Sincronitzeu la informació pública dels comptes amb el servidor de consulta" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/cs.js b/apps/lookup_server_connector/l10n/cs.js index 3fd100e0ed0..3e4bca702d0 100644 --- a/apps/lookup_server_connector/l10n/cs.js +++ b/apps/lookup_server_connector/l10n/cs.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Napojení na lookup server", - "Sync public user information with the lookup server" : "Synchronizace veřejných informacích o uživateli s lookup serverem" + "Sync public account information with the lookup server" : "Synchronizace veřejných informacích o účtu s lookup serverem" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"); diff --git a/apps/lookup_server_connector/l10n/cs.json b/apps/lookup_server_connector/l10n/cs.json index 7401181d2d6..34cd74e991b 100644 --- a/apps/lookup_server_connector/l10n/cs.json +++ b/apps/lookup_server_connector/l10n/cs.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Napojení na lookup server", - "Sync public user information with the lookup server" : "Synchronizace veřejných informacích o uživateli s lookup serverem" + "Sync public account information with the lookup server" : "Synchronizace veřejných informacích o účtu s lookup serverem" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/da.js b/apps/lookup_server_connector/l10n/da.js index 4fd76a09b16..97a41ac6444 100644 --- a/apps/lookup_server_connector/l10n/da.js +++ b/apps/lookup_server_connector/l10n/da.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Opslagsserverforbindelse", - "Sync public user information with the lookup server" : "Synkroniser offentlige brugeroplysninger med opslagsserveren" + "Sync public account information with the lookup server" : "Synkroniser offentlige kontooplysninger med opslagsserveren" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/da.json b/apps/lookup_server_connector/l10n/da.json index 375d14b3003..1fe4e5757a6 100644 --- a/apps/lookup_server_connector/l10n/da.json +++ b/apps/lookup_server_connector/l10n/da.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Opslagsserverforbindelse", - "Sync public user information with the lookup server" : "Synkroniser offentlige brugeroplysninger med opslagsserveren" + "Sync public account information with the lookup server" : "Synkroniser offentlige kontooplysninger med opslagsserveren" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/de.js b/apps/lookup_server_connector/l10n/de.js index aa5ee977eb4..4b5e23b4d71 100644 --- a/apps/lookup_server_connector/l10n/de.js +++ b/apps/lookup_server_connector/l10n/de.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Lookup-Server Connector", - "Sync public user information with the lookup server" : "Synchronisiere öffentliche Benutzer-Informationen mit dem Lookup-Server " + "Sync public account information with the lookup server" : "Öffentliche Kontoinformationen mit dem Lookup-Server synchronisieren" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/de.json b/apps/lookup_server_connector/l10n/de.json index fc0d85c7061..a792fa96a69 100644 --- a/apps/lookup_server_connector/l10n/de.json +++ b/apps/lookup_server_connector/l10n/de.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Lookup-Server Connector", - "Sync public user information with the lookup server" : "Synchronisiere öffentliche Benutzer-Informationen mit dem Lookup-Server " + "Sync public account information with the lookup server" : "Öffentliche Kontoinformationen mit dem Lookup-Server synchronisieren" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/de_DE.js b/apps/lookup_server_connector/l10n/de_DE.js index 50a91a73b0c..79b69267a3a 100644 --- a/apps/lookup_server_connector/l10n/de_DE.js +++ b/apps/lookup_server_connector/l10n/de_DE.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Lookup Server Connector", - "Sync public user information with the lookup server" : "Synchronisiert öffentliche Benutzer-Informationen mit dem Lookup-Server " + "Sync public account information with the lookup server" : "Öffentliche Kontoinformationen mit dem Lookup-Server synchronisieren" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/de_DE.json b/apps/lookup_server_connector/l10n/de_DE.json index 8553579082b..e2140ef7b55 100644 --- a/apps/lookup_server_connector/l10n/de_DE.json +++ b/apps/lookup_server_connector/l10n/de_DE.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Lookup Server Connector", - "Sync public user information with the lookup server" : "Synchronisiert öffentliche Benutzer-Informationen mit dem Lookup-Server " + "Sync public account information with the lookup server" : "Öffentliche Kontoinformationen mit dem Lookup-Server synchronisieren" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/el.js b/apps/lookup_server_connector/l10n/el.js index a8077de5ca8..17c977f3020 100644 --- a/apps/lookup_server_connector/l10n/el.js +++ b/apps/lookup_server_connector/l10n/el.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Σύνδεση διακομιστή αναζήτησης", - "Sync public user information with the lookup server" : "Συγχρονίστε τις δημόσιες πληροφορίες χρήστη με τον διακομιστή αναζήτησης." + "Lookup Server Connector" : "Σύνδεση διακομιστή αναζήτησης" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/el.json b/apps/lookup_server_connector/l10n/el.json index 49116e449db..349cc21b466 100644 --- a/apps/lookup_server_connector/l10n/el.json +++ b/apps/lookup_server_connector/l10n/el.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "Σύνδεση διακομιστή αναζήτησης", - "Sync public user information with the lookup server" : "Συγχρονίστε τις δημόσιες πληροφορίες χρήστη με τον διακομιστή αναζήτησης." + "Lookup Server Connector" : "Σύνδεση διακομιστή αναζήτησης" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/en_GB.js b/apps/lookup_server_connector/l10n/en_GB.js index c81b59e3a7f..4ec5336d9d4 100644 --- a/apps/lookup_server_connector/l10n/en_GB.js +++ b/apps/lookup_server_connector/l10n/en_GB.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Lookup Server Connector", - "Sync public user information with the lookup server" : "Sync public user information with the lookup server" + "Sync public account information with the lookup server" : "Sync public account information with the lookup server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/en_GB.json b/apps/lookup_server_connector/l10n/en_GB.json index bc65e8e6565..3958dc97050 100644 --- a/apps/lookup_server_connector/l10n/en_GB.json +++ b/apps/lookup_server_connector/l10n/en_GB.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Lookup Server Connector", - "Sync public user information with the lookup server" : "Sync public user information with the lookup server" + "Sync public account information with the lookup server" : "Sync public account information with the lookup server" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/es.js b/apps/lookup_server_connector/l10n/es.js index a5985ab6f7e..d9c35e13ff4 100644 --- a/apps/lookup_server_connector/l10n/es.js +++ b/apps/lookup_server_connector/l10n/es.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Conector del Servidor de Búsqueda", - "Sync public user information with the lookup server" : "Sincronizar información pública del usuario con el servidor de búsqueda" + "Sync public account information with the lookup server" : "Sincronizar información pública de la cuenta con el servidor de búsqueda" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/lookup_server_connector/l10n/es.json b/apps/lookup_server_connector/l10n/es.json index 497dda0c86b..26061c560ee 100644 --- a/apps/lookup_server_connector/l10n/es.json +++ b/apps/lookup_server_connector/l10n/es.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Conector del Servidor de Búsqueda", - "Sync public user information with the lookup server" : "Sincronizar información pública del usuario con el servidor de búsqueda" -},"pluralForm" :"nplurals=2; plural=(n != 1);" + "Sync public account information with the lookup server" : "Sincronizar información pública de la cuenta con el servidor de búsqueda" +},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/es_EC.js b/apps/lookup_server_connector/l10n/es_EC.js new file mode 100644 index 00000000000..fae73326f2b --- /dev/null +++ b/apps/lookup_server_connector/l10n/es_EC.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Conector del servidor de búsqueda" +}, +"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/lookup_server_connector/l10n/es_EC.json b/apps/lookup_server_connector/l10n/es_EC.json new file mode 100644 index 00000000000..f48fc0ae79b --- /dev/null +++ b/apps/lookup_server_connector/l10n/es_EC.json @@ -0,0 +1,4 @@ +{ "translations": { + "Lookup Server Connector" : "Conector del servidor de búsqueda" +},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/es_MX.js b/apps/lookup_server_connector/l10n/es_MX.js new file mode 100644 index 00000000000..f9f34b8fdcc --- /dev/null +++ b/apps/lookup_server_connector/l10n/es_MX.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Conector del servidor de búsqueda", + "Sync public account information with the lookup server" : "Sincronizar la información pública de la cuenta con el servidor de búsqueda" +}, +"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/lookup_server_connector/l10n/es_MX.json b/apps/lookup_server_connector/l10n/es_MX.json new file mode 100644 index 00000000000..53395a3f0ce --- /dev/null +++ b/apps/lookup_server_connector/l10n/es_MX.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Conector del servidor de búsqueda", + "Sync public account information with the lookup server" : "Sincronizar la información pública de la cuenta con el servidor de búsqueda" +},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/et_EE.js b/apps/lookup_server_connector/l10n/et_EE.js new file mode 100644 index 00000000000..6f0cf9edd1a --- /dev/null +++ b/apps/lookup_server_connector/l10n/et_EE.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Tuvastusserveri ühendaja", + "Sync public account information with the lookup server" : "Sünkroniseeri avalik kontoteave tuvastusserverisse" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/et_EE.json b/apps/lookup_server_connector/l10n/et_EE.json new file mode 100644 index 00000000000..c6a2adc034d --- /dev/null +++ b/apps/lookup_server_connector/l10n/et_EE.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Tuvastusserveri ühendaja", + "Sync public account information with the lookup server" : "Sünkroniseeri avalik kontoteave tuvastusserverisse" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/eu.js b/apps/lookup_server_connector/l10n/eu.js index b1135463c15..8d3ba092619 100644 --- a/apps/lookup_server_connector/l10n/eu.js +++ b/apps/lookup_server_connector/l10n/eu.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Bilatu zerbitzari-konektorea", - "Sync public user information with the lookup server" : "Sinkronizatu erabiltzaile publiko baten informazioa bilaketa-zerbitzariarekin" + "Sync public account information with the lookup server" : "Sinkronizatu kontu publiko baten informazioa bilaketa-zerbitzariarekin" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/eu.json b/apps/lookup_server_connector/l10n/eu.json index 6a13894c6a1..b40b8b5b7a6 100644 --- a/apps/lookup_server_connector/l10n/eu.json +++ b/apps/lookup_server_connector/l10n/eu.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Bilatu zerbitzari-konektorea", - "Sync public user information with the lookup server" : "Sinkronizatu erabiltzaile publiko baten informazioa bilaketa-zerbitzariarekin" + "Sync public account information with the lookup server" : "Sinkronizatu kontu publiko baten informazioa bilaketa-zerbitzariarekin" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/fa.js b/apps/lookup_server_connector/l10n/fa.js new file mode 100644 index 00000000000..c6627d1c9f3 --- /dev/null +++ b/apps/lookup_server_connector/l10n/fa.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "اتصال سرور جستجو" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/apps/lookup_server_connector/l10n/fa.json b/apps/lookup_server_connector/l10n/fa.json new file mode 100644 index 00000000000..8af4bb7ffde --- /dev/null +++ b/apps/lookup_server_connector/l10n/fa.json @@ -0,0 +1,4 @@ +{ "translations": { + "Lookup Server Connector" : "اتصال سرور جستجو" +},"pluralForm" :"nplurals=2; plural=(n > 1);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/fi.js b/apps/lookup_server_connector/l10n/fi.js index f9f3ed3bd5a..f0c48abd849 100644 --- a/apps/lookup_server_connector/l10n/fi.js +++ b/apps/lookup_server_connector/l10n/fi.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Hakemistopalvelin yhdistäjä", - "Sync public user information with the lookup server" : "Synkronoi julkinen käyttäjätieto hakemistopalvelimen kanssa" + "Lookup Server Connector" : "Hakemistopalvelin yhdistäjä" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/fi.json b/apps/lookup_server_connector/l10n/fi.json index e8013ca2ab8..6ff11ce031e 100644 --- a/apps/lookup_server_connector/l10n/fi.json +++ b/apps/lookup_server_connector/l10n/fi.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "Hakemistopalvelin yhdistäjä", - "Sync public user information with the lookup server" : "Synkronoi julkinen käyttäjätieto hakemistopalvelimen kanssa" + "Lookup Server Connector" : "Hakemistopalvelin yhdistäjä" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/fr.js b/apps/lookup_server_connector/l10n/fr.js index 87fc8406884..b1a84248c5a 100644 --- a/apps/lookup_server_connector/l10n/fr.js +++ b/apps/lookup_server_connector/l10n/fr.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Connecteur de serveur de recherche", - "Sync public user information with the lookup server" : "Synchroniser les informations utilisateur publiques avec le serveur de recherche" + "Sync public account information with the lookup server" : "Synchroniser les informations des comptes publiques avec le serveur de recherche" }, -"nplurals=2; plural=(n > 1);"); +"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/lookup_server_connector/l10n/fr.json b/apps/lookup_server_connector/l10n/fr.json index 346d7bb5766..057c8fd0617 100644 --- a/apps/lookup_server_connector/l10n/fr.json +++ b/apps/lookup_server_connector/l10n/fr.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Connecteur de serveur de recherche", - "Sync public user information with the lookup server" : "Synchroniser les informations utilisateur publiques avec le serveur de recherche" -},"pluralForm" :"nplurals=2; plural=(n > 1);" + "Sync public account information with the lookup server" : "Synchroniser les informations des comptes publiques avec le serveur de recherche" +},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/ga.js b/apps/lookup_server_connector/l10n/ga.js new file mode 100644 index 00000000000..6017836d8fa --- /dev/null +++ b/apps/lookup_server_connector/l10n/ga.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Cuardaigh nascóirí freastalaí", + "Sync public account information with the lookup server" : "Sioncronaigh faisnéis chuntas poiblí leis an bhfreastalaí cuardaigh" +}, +"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);"); diff --git a/apps/lookup_server_connector/l10n/ga.json b/apps/lookup_server_connector/l10n/ga.json new file mode 100644 index 00000000000..605549aa6f5 --- /dev/null +++ b/apps/lookup_server_connector/l10n/ga.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Cuardaigh nascóirí freastalaí", + "Sync public account information with the lookup server" : "Sioncronaigh faisnéis chuntas poiblí leis an bhfreastalaí cuardaigh" +},"pluralForm" :"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/gl.js b/apps/lookup_server_connector/l10n/gl.js index 725d07e4875..839135a7cc0 100644 --- a/apps/lookup_server_connector/l10n/gl.js +++ b/apps/lookup_server_connector/l10n/gl.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Conectador do servidor de buscas", - "Sync public user information with the lookup server" : "Sincroniza a información pública do usuario co servidor de busca" + "Sync public account information with the lookup server" : "Sincroniza a información pública da conta co servidor de busca" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/gl.json b/apps/lookup_server_connector/l10n/gl.json index d56e1033593..425fb4dd631 100644 --- a/apps/lookup_server_connector/l10n/gl.json +++ b/apps/lookup_server_connector/l10n/gl.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Conectador do servidor de buscas", - "Sync public user information with the lookup server" : "Sincroniza a información pública do usuario co servidor de busca" + "Sync public account information with the lookup server" : "Sincroniza a información pública da conta co servidor de busca" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/he.js b/apps/lookup_server_connector/l10n/he.js index 180741130b1..0919f70c6de 100644 --- a/apps/lookup_server_connector/l10n/he.js +++ b/apps/lookup_server_connector/l10n/he.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "מקשר לשרת האיתור", - "Sync public user information with the lookup server" : "סנכרון פרטי משתמש ציבוריים מול שרת איתור" + "Lookup Server Connector" : "מקשר לשרת האיתור" }, -"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"); +"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;"); diff --git a/apps/lookup_server_connector/l10n/he.json b/apps/lookup_server_connector/l10n/he.json index 0103af73197..344bdbed6ae 100644 --- a/apps/lookup_server_connector/l10n/he.json +++ b/apps/lookup_server_connector/l10n/he.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "מקשר לשרת האיתור", - "Sync public user information with the lookup server" : "סנכרון פרטי משתמש ציבוריים מול שרת איתור" -},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;" + "Lookup Server Connector" : "מקשר לשרת האיתור" +},"pluralForm" :"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/hr.js b/apps/lookup_server_connector/l10n/hr.js index ad149ac9242..2fc990a7b81 100644 --- a/apps/lookup_server_connector/l10n/hr.js +++ b/apps/lookup_server_connector/l10n/hr.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Konektor poslužitelja za prevođenje", - "Sync public user information with the lookup server" : "Sinkronizirajte javne korisničke informacije s poslužiteljem za prevođenje" + "Lookup Server Connector" : "Konektor poslužitelja za prevođenje" }, "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"); diff --git a/apps/lookup_server_connector/l10n/hr.json b/apps/lookup_server_connector/l10n/hr.json index 958a55edd65..eb047c27cfe 100644 --- a/apps/lookup_server_connector/l10n/hr.json +++ b/apps/lookup_server_connector/l10n/hr.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "Konektor poslužitelja za prevođenje", - "Sync public user information with the lookup server" : "Sinkronizirajte javne korisničke informacije s poslužiteljem za prevođenje" + "Lookup Server Connector" : "Konektor poslužitelja za prevođenje" },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/hu.js b/apps/lookup_server_connector/l10n/hu.js index 6bfda3e73e4..21b3aeeafee 100644 --- a/apps/lookup_server_connector/l10n/hu.js +++ b/apps/lookup_server_connector/l10n/hu.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Keresőkiszolgáló csatlakozó", - "Sync public user information with the lookup server" : "Nyilvános felhasználói információk szinkronizálása a keresőkiszolgálóval" + "Sync public account information with the lookup server" : "Nyilvános fiókinformációk szinkronizálása a keresőkiszolgálóval" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/hu.json b/apps/lookup_server_connector/l10n/hu.json index 864d4a9c2cf..044fde4ba8b 100644 --- a/apps/lookup_server_connector/l10n/hu.json +++ b/apps/lookup_server_connector/l10n/hu.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Keresőkiszolgáló csatlakozó", - "Sync public user information with the lookup server" : "Nyilvános felhasználói információk szinkronizálása a keresőkiszolgálóval" + "Sync public account information with the lookup server" : "Nyilvános fiókinformációk szinkronizálása a keresőkiszolgálóval" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/is.js b/apps/lookup_server_connector/l10n/is.js new file mode 100644 index 00000000000..9cb534b4f12 --- /dev/null +++ b/apps/lookup_server_connector/l10n/is.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Tengi fyrir uppflettingaþjón", + "Sync public account information with the lookup server" : "Samstilltu opinberar upplýsingar notendaaðganga við uppflettingaþjóninn" +}, +"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/lookup_server_connector/l10n/is.json b/apps/lookup_server_connector/l10n/is.json new file mode 100644 index 00000000000..c79cc0578cd --- /dev/null +++ b/apps/lookup_server_connector/l10n/is.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Tengi fyrir uppflettingaþjón", + "Sync public account information with the lookup server" : "Samstilltu opinberar upplýsingar notendaaðganga við uppflettingaþjóninn" +},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/it.js b/apps/lookup_server_connector/l10n/it.js index d99bd8acd6b..3e1baf6c84a 100644 --- a/apps/lookup_server_connector/l10n/it.js +++ b/apps/lookup_server_connector/l10n/it.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Connettore server di ricerca", - "Sync public user information with the lookup server" : "Sincronizza le informazioni utente pubbliche con il server di ricerca" + "Sync public account information with the lookup server" : "Sincronizza le informazioni account pubbliche con il server di ricerca" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/lookup_server_connector/l10n/it.json b/apps/lookup_server_connector/l10n/it.json index 291e8e4bab9..bea065d1dbc 100644 --- a/apps/lookup_server_connector/l10n/it.json +++ b/apps/lookup_server_connector/l10n/it.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Connettore server di ricerca", - "Sync public user information with the lookup server" : "Sincronizza le informazioni utente pubbliche con il server di ricerca" -},"pluralForm" :"nplurals=2; plural=(n != 1);" + "Sync public account information with the lookup server" : "Sincronizza le informazioni account pubbliche con il server di ricerca" +},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/ja.js b/apps/lookup_server_connector/l10n/ja.js index 972f628996e..0732675d118 100644 --- a/apps/lookup_server_connector/l10n/ja.js +++ b/apps/lookup_server_connector/l10n/ja.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "ルックアップサーバーコネクタ", - "Sync public user information with the lookup server" : "公開されたユーザー情報をルックアップサーバーに同期" + "Sync public account information with the lookup server" : "公開アカウント情報をルックアップサーバーと同期する" }, "nplurals=1; plural=0;"); diff --git a/apps/lookup_server_connector/l10n/ja.json b/apps/lookup_server_connector/l10n/ja.json index 2cb49953f1d..aa5371d362a 100644 --- a/apps/lookup_server_connector/l10n/ja.json +++ b/apps/lookup_server_connector/l10n/ja.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "ルックアップサーバーコネクタ", - "Sync public user information with the lookup server" : "公開されたユーザー情報をルックアップサーバーに同期" + "Sync public account information with the lookup server" : "公開アカウント情報をルックアップサーバーと同期する" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/ko.js b/apps/lookup_server_connector/l10n/ko.js index 4b6461bad6c..af990501369 100644 --- a/apps/lookup_server_connector/l10n/ko.js +++ b/apps/lookup_server_connector/l10n/ko.js @@ -1,7 +1,7 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Lockup 서버 연결", - "Sync public user information with the lookup server" : "Lockup 서버와 공개 사용자 정보 교환" + "Lookup Server Connector" : "Lookup Server Connector", + "Sync public account information with the lookup server" : "공용 계정 정보를 Lookup Server와 동기화합니다" }, "nplurals=1; plural=0;"); diff --git a/apps/lookup_server_connector/l10n/ko.json b/apps/lookup_server_connector/l10n/ko.json index 62b653776ca..3626f521954 100644 --- a/apps/lookup_server_connector/l10n/ko.json +++ b/apps/lookup_server_connector/l10n/ko.json @@ -1,5 +1,5 @@ { "translations": { - "Lookup Server Connector" : "Lockup 서버 연결", - "Sync public user information with the lookup server" : "Lockup 서버와 공개 사용자 정보 교환" + "Lookup Server Connector" : "Lookup Server Connector", + "Sync public account information with the lookup server" : "공용 계정 정보를 Lookup Server와 동기화합니다" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/lt_LT.js b/apps/lookup_server_connector/l10n/lt_LT.js index ce562ad7bd6..9786ad6f788 100644 --- a/apps/lookup_server_connector/l10n/lt_LT.js +++ b/apps/lookup_server_connector/l10n/lt_LT.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Vardų serverio prievadas", - "Sync public user information with the lookup server" : "Sinchronizuoti viešą naudotojo informaciją su vardų serveriu" + "Lookup Server Connector" : "Vardų serverio prievadas" }, "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"); diff --git a/apps/lookup_server_connector/l10n/lt_LT.json b/apps/lookup_server_connector/l10n/lt_LT.json index f2289753ec8..ff6f714deb3 100644 --- a/apps/lookup_server_connector/l10n/lt_LT.json +++ b/apps/lookup_server_connector/l10n/lt_LT.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "Vardų serverio prievadas", - "Sync public user information with the lookup server" : "Sinchronizuoti viešą naudotojo informaciją su vardų serveriu" + "Lookup Server Connector" : "Vardų serverio prievadas" },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/nb.js b/apps/lookup_server_connector/l10n/nb.js new file mode 100644 index 00000000000..1d2868d5aa0 --- /dev/null +++ b/apps/lookup_server_connector/l10n/nb.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Tilkoble oppslagsserver", + "Sync public account information with the lookup server" : "Synkroniser offentlig kontoinformasjon med oppslagsserveren" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/nb.json b/apps/lookup_server_connector/l10n/nb.json new file mode 100644 index 00000000000..f3d01a7cbd7 --- /dev/null +++ b/apps/lookup_server_connector/l10n/nb.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Tilkoble oppslagsserver", + "Sync public account information with the lookup server" : "Synkroniser offentlig kontoinformasjon med oppslagsserveren" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/nl.js b/apps/lookup_server_connector/l10n/nl.js index a694e9001bf..1920077f2b3 100644 --- a/apps/lookup_server_connector/l10n/nl.js +++ b/apps/lookup_server_connector/l10n/nl.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Lookup Server Connector", - "Sync public user information with the lookup server" : "Synchroniseer openbare gebruikersinformatie met de opzoekserver" + "Sync public account information with the lookup server" : "Synchroniseer publieke accountinformatie met de opzoekserver" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/nl.json b/apps/lookup_server_connector/l10n/nl.json index 1f70f5944f0..6632ef6bff3 100644 --- a/apps/lookup_server_connector/l10n/nl.json +++ b/apps/lookup_server_connector/l10n/nl.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Lookup Server Connector", - "Sync public user information with the lookup server" : "Synchroniseer openbare gebruikersinformatie met de opzoekserver" + "Sync public account information with the lookup server" : "Synchroniseer publieke accountinformatie met de opzoekserver" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/pl.js b/apps/lookup_server_connector/l10n/pl.js index d157f1f6cd5..a6b7d8211a2 100644 --- a/apps/lookup_server_connector/l10n/pl.js +++ b/apps/lookup_server_connector/l10n/pl.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Łącze serwera wyszukiwania", - "Sync public user information with the lookup server" : "Synchronizuj publiczne informacje o użytkowniku z serwerem wyszukiwania" + "Sync public account information with the lookup server" : "Synchronizuj informacje o koncie publicznym z serwerem wyszukiwania" }, "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);"); diff --git a/apps/lookup_server_connector/l10n/pl.json b/apps/lookup_server_connector/l10n/pl.json index c81f5b423d6..348941ae549 100644 --- a/apps/lookup_server_connector/l10n/pl.json +++ b/apps/lookup_server_connector/l10n/pl.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Łącze serwera wyszukiwania", - "Sync public user information with the lookup server" : "Synchronizuj publiczne informacje o użytkowniku z serwerem wyszukiwania" + "Sync public account information with the lookup server" : "Synchronizuj informacje o koncie publicznym z serwerem wyszukiwania" },"pluralForm" :"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);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/pt_BR.js b/apps/lookup_server_connector/l10n/pt_BR.js index 2ed820604e4..d0d576f09cb 100644 --- a/apps/lookup_server_connector/l10n/pt_BR.js +++ b/apps/lookup_server_connector/l10n/pt_BR.js @@ -1,7 +1,7 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Pesquisar por conector de servidor", - "Sync public user information with the lookup server" : "Sincronizar informações públicas do usuário com o servidor de pesquisa" + "Lookup Server Connector" : "Conector de Servidor de Pesquisa", + "Sync public account information with the lookup server" : "Sincronize informações de contas públicas com o servidor de pesquisa" }, -"nplurals=2; plural=(n > 1);"); +"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/lookup_server_connector/l10n/pt_BR.json b/apps/lookup_server_connector/l10n/pt_BR.json index 66a148a35f6..5b2f2790eff 100644 --- a/apps/lookup_server_connector/l10n/pt_BR.json +++ b/apps/lookup_server_connector/l10n/pt_BR.json @@ -1,5 +1,5 @@ { "translations": { - "Lookup Server Connector" : "Pesquisar por conector de servidor", - "Sync public user information with the lookup server" : "Sincronizar informações públicas do usuário com o servidor de pesquisa" -},"pluralForm" :"nplurals=2; plural=(n > 1);" + "Lookup Server Connector" : "Conector de Servidor de Pesquisa", + "Sync public account information with the lookup server" : "Sincronize informações de contas públicas com o servidor de pesquisa" +},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/ro.js b/apps/lookup_server_connector/l10n/ro.js index c798569a01f..8462f9f583a 100644 --- a/apps/lookup_server_connector/l10n/ro.js +++ b/apps/lookup_server_connector/l10n/ro.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Căutați conectorul serverului", - "Sync public user information with the lookup server" : "Sincronizați informațiile de utilizator publice cu serverul de căutare" + "Lookup Server Connector" : "Căutați conectorul serverului" }, "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/lookup_server_connector/l10n/ro.json b/apps/lookup_server_connector/l10n/ro.json index e4f419ce177..de4a5902761 100644 --- a/apps/lookup_server_connector/l10n/ro.json +++ b/apps/lookup_server_connector/l10n/ro.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "Căutați conectorul serverului", - "Sync public user information with the lookup server" : "Sincronizați informațiile de utilizator publice cu serverul de căutare" + "Lookup Server Connector" : "Căutați conectorul serverului" },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/ru.js b/apps/lookup_server_connector/l10n/ru.js index c14cc73b4af..f020ac63ff9 100644 --- a/apps/lookup_server_connector/l10n/ru.js +++ b/apps/lookup_server_connector/l10n/ru.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Коннектор сервера поиска", - "Sync public user information with the lookup server" : "Синхронизация общедоступной пользовательской информации с сервером поиска" + "Sync public account information with the lookup server" : "Синхронизируйте информацию об общедоступной учетной записи с поисковым сервером" }, "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);"); diff --git a/apps/lookup_server_connector/l10n/ru.json b/apps/lookup_server_connector/l10n/ru.json index 8542e737ec7..0dafb138dee 100644 --- a/apps/lookup_server_connector/l10n/ru.json +++ b/apps/lookup_server_connector/l10n/ru.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Коннектор сервера поиска", - "Sync public user information with the lookup server" : "Синхронизация общедоступной пользовательской информации с сервером поиска" + "Sync public account information with the lookup server" : "Синхронизируйте информацию об общедоступной учетной записи с поисковым сервером" },"pluralForm" :"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);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/sc.js b/apps/lookup_server_connector/l10n/sc.js index a8abd991127..b52b3e016be 100644 --- a/apps/lookup_server_connector/l10n/sc.js +++ b/apps/lookup_server_connector/l10n/sc.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Chirca su Serbidore de Connessione", - "Sync public user information with the lookup server" : "Sincroniza s'informatzione pùblica de s'utente con su serbidore de chirca" + "Lookup Server Connector" : "Chirca su Serbidore de Connessione" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/sc.json b/apps/lookup_server_connector/l10n/sc.json index 711023c8ff8..64573a67204 100644 --- a/apps/lookup_server_connector/l10n/sc.json +++ b/apps/lookup_server_connector/l10n/sc.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "Chirca su Serbidore de Connessione", - "Sync public user information with the lookup server" : "Sincroniza s'informatzione pùblica de s'utente con su serbidore de chirca" + "Lookup Server Connector" : "Chirca su Serbidore de Connessione" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/sk.js b/apps/lookup_server_connector/l10n/sk.js index 5b3ea671a68..1deb2429227 100644 --- a/apps/lookup_server_connector/l10n/sk.js +++ b/apps/lookup_server_connector/l10n/sk.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Napojenie na vyhľadávací server", - "Sync public user information with the lookup server" : "Synchronizácia verejných informácií o používateľovi s vyhľadávacím serverom" + "Sync public account information with the lookup server" : "Synchronizujte informácie o verejnom účte s vyhľadávacím serverom" }, "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"); diff --git a/apps/lookup_server_connector/l10n/sk.json b/apps/lookup_server_connector/l10n/sk.json index 6c201ffab11..1af2330929a 100644 --- a/apps/lookup_server_connector/l10n/sk.json +++ b/apps/lookup_server_connector/l10n/sk.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Napojenie na vyhľadávací server", - "Sync public user information with the lookup server" : "Synchronizácia verejných informácií o používateľovi s vyhľadávacím serverom" + "Sync public account information with the lookup server" : "Synchronizujte informácie o verejnom účte s vyhľadávacím serverom" },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/sl.js b/apps/lookup_server_connector/l10n/sl.js index 41d13ed5f75..b0075089f39 100644 --- a/apps/lookup_server_connector/l10n/sl.js +++ b/apps/lookup_server_connector/l10n/sl.js @@ -1,7 +1,6 @@ OC.L10N.register( "lookup_server_connector", { - "Lookup Server Connector" : "Povezovalnik z iskalnim strežnikom", - "Sync public user information with the lookup server" : "Usklajevanje javnih podatkov o uporabnikih prek iskalnega stražnika" + "Lookup Server Connector" : "Povezovalnik z iskalnim strežnikom" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/lookup_server_connector/l10n/sl.json b/apps/lookup_server_connector/l10n/sl.json index 3c64cd93d8e..97abd44b759 100644 --- a/apps/lookup_server_connector/l10n/sl.json +++ b/apps/lookup_server_connector/l10n/sl.json @@ -1,5 +1,4 @@ { "translations": { - "Lookup Server Connector" : "Povezovalnik z iskalnim strežnikom", - "Sync public user information with the lookup server" : "Usklajevanje javnih podatkov o uporabnikih prek iskalnega stražnika" + "Lookup Server Connector" : "Povezovalnik z iskalnim strežnikom" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/sr.js b/apps/lookup_server_connector/l10n/sr.js index c5b0a6d6cdf..caebd3ca3f9 100644 --- a/apps/lookup_server_connector/l10n/sr.js +++ b/apps/lookup_server_connector/l10n/sr.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Lookup Server Connector", - "Sync public user information with the lookup server" : "Синхронизује јавне информације о кориснику са референтним сервером" + "Sync public account information with the lookup server" : "Синхронизује јавне информације о налогу са сервером за претрагу" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/lookup_server_connector/l10n/sr.json b/apps/lookup_server_connector/l10n/sr.json index 2003bc6495b..dbb2a02137f 100644 --- a/apps/lookup_server_connector/l10n/sr.json +++ b/apps/lookup_server_connector/l10n/sr.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Lookup Server Connector", - "Sync public user information with the lookup server" : "Синхронизује јавне информације о кориснику са референтним сервером" + "Sync public account information with the lookup server" : "Синхронизује јавне информације о налогу са сервером за претрагу" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/sv.js b/apps/lookup_server_connector/l10n/sv.js new file mode 100644 index 00000000000..77aa091c043 --- /dev/null +++ b/apps/lookup_server_connector/l10n/sv.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Uppslagsserverförbindelse", + "Sync public account information with the lookup server" : "Synkronisera offentlig användarinformation med uppslagsservern" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/sv.json b/apps/lookup_server_connector/l10n/sv.json new file mode 100644 index 00000000000..1f454e7a4f2 --- /dev/null +++ b/apps/lookup_server_connector/l10n/sv.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Uppslagsserverförbindelse", + "Sync public account information with the lookup server" : "Synkronisera offentlig användarinformation med uppslagsservern" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/sw.js b/apps/lookup_server_connector/l10n/sw.js new file mode 100644 index 00000000000..8d9139a950d --- /dev/null +++ b/apps/lookup_server_connector/l10n/sw.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Tafuta Kiunganishi cha Seva", + "Sync public account information with the lookup server" : "Sawazisha maelezo ya akaunti ya umma na seva ya utafutaji" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/sw.json b/apps/lookup_server_connector/l10n/sw.json new file mode 100644 index 00000000000..fa0f78432a9 --- /dev/null +++ b/apps/lookup_server_connector/l10n/sw.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Tafuta Kiunganishi cha Seva", + "Sync public account information with the lookup server" : "Sawazisha maelezo ya akaunti ya umma na seva ya utafutaji" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/tr.js b/apps/lookup_server_connector/l10n/tr.js index aa0081295f2..da3810a7cb2 100644 --- a/apps/lookup_server_connector/l10n/tr.js +++ b/apps/lookup_server_connector/l10n/tr.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "Tarama Sunucusu Bağlantısı", - "Sync public user information with the lookup server" : "Herkese açık kullanıcı bilgilerini tarama sunucusu ile eşitler" + "Sync public account information with the lookup server" : "Herkese açık hesap bilgilerini tarama sunucusu ile eşitler" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/lookup_server_connector/l10n/tr.json b/apps/lookup_server_connector/l10n/tr.json index bd6a8cbbb87..04ee7976903 100644 --- a/apps/lookup_server_connector/l10n/tr.json +++ b/apps/lookup_server_connector/l10n/tr.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "Tarama Sunucusu Bağlantısı", - "Sync public user information with the lookup server" : "Herkese açık kullanıcı bilgilerini tarama sunucusu ile eşitler" + "Sync public account information with the lookup server" : "Herkese açık hesap bilgilerini tarama sunucusu ile eşitler" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/ug.js b/apps/lookup_server_connector/l10n/ug.js new file mode 100644 index 00000000000..b77a9c6c89a --- /dev/null +++ b/apps/lookup_server_connector/l10n/ug.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "ئىزدەش مۇلازىمىتىرى ئۇلىغۇچ", + "Sync public account information with the lookup server" : "ئىزدەش مۇلازىمىتىرى بىلەن ئاممىۋى ھېسابات ئۇچۇرلىرىنى ماسقەدەملەڭ" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/lookup_server_connector/l10n/ug.json b/apps/lookup_server_connector/l10n/ug.json new file mode 100644 index 00000000000..db2b2fe7ee8 --- /dev/null +++ b/apps/lookup_server_connector/l10n/ug.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "ئىزدەش مۇلازىمىتىرى ئۇلىغۇچ", + "Sync public account information with the lookup server" : "ئىزدەش مۇلازىمىتىرى بىلەن ئاممىۋى ھېسابات ئۇچۇرلىرىنى ماسقەدەملەڭ" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/uk.js b/apps/lookup_server_connector/l10n/uk.js new file mode 100644 index 00000000000..33131198f53 --- /dev/null +++ b/apps/lookup_server_connector/l10n/uk.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "lookup_server_connector", + { + "Lookup Server Connector" : "Конектор сервера пошуку", + "Sync public account information with the lookup server" : "Синхронізовувати публічну інформацію облікового запису з пошуковим сервером" +}, +"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"); diff --git a/apps/lookup_server_connector/l10n/uk.json b/apps/lookup_server_connector/l10n/uk.json new file mode 100644 index 00000000000..39977bf8d98 --- /dev/null +++ b/apps/lookup_server_connector/l10n/uk.json @@ -0,0 +1,5 @@ +{ "translations": { + "Lookup Server Connector" : "Конектор сервера пошуку", + "Sync public account information with the lookup server" : "Синхронізовувати публічну інформацію облікового запису з пошуковим сервером" +},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);" +}
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/zh_CN.js b/apps/lookup_server_connector/l10n/zh_CN.js index 2e7c8d960cc..97985c68c39 100644 --- a/apps/lookup_server_connector/l10n/zh_CN.js +++ b/apps/lookup_server_connector/l10n/zh_CN.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "查找服务器连接器", - "Sync public user information with the lookup server" : "将公共用户信息与查找服务器同步" + "Sync public account information with the lookup server" : "将公共账号信息与查找服务器同步" }, "nplurals=1; plural=0;"); diff --git a/apps/lookup_server_connector/l10n/zh_CN.json b/apps/lookup_server_connector/l10n/zh_CN.json index fba43f5cf3b..2970cabdceb 100644 --- a/apps/lookup_server_connector/l10n/zh_CN.json +++ b/apps/lookup_server_connector/l10n/zh_CN.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "查找服务器连接器", - "Sync public user information with the lookup server" : "将公共用户信息与查找服务器同步" + "Sync public account information with the lookup server" : "将公共账号信息与查找服务器同步" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/zh_HK.js b/apps/lookup_server_connector/l10n/zh_HK.js index cf8300ad9bb..98be8fed284 100644 --- a/apps/lookup_server_connector/l10n/zh_HK.js +++ b/apps/lookup_server_connector/l10n/zh_HK.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "查找伺服器連接器", - "Sync public user information with the lookup server" : "將公共用戶信息與查找伺服器同步" + "Sync public account information with the lookup server" : "將公共帳戶信息與查找伺服器同步" }, "nplurals=1; plural=0;"); diff --git a/apps/lookup_server_connector/l10n/zh_HK.json b/apps/lookup_server_connector/l10n/zh_HK.json index d3bfcb44a0d..33c8690c4d9 100644 --- a/apps/lookup_server_connector/l10n/zh_HK.json +++ b/apps/lookup_server_connector/l10n/zh_HK.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "查找伺服器連接器", - "Sync public user information with the lookup server" : "將公共用戶信息與查找伺服器同步" + "Sync public account information with the lookup server" : "將公共帳戶信息與查找伺服器同步" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/l10n/zh_TW.js b/apps/lookup_server_connector/l10n/zh_TW.js index 92041ef57e0..eb11ea61f00 100644 --- a/apps/lookup_server_connector/l10n/zh_TW.js +++ b/apps/lookup_server_connector/l10n/zh_TW.js @@ -2,6 +2,6 @@ OC.L10N.register( "lookup_server_connector", { "Lookup Server Connector" : "查詢伺服器連接程式", - "Sync public user information with the lookup server" : "將公開使用者資訊與查詢伺服器同步" + "Sync public account information with the lookup server" : "將公開帳號資訊與查詢伺服器同步" }, "nplurals=1; plural=0;"); diff --git a/apps/lookup_server_connector/l10n/zh_TW.json b/apps/lookup_server_connector/l10n/zh_TW.json index 84e8d7dc1b7..fc1bbad09e2 100644 --- a/apps/lookup_server_connector/l10n/zh_TW.json +++ b/apps/lookup_server_connector/l10n/zh_TW.json @@ -1,5 +1,5 @@ { "translations": { "Lookup Server Connector" : "查詢伺服器連接程式", - "Sync public user information with the lookup server" : "將公開使用者資訊與查詢伺服器同步" + "Sync public account information with the lookup server" : "將公開帳號資訊與查詢伺服器同步" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/lookup_server_connector/lib/AppInfo/Application.php b/apps/lookup_server_connector/lib/AppInfo/Application.php index 806f3e327aa..4a43e925970 100644 --- a/apps/lookup_server_connector/lib/AppInfo/Application.php +++ b/apps/lookup_server_connector/lib/AppInfo/Application.php @@ -3,41 +3,20 @@ declare(strict_types=1); /** - * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com> - * - * @author Christoph Wurst <christoph@winzerhof-wurst.at> - * @author Joas Schilling <coding@schilljs.com> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\LookupServerConnector\AppInfo; use Closure; use OCA\LookupServerConnector\UpdateLookupServer; +use OCP\Accounts\UserUpdatedEvent; use OCP\AppFramework\App; use OCP\AppFramework\Bootstrap\IBootContext; use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IRegistrationContext; -use OCP\AppFramework\IAppContainer; -use OCP\IUser; -use Symfony\Component\EventDispatcher\EventDispatcher; -use Symfony\Component\EventDispatcher\GenericEvent; +use OCP\EventDispatcher\IEventDispatcher; +use Psr\Container\ContainerInterface; class Application extends App implements IBootstrap { public const APP_ID = 'lookup_server_connector'; @@ -56,15 +35,12 @@ class Application extends App implements IBootstrap { /** * @todo move the OCP events and then move the registration to `register` */ - private function registerEventListeners(EventDispatcher $dispatcher, - IAppContainer $appContainer): void { - $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) { - /** @var IUser $user */ - $user = $event->getSubject(); - + private function registerEventListeners(IEventDispatcher $dispatcher, + ContainerInterface $appContainer): void { + $dispatcher->addListener(UserUpdatedEvent::class, function (UserUpdatedEvent $event) use ($appContainer): void { /** @var UpdateLookupServer $updateLookupServer */ $updateLookupServer = $appContainer->get(UpdateLookupServer::class); - $updateLookupServer->userUpdated($user); + $updateLookupServer->userUpdated($event->getUser()); }); } } diff --git a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php index f905f9173b6..08fe0b3fa2b 100644 --- a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php +++ b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php @@ -3,32 +3,8 @@ declare(strict_types=1); /** - * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org> - * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com> - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Bjoern Schiessle <bjoern@schiessle.org> - * @author Joas Schilling <coding@schilljs.com> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Vincent Petry <vincent@nextcloud.com> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\LookupServerConnector\BackgroundJobs; @@ -39,27 +15,14 @@ use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\Job; use OCP\Http\Client\IClientService; use OCP\IConfig; -use OCP\ILogger; use OCP\IUser; use OCP\IUserManager; class RetryJob extends Job { - /** @var IClientService */ - private $clientService; - /** @var string */ - private $lookupServer; - /** @var IConfig */ - private $config; - /** @var IUserManager */ - private $userManager; - /** @var IAccountManager */ - private $accountManager; - /** @var Signer */ - private $signer; - /** @var int */ - protected $retries = 0; - /** @var bool */ - protected $retainJob = false; + private string $lookupServer; + private Signer $signer; + protected int $retries = 0; + protected bool $retainJob = false; /** * @param ITimeFactory $time @@ -69,20 +32,18 @@ class RetryJob extends Job { * @param IAccountManager $accountManager * @param Signer $signer */ - public function __construct(ITimeFactory $time, - IClientService $clientService, - IConfig $config, - IUserManager $userManager, - IAccountManager $accountManager, - Signer $signer) { + public function __construct( + ITimeFactory $time, + private IClientService $clientService, + private IConfig $config, + private IUserManager $userManager, + private IAccountManager $accountManager, + Signer $signer, + ) { parent::__construct($time); - $this->clientService = $clientService; - $this->config = $config; - $this->userManager = $userManager; - $this->accountManager = $accountManager; $this->signer = $signer; - $this->lookupServer = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com'); + $this->lookupServer = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com'); if (!empty($this->lookupServer)) { $this->lookupServer = rtrim($this->lookupServer, '/'); $this->lookupServer .= '/users'; @@ -90,19 +51,16 @@ class RetryJob extends Job { } /** - * run the job, then remove it from the jobList - * - * @param IJobList $jobList - * @param ILogger|null $logger + * Run the job, then remove it from the jobList */ - public function execute(IJobList $jobList, ILogger $logger = null): void { + public function start(IJobList $jobList): void { if (!isset($this->argument['userId'])) { // Old background job without user id, just drop it. $jobList->remove($this, $this->argument); return; } - $this->retries = (int) $this->config->getUserValue($this->argument['userId'], 'lookup_server_connector', 'update_retries', 0); + $this->retries = (int)$this->config->getUserValue($this->argument['userId'], 'lookup_server_connector', 'update_retries', '0'); if ($this->shouldRemoveBackgroundJob()) { $jobList->remove($this, $this->argument); @@ -110,7 +68,7 @@ class RetryJob extends Job { } if ($this->shouldRun()) { - parent::execute($jobList, $logger); + parent::start($jobList); if (!$this->retainJob) { $jobList->remove($this, $this->argument); } @@ -124,14 +82,14 @@ class RetryJob extends Job { * - no valid lookup server URL given * - lookup server was disabled by the admin * - max retries are reached (set to 5) - * - * @return bool */ protected function shouldRemoveBackgroundJob(): bool { - return $this->config->getSystemValueBool('has_internet_connection', true) === false || - $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') === '' || - $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' || - $this->retries >= 5; + // TODO: Remove global scale condition once lookup server is used for non-global scale federation + // return $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no') !== 'yes' + return !$this->config->getSystemValueBool('gs.enabled', false) + || $this->config->getSystemValueBool('has_internet_connection', true) === false + || $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') === '' + || $this->retries >= 5; } protected function shouldRun(): bool { @@ -193,7 +151,7 @@ class RetryJob extends Job { $user->getUID(), 'lookup_server_connector', 'update_retries', - $this->retries + 1 + (string)($this->retries + 1), ); } } @@ -202,9 +160,13 @@ class RetryJob extends Job { $account = $this->accountManager->getAccount($user); $publicData = []; - foreach ($account->getProperties() as $property) { + foreach ($account->getAllProperties() as $property) { if ($property->getScope() === IAccountManager::SCOPE_PUBLISHED) { - $publicData[$property->getName()] = $property->getValue(); + $publicData[$property->getName()] = [ + 'value' => $property->getValue(), + 'verified' => $property->getVerified(), + 'signature' => $property->getVerificationData(), + ]; } } diff --git a/apps/lookup_server_connector/lib/UpdateLookupServer.php b/apps/lookup_server_connector/lib/UpdateLookupServer.php index ec528e6effa..dac3e8a80fa 100644 --- a/apps/lookup_server_connector/lib/UpdateLookupServer.php +++ b/apps/lookup_server_connector/lib/UpdateLookupServer.php @@ -3,29 +3,8 @@ declare(strict_types=1); /** - * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org> - * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch> - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Bjoern Schiessle <bjoern@schiessle.org> - * @author Joas Schilling <coding@schilljs.com> - * @author Lukas Reschke <lukas@statuscode.ch> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\LookupServerConnector; @@ -40,19 +19,14 @@ use OCP\IUser; * @package OCA\LookupServerConnector */ class UpdateLookupServer { - /** @var IConfig */ - private $config; - /** @var IJobList */ - private $jobList; - /** * @param IJobList $jobList * @param IConfig $config */ - public function __construct(IJobList $jobList, - IConfig $config) { - $this->config = $config; - $this->jobList = $jobList; + public function __construct( + private IJobList $jobList, + private IConfig $config, + ) { } /** @@ -82,8 +56,9 @@ class UpdateLookupServer { * @return bool */ private function shouldUpdateLookupServer(): bool { - return $this->config->getSystemValueBool('has_internet_connection', true) === true && - $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') === 'yes' && - $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== ''; + // TODO: Consider reenable for non-global-scale setups by checking "'files_sharing', 'lookupServerUploadEnabled'" instead of "gs.enabled" + return $this->config->getSystemValueBool('gs.enabled', false) + && $this->config->getSystemValueBool('has_internet_connection', true) + && $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== ''; } } |