summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/fr.js2
-rw-r--r--lib/l10n/fr.json2
-rw-r--r--lib/l10n/sq.js4
-rw-r--r--lib/l10n/sq.json4
-rw-r--r--lib/private/templatelayout.php2
-rw-r--r--lib/private/updater.php20
6 files changed, 20 insertions, 14 deletions
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index a4692c268b4..8dd3695d0c2 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -108,7 +108,7 @@ OC.L10N.register(
"Sharing %s failed, because the user %s is the original sharer" : "Le partage de %s a échoué car l'utilisateur %s est l'utilisateur à l'origine du partage.",
"Sharing %s failed, because the permissions exceed permissions granted to %s" : "Le partage de %s a échoué car les permissions dépassent celles accordées à %s",
"Sharing %s failed, because resharing is not allowed" : "Le partage de %s a échoué car le repartage n'est pas autorisé",
- "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage de %s a échoué car la source n'a pas été trouvée pour le partage %s.",
+ "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage de %s a échoué car le service %s n'a pas trouvé sa source..",
"Sharing %s failed, because the file could not be found in the file cache" : "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.",
"Could not find category \"%s\"" : "Impossible de trouver la catégorie \"%s\"",
"Apps" : "Applications",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 5ee807080cf..16744dbd062 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -106,7 +106,7 @@
"Sharing %s failed, because the user %s is the original sharer" : "Le partage de %s a échoué car l'utilisateur %s est l'utilisateur à l'origine du partage.",
"Sharing %s failed, because the permissions exceed permissions granted to %s" : "Le partage de %s a échoué car les permissions dépassent celles accordées à %s",
"Sharing %s failed, because resharing is not allowed" : "Le partage de %s a échoué car le repartage n'est pas autorisé",
- "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage de %s a échoué car la source n'a pas été trouvée pour le partage %s.",
+ "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage de %s a échoué car le service %s n'a pas trouvé sa source..",
"Sharing %s failed, because the file could not be found in the file cache" : "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.",
"Could not find category \"%s\"" : "Impossible de trouver la catégorie \"%s\"",
"Apps" : "Applications",
diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js
index 80db3f87c50..88d719a35dd 100644
--- a/lib/l10n/sq.js
+++ b/lib/l10n/sq.js
@@ -14,6 +14,7 @@ OC.L10N.register(
"last year" : "vitin e shkuar",
"seconds ago" : "sekonda më parë",
"web services under your control" : "shërbime web nën kontrollin tënd",
+ "File name contains at least one invalid character" : "Emri i kartelës përmban të paktën një shenjë të pavlefshme",
"Application is not enabled" : "Programi nuk është i aktivizuar.",
"Authentication error" : "Veprim i gabuar gjatë vërtetimit të identitetit",
"Token expired. Please reload page." : "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen.",
@@ -34,6 +35,7 @@ OC.L10N.register(
"Could not find category \"%s\"" : "Kategoria \"%s\" nuk u gjet",
"Apps" : "App",
"A valid username must be provided" : "Duhet të jepni një emër të vlefshëm përdoruesi",
- "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm"
+ "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Kjo ka gjasa të jetë shkaktuar nga një fshehtinë/përshpejtues i tillë si Zend OPcache ose eAccelerator."
},
"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json
index 1fc2cb01c58..ede914e45ad 100644
--- a/lib/l10n/sq.json
+++ b/lib/l10n/sq.json
@@ -12,6 +12,7 @@
"last year" : "vitin e shkuar",
"seconds ago" : "sekonda më parë",
"web services under your control" : "shërbime web nën kontrollin tënd",
+ "File name contains at least one invalid character" : "Emri i kartelës përmban të paktën një shenjë të pavlefshme",
"Application is not enabled" : "Programi nuk është i aktivizuar.",
"Authentication error" : "Veprim i gabuar gjatë vërtetimit të identitetit",
"Token expired. Please reload page." : "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen.",
@@ -32,6 +33,7 @@
"Could not find category \"%s\"" : "Kategoria \"%s\" nuk u gjet",
"Apps" : "App",
"A valid username must be provided" : "Duhet të jepni një emër të vlefshëm përdoruesi",
- "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm"
+ "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Kjo ka gjasa të jetë shkaktuar nga një fshehtinë/përshpejtues i tillë si Zend OPcache ose eAccelerator."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 43c83dea815..7d16823d2a8 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -79,7 +79,7 @@ class OC_TemplateLayout extends OC_Template {
if($this->config->getSystemValue('updatechecker', true) === true &&
OC_User::isAdminUser(OC_User::getUser())) {
$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
- \OC::$server->getConfig());
+ \OC::$server->getConfig(), \OC::$server->getLogger());
$data = $updater->check();
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 8aa8b0703d7..70d68863788 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -32,7 +32,6 @@
namespace OC;
-use OC\Core\Command\Log\Manage;
use OC\Hooks\BasicEmitter;
use OC_App;
use OC_Installer;
@@ -199,15 +198,13 @@ class Updater extends BasicEmitter {
$installedVersion = $this->config->getSystemValue('version', '0.0.0');
$currentVersion = implode('.', \OC_Util::getVersion());
- if ($this->log) {
- $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));
- }
+ $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));
$success = true;
try {
$this->doUpgrade($currentVersion, $installedVersion);
} catch (\Exception $exception) {
- \OCP\Util::logException('update', $exception);
+ $this->log->logException($exception, ['app' => 'core']);
$this->emit('\OC\Updater', 'failure', array(get_class($exception) . ': ' .$exception->getMessage()));
$success = false;
}
@@ -235,6 +232,7 @@ class Updater extends BasicEmitter {
private function getAllowedPreviousVersion() {
// this should really be a JSON file
require \OC::$SERVERROOT . '/version.php';
+ /** @var array $OC_VersionCanBeUpgradedFrom */
return implode('.', $OC_VersionCanBeUpgradedFrom);
}
@@ -497,11 +495,15 @@ class Updater extends BasicEmitter {
*/
private function upgradeAppStoreApps(array $disabledApps) {
foreach($disabledApps as $app) {
- if (OC_Installer::isUpdateAvailable($app)) {
- $ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', '');
+ try {
+ if (OC_Installer::isUpdateAvailable($app)) {
+ $ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', '');
- $this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app));
- OC_Installer::updateAppByOCSId($ocsId);
+ $this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app));
+ OC_Installer::updateAppByOCSId($ocsId);
+ }
+ } catch (\Exception $ex) {
+ $this->log->logException($ex, ['app' => 'core']);
}
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 12:05:45 +0000