Skip to content

Commit 7b87f62

Browse files
marcelklehrmarcelklehr
authored
Merge branch 'master' into perf/improve-performance
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
2 parents 08e67ba + 7f8ff43 commit 7b87f62

10 files changed

Lines changed: 482 additions & 56 deletions

File tree

‎l10n/id.js‎

Lines changed: 220 additions & 18 deletions
Large diffs are not rendered by default.

‎l10n/id.json‎

Lines changed: 220 additions & 18 deletions
Large diffs are not rendered by default.

‎l10n/it.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ OC.L10N.register(
4848
"Copy link" : "Copia colleg.",
4949
"Move" : "Sposta",
5050
"Add to folders" : "Aggiungi a cartelle",
51+
"Delete bookmark permanently" : "Elimina definitivamente il segnalibro",
5152
"Content pending" : "Contenuti in sospeso",
5253
"This content is being downloaded for offline use. Please check back later." : "Questo contenuto è in scaricamento per l'utilizzo non in linea. Torna più tardi.",
5354
"Bookmarked {time} ago" : "Aggiunto ai segnalibri {time} fa",
@@ -75,6 +76,7 @@ OC.L10N.register(
7576
"Sort by manual order" : "Ordina manualmente",
7677
"Sort by URL" : "Ordina per URL",
7778
"RSS feed copied" : "Fonte RSS copiata",
79+
"Trash Bin" : "Cestino",
7880
"Go back" : "Indietro",
7981
"Share folder" : "Condividi cartella",
8082
"Select one or more tags" : "Seleziona una o più etichette",
@@ -104,6 +106,7 @@ OC.L10N.register(
104106
"Shared by {user}" : "Condiviso da {user}",
105107
"Rename folder" : "Rinomina cartella",
106108
"Move folder" : "Sposta cartella",
109+
"Restore folder" : "Ripristina cartella",
107110
"Choose folder" : "Scegli cartella",
108111
"Submit" : "Invia",
109112
"Cancel" : "Annulla",
@@ -112,6 +115,7 @@ OC.L10N.register(
112115
"Importing bookmarks" : "Importazione segnalibri",
113116
"Moving selection" : "Spostamento selezione",
114117
"Adding selection to folders" : "Aggiunta della selezione alle cartelle",
118+
"Emptying trashbin" : "Svuotamento del cestino",
115119
"_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Spostamento di %n cartella e di alcuni segnalibri","Spostamento di %n cartelle e alcuni segnalibri","Spostamento di %n cartelle e alcuni segnalibri"],
116120
"_Moving %n folder_::_Moving %n folders_" : ["Spostamento di %n cartella","Spostamento di %n cartelle","Spostamento di %n cartelle"],
117121
"_Moving %n bookmark_::_Moving %n bookmarks_" : ["Spostamento di %n segnalibro","Spostamento di %n segnalibri","Spostamento di %n segnalibri"],
@@ -126,13 +130,15 @@ OC.L10N.register(
126130
"Delete" : "Elimina",
127131
"Untagged" : "Non etichettati",
128132
"{used} bookmarks of {available} available" : "{used} segnalibri di {available} disponibili",
133+
"Bookmarks Settings" : "Impostazioni segnalibri",
129134
"No bookmarked files" : "Nessun file come segnalibro",
130135
"Bookmarks to files like photos or PDFs will automatically be saved to your Nextcloud files, so you can still find them even when the link goes offline." : "I segnalibri per file come foto o PDF saranno automaticamente salvati nei tuoi file di Nextcloud, in modo che tu possa trovarli anche quando non sei in linea.",
131136
"Nothing found" : "Nessun risultato",
132137
"Your search yielded no results in the current folder." : "Nessun risultato trovato nella cartella corrente",
133138
"No broken links" : "Nessun collegamento interrotto",
134139
"No shared folders" : "Nessuna cartella condivisa",
135140
"No duplicated bookmarks" : "Nessun segnalibro duplicato",
141+
"No deleted bookmarks" : "Nessun segnalibro eliminato",
136142
"No bookmarks here" : "Nessun segnalibro qui",
137143
"Add bookmarks manually or import bookmarks from a HTML file." : "Aggiungi i segnalibri manualmente o importa i segnalibri da un file HTML.",
138144
"Archive path" : "Percorso dell'archivio",
@@ -158,6 +164,7 @@ OC.L10N.register(
158164
"Need help?" : "Ti serve aiuto?",
159165
"Created {time} ago" : "Creato {time} fa",
160166
"Created on {date}" : "Creato il {date}",
167+
"(Empty title)" : "(Titolo vuoto)",
161168
"Title" : "Titolo",
162169
"Link" : "Collegamento",
163170
"Untitled folder" : "Cartella senza nome",
@@ -193,8 +200,8 @@ OC.L10N.register(
193200
"Previews" : "Anteprime",
194201
"Screeenly" : "Screeenly",
195202
"You can either sign up for free at screeenly.com or setup your own server." : "Puoi registrarti gratuitamente su screeenly.com o configurare il tuo server.",
196-
"Screeenly API URL" : "URL API di Screenly",
197-
"Screeenly API key" : "Chiave API di Screenly",
203+
"Screeenly API URL" : "URL API di Screeenly",
204+
"Screeenly API key" : "Chiave API di Screeenly",
198205
"ScreenshotMachine" : "ScreenshotMachine",
199206
"ScreenshotMachine API key" : "Chiave API ScreenshotMachine",
200207
"Webshot" : "Webshot",
@@ -225,16 +232,18 @@ OC.L10N.register(
225232
"Failed to load tags" : "Caricamento etichette non riuscito",
226233
"Failed to load folders" : "Caricamento cartelle non riuscito",
227234
"Failed to delete folder" : "Eliminazione cartelle non riuscita",
235+
"Failed to restore folder" : "Ripristino cartella non riuscito",
228236
"Failed to create folder" : "Creazione cartella non riuscita",
229237
"Failed to move parts of selection" : "Spostamento di parte della selezione non riuscito",
238+
"Failed to copy parts of selection" : "Copia di parte della selezione non riuscita",
230239
"Failed to delete parts of selection" : "Eliminazione di parte della selezione non riuscita",
231240
"Failed to fetch bookmarks." : "Recupero segnalibri non riuscito.",
232241
"Failed to store setting" : "Salvataggio impostazioni non riuscito",
233242
"Failed to load setting {key}" : "Caricamento dell'impostazione {key} non riuscito",
234243
"Failed to update share {shareId}" : "Aggiornamento della condivisione {shareId} non riuscito",
235244
"Failed to delete share {shareId}" : "Eliminazione della condivisione {shareId} non riuscita",
236245
"Create bookmarks for mentioned links" : "Crea segnalibri per i collegamenti menzionati",
237-
"No links found in this message" : "Nessun link trovato in questo messaggio",
246+
"No links found in this message" : "Nessun collegamento trovato in questo messaggio",
238247
"Bookmarks feed" : "Fonte dei segnalibri"
239248
},
240249
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");

‎l10n/it.json‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"Copy link" : "Copia colleg.",
4747
"Move" : "Sposta",
4848
"Add to folders" : "Aggiungi a cartelle",
49+
"Delete bookmark permanently" : "Elimina definitivamente il segnalibro",
4950
"Content pending" : "Contenuti in sospeso",
5051
"This content is being downloaded for offline use. Please check back later." : "Questo contenuto è in scaricamento per l'utilizzo non in linea. Torna più tardi.",
5152
"Bookmarked {time} ago" : "Aggiunto ai segnalibri {time} fa",
@@ -73,6 +74,7 @@
7374
"Sort by manual order" : "Ordina manualmente",
7475
"Sort by URL" : "Ordina per URL",
7576
"RSS feed copied" : "Fonte RSS copiata",
77+
"Trash Bin" : "Cestino",
7678
"Go back" : "Indietro",
7779
"Share folder" : "Condividi cartella",
7880
"Select one or more tags" : "Seleziona una o più etichette",
@@ -102,6 +104,7 @@
102104
"Shared by {user}" : "Condiviso da {user}",
103105
"Rename folder" : "Rinomina cartella",
104106
"Move folder" : "Sposta cartella",
107+
"Restore folder" : "Ripristina cartella",
105108
"Choose folder" : "Scegli cartella",
106109
"Submit" : "Invia",
107110
"Cancel" : "Annulla",
@@ -110,6 +113,7 @@
110113
"Importing bookmarks" : "Importazione segnalibri",
111114
"Moving selection" : "Spostamento selezione",
112115
"Adding selection to folders" : "Aggiunta della selezione alle cartelle",
116+
"Emptying trashbin" : "Svuotamento del cestino",
113117
"_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Spostamento di %n cartella e di alcuni segnalibri","Spostamento di %n cartelle e alcuni segnalibri","Spostamento di %n cartelle e alcuni segnalibri"],
114118
"_Moving %n folder_::_Moving %n folders_" : ["Spostamento di %n cartella","Spostamento di %n cartelle","Spostamento di %n cartelle"],
115119
"_Moving %n bookmark_::_Moving %n bookmarks_" : ["Spostamento di %n segnalibro","Spostamento di %n segnalibri","Spostamento di %n segnalibri"],
@@ -124,13 +128,15 @@
124128
"Delete" : "Elimina",
125129
"Untagged" : "Non etichettati",
126130
"{used} bookmarks of {available} available" : "{used} segnalibri di {available} disponibili",
131+
"Bookmarks Settings" : "Impostazioni segnalibri",
127132
"No bookmarked files" : "Nessun file come segnalibro",
128133
"Bookmarks to files like photos or PDFs will automatically be saved to your Nextcloud files, so you can still find them even when the link goes offline." : "I segnalibri per file come foto o PDF saranno automaticamente salvati nei tuoi file di Nextcloud, in modo che tu possa trovarli anche quando non sei in linea.",
129134
"Nothing found" : "Nessun risultato",
130135
"Your search yielded no results in the current folder." : "Nessun risultato trovato nella cartella corrente",
131136
"No broken links" : "Nessun collegamento interrotto",
132137
"No shared folders" : "Nessuna cartella condivisa",
133138
"No duplicated bookmarks" : "Nessun segnalibro duplicato",
139+
"No deleted bookmarks" : "Nessun segnalibro eliminato",
134140
"No bookmarks here" : "Nessun segnalibro qui",
135141
"Add bookmarks manually or import bookmarks from a HTML file." : "Aggiungi i segnalibri manualmente o importa i segnalibri da un file HTML.",
136142
"Archive path" : "Percorso dell'archivio",
@@ -156,6 +162,7 @@
156162
"Need help?" : "Ti serve aiuto?",
157163
"Created {time} ago" : "Creato {time} fa",
158164
"Created on {date}" : "Creato il {date}",
165+
"(Empty title)" : "(Titolo vuoto)",
159166
"Title" : "Titolo",
160167
"Link" : "Collegamento",
161168
"Untitled folder" : "Cartella senza nome",
@@ -191,8 +198,8 @@
191198
"Previews" : "Anteprime",
192199
"Screeenly" : "Screeenly",
193200
"You can either sign up for free at screeenly.com or setup your own server." : "Puoi registrarti gratuitamente su screeenly.com o configurare il tuo server.",
194-
"Screeenly API URL" : "URL API di Screenly",
195-
"Screeenly API key" : "Chiave API di Screenly",
201+
"Screeenly API URL" : "URL API di Screeenly",
202+
"Screeenly API key" : "Chiave API di Screeenly",
196203
"ScreenshotMachine" : "ScreenshotMachine",
197204
"ScreenshotMachine API key" : "Chiave API ScreenshotMachine",
198205
"Webshot" : "Webshot",
@@ -223,16 +230,18 @@
223230
"Failed to load tags" : "Caricamento etichette non riuscito",
224231
"Failed to load folders" : "Caricamento cartelle non riuscito",
225232
"Failed to delete folder" : "Eliminazione cartelle non riuscita",
233+
"Failed to restore folder" : "Ripristino cartella non riuscito",
226234
"Failed to create folder" : "Creazione cartella non riuscita",
227235
"Failed to move parts of selection" : "Spostamento di parte della selezione non riuscito",
236+
"Failed to copy parts of selection" : "Copia di parte della selezione non riuscita",
228237
"Failed to delete parts of selection" : "Eliminazione di parte della selezione non riuscita",
229238
"Failed to fetch bookmarks." : "Recupero segnalibri non riuscito.",
230239
"Failed to store setting" : "Salvataggio impostazioni non riuscito",
231240
"Failed to load setting {key}" : "Caricamento dell'impostazione {key} non riuscito",
232241
"Failed to update share {shareId}" : "Aggiornamento della condivisione {shareId} non riuscito",
233242
"Failed to delete share {shareId}" : "Eliminazione della condivisione {shareId} non riuscita",
234243
"Create bookmarks for mentioned links" : "Crea segnalibri per i collegamenti menzionati",
235-
"No links found in this message" : "Nessun link trovato in questo messaggio",
244+
"No links found in this message" : "Nessun collegamento trovato in questo messaggio",
236245
"Bookmarks feed" : "Fonte dei segnalibri"
237246
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
238247
}

‎l10n/th.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ OC.L10N.register(
3030
"Owner" : "เจ้าของ",
3131
"Sharing" : "การแชร์",
3232
"Share link" : "แชร์ลิงก์",
33+
"Create public link" : "สร้างลิงค์สาธารณะ",
3334
"Allow editing" : "อนุญาตให้แก้ไข",
3435
"Allow resharing" : "อนุญาตให้แชร์ซ้ำ",
3536
"Failed to save settings" : "ไม่สามารถบันทึกการตั้งค่าได้",
3637
"Failed to load settings" : "ไม่สามารถโหลดการตั้งค่าได้",
3738
"Privacy" : "ความเป็นส่วนตัว",
3839
"Folder" : "โฟลเดอร์",
39-
"Save" : "บันทึก"
40+
"Save" : "บันทึก",
41+
"What's new?" : "มีอะไรใหม่บ้าง?"
4042
},
4143
"nplurals=1; plural=0;");

‎l10n/th.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
"Owner" : "เจ้าของ",
2929
"Sharing" : "การแชร์",
3030
"Share link" : "แชร์ลิงก์",
31+
"Create public link" : "สร้างลิงค์สาธารณะ",
3132
"Allow editing" : "อนุญาตให้แก้ไข",
3233
"Allow resharing" : "อนุญาตให้แชร์ซ้ำ",
3334
"Failed to save settings" : "ไม่สามารถบันทึกการตั้งค่าได้",
3435
"Failed to load settings" : "ไม่สามารถโหลดการตั้งค่าได้",
3536
"Privacy" : "ความเป็นส่วนตัว",
3637
"Folder" : "โฟลเดอร์",
37-
"Save" : "บันทึก"
38+
"Save" : "บันทึก",
39+
"What's new?" : "มีอะไรใหม่บ้าง?"
3840
},"pluralForm" :"nplurals=1; plural=0;"
3941
}

‎l10n/uk.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ OC.L10N.register(
9494
"Change to grid view" : "Подання сіткою",
9595
"Change to list view" : "Подання списком",
9696
"Copy RSS Feed of current view" : "Копіювати стрічку RSS поточного подання",
97-
"The RSS feed requires authentication with your Nextcloud credentials" : "Стрічка RSS вимагає авторизації з вашим обліковим записом у хмарі Nextcloud",
97+
"The RSS feed requires authentication with your Nextcloud credentials" : "Стрічка RSS вимагає автентифікації з вашим обліковим записом у хмарі Nextcloud",
9898
"Search" : "Пошук",
9999
"Empty trash bin" : "Очистити кошик",
100100
"_Adding %n bookmark to new folder_::_Adding %n bookmarks to new folder_" : ["Додати %n закладку до нового каталогу","Додати %n закладки до нового каталогу","Додати %n закладок до нового каталогу","Додати %n закладок до нового каталогу"],
@@ -207,10 +207,10 @@ OC.L10N.register(
207207
"Copy RSS feed" : "Копіювати стрічку RSS",
208208
"Delete link" : "Вилучити посилання",
209209
"Create public link" : "Створити публічне посилання",
210-
"Resharing allowed" : "Дозволено передавати у спільний доступ іншим",
210+
"Resharing allowed" : "Дозволено повторно передавати у спільний доступ",
211211
"Editing allowed" : "Редагування дозволено",
212212
"Allow editing" : "Дозволити редагування",
213-
"Allow resharing" : "Дозволити передавати у спільний доступ іншим",
213+
"Allow resharing" : "Дозволити повторно передавати у спільний доступ",
214214
"Remove share" : "Вилучити спільний доступ",
215215
"Failed to save settings" : "Неможливо зберегти налаштування",
216216
"Failed to load settings" : "Не вдалося завантажити налаштування",

‎l10n/uk.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"Change to grid view" : "Подання сіткою",
9393
"Change to list view" : "Подання списком",
9494
"Copy RSS Feed of current view" : "Копіювати стрічку RSS поточного подання",
95-
"The RSS feed requires authentication with your Nextcloud credentials" : "Стрічка RSS вимагає авторизації з вашим обліковим записом у хмарі Nextcloud",
95+
"The RSS feed requires authentication with your Nextcloud credentials" : "Стрічка RSS вимагає автентифікації з вашим обліковим записом у хмарі Nextcloud",
9696
"Search" : "Пошук",
9797
"Empty trash bin" : "Очистити кошик",
9898
"_Adding %n bookmark to new folder_::_Adding %n bookmarks to new folder_" : ["Додати %n закладку до нового каталогу","Додати %n закладки до нового каталогу","Додати %n закладок до нового каталогу","Додати %n закладок до нового каталогу"],
@@ -205,10 +205,10 @@
205205
"Copy RSS feed" : "Копіювати стрічку RSS",
206206
"Delete link" : "Вилучити посилання",
207207
"Create public link" : "Створити публічне посилання",
208-
"Resharing allowed" : "Дозволено передавати у спільний доступ іншим",
208+
"Resharing allowed" : "Дозволено повторно передавати у спільний доступ",
209209
"Editing allowed" : "Редагування дозволено",
210210
"Allow editing" : "Дозволити редагування",
211-
"Allow resharing" : "Дозволити передавати у спільний доступ іншим",
211+
"Allow resharing" : "Дозволити повторно передавати у спільний доступ",
212212
"Remove share" : "Вилучити спільний доступ",
213213
"Failed to save settings" : "Неможливо зберегти налаштування",
214214
"Failed to load settings" : "Не вдалося завантажити налаштування",

‎lib/Controller/BookmarkController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ private function _returnBookmarkAsArray(Bookmark $bookmark): array {
170170
if (!isset($array['tags'])) {
171171
$array['tags'] = $this->tagMapper->findByBookmark($bookmark->getId());
172172
}
173-
if ($array['archivedFile'] !== 0 && $this->authorizer->getUserId() === $bookmark->getUserId()) {
174-
$results = $this->rootFolder->getById($array['archivedFile']);
175-
if (count($results)) {
176-
$array['archivedFilePath'] = $results[0]->getPath();
177-
$array['archivedFileType'] = $results[0]->getMimePart();
173+
if ($array['archivedFile'] !== 0 && $array['archivedFile'] !== null && $this->authorizer->getUserId() === $bookmark->getUserId()) {
174+
$result = $this->rootFolder->getFirstNodeById($array['archivedFile']);
175+
if ($result !== null) {
176+
$array['archivedFilePath'] = $result->getPath();
177+
$array['archivedFileType'] = $result->getMimePart();
178178
}
179179
}
180180
return $array;

‎lib/Flow/CreateBookmark.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function onEvent(string $eventName, Event $event, IRuleMatcher $ruleMatch
134134
$entity = $ruleMatcher->getEntity();
135135

136136
if ($entity instanceof File) {
137-
$node = current($this->rootFolder->getById($entity->exportContextIDs()['nodeId']));
137+
$node = $this->rootFolder->getFirstNodeById($entity->exportContextIDs()['nodeId']);
138138
if ($node !== null) {
139139
$this->handleFile($node, $user);
140140
}

0 commit comments

Comments
 (0)